diff --git a/Avalonia.sln b/Avalonia.sln
index c4f64be109..25c7daf080 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -5,48 +5,26 @@ VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Visuals", "src\Avalonia.Visuals\Avalonia.Visuals.csproj", "{EB582467-6ABB-43A1-B052-E981BA910E3A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Layout", "src\Avalonia.Layout\Avalonia.Layout.csproj", "{42472427-4774-4C81-8AFF-9F27B8E31721}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows", "Windows", "{B39A8919-9F95-48FE-AD7B-76E08B509888}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Win32", "src\Windows\Avalonia.Win32\Avalonia.Win32.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Direct2D1", "src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Input", "src\Avalonia.Input\Avalonia.Input.csproj", "{62024B2D-53EB-4638-B26B-85EEAA54866E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Interactivity", "src\Avalonia.Interactivity\Avalonia.Interactivity.csproj", "{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls", "src\Avalonia.Controls\Avalonia.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Styling", "src\Avalonia.Styling\Avalonia.Styling.csproj", "{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Default", "src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Diagnostics", "src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj", "{7062AE20-5DCC-4442-9645-8195BDECE63E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Animation", "src\Avalonia.Animation\Avalonia.Animation.csproj", "{D211E587-D8BC-45B9-95A4-F297C8FA5200}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Styling.UnitTests", "tests\Avalonia.Styling.UnitTests\Avalonia.Styling.UnitTests.csproj", "{47ECDF59-DEF8-4C53-87B1-2098A3429059}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.UnitTests", "tests\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj", "{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Visuals.UnitTests", "tests\Avalonia.Visuals.UnitTests\Avalonia.Visuals.UnitTests.csproj", "{76716382-3159-460E-BDA6-C5715CF606D7}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base.UnitTests", "tests\Avalonia.Base.UnitTests\Avalonia.Base.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Layout.UnitTests", "tests\Avalonia.Layout.UnitTests\Avalonia.Layout.UnitTests.csproj", "{DB070A10-BF39-4752-8456-86E9D5928478}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Interactivity.UnitTests", "tests\Avalonia.Interactivity.UnitTests\Avalonia.Interactivity.UnitTests.csproj", "{08478EF5-44E8-42E9-92D6-15E00EC038D8}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Direct2D1.RenderTests", "tests\Avalonia.Direct2D1.RenderTests\Avalonia.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Input.UnitTests", "tests\Avalonia.Input.UnitTests\Avalonia.Input.UnitTests.csproj", "{AC18926A-E784-40FE-B09D-BB0FE2B599F0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Direct2D1.UnitTests", "tests\Avalonia.Direct2D1.UnitTests\Avalonia.Direct2D1.UnitTests.csproj", "{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.Xaml.UnitTests", "tests\Avalonia.Markup.Xaml.UnitTests\Avalonia.Markup.Xaml.UnitTests.csproj", "{99135EAB-653D-47E4-A378-C96E1278CA44}"
@@ -61,6 +39,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{A689DE
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		src\Shared\ModuleInitializer.cs = src\Shared\ModuleInitializer.cs
+		src\Shared\SourceGeneratorAttributes.cs = src\Shared\SourceGeneratorAttributes.cs
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.ReactiveUI", "src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj", "{6417B24E-49C2-4985-8DB2-3AB9D898EC91}"
@@ -77,8 +56,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Android", "Android", "{7CF9
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Android", "src\Android\Avalonia.Android\Avalonia.Android.csproj", "{7B92AF71-6287-4693-9DCB-BD5B6E927E23}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.AndroidTestApplication", "src\Android\Avalonia.AndroidTestApplication\Avalonia.AndroidTestApplication.csproj", "{FF69B927-C545-49AE-8E16-3D14D621AA12}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "iOS", "iOS", "{0CB0B92E-6CFF-4240-80A5-CCAFE75D91E1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.iOS", "src\iOS\Avalonia.iOS\Avalonia.iOS.csproj", "{4488AD85-1495-4809-9AA4-DDFE0A48527E}"
@@ -95,8 +72,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog", "samples\C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Desktop", "samples\ControlCatalog.Desktop\ControlCatalog.Desktop.csproj", "{2B888490-D14A-4BCA-AB4B-48676FA93C9B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport.Tests", "tests\Avalonia.DesignerSupport.Tests\Avalonia.DesignerSupport.Tests.csproj", "{52F55355-D120-42AC-8116-8410A7D602FA}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport.TestApp", "tests\Avalonia.DesignerSupport.TestApp\Avalonia.DesignerSupport.TestApp.csproj", "{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualizationDemo", "samples\VirtualizationDemo\VirtualizationDemo.csproj", "{FBCAF3D0-2808-4934-8E96-3F607594517B}"
@@ -117,11 +92,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1
 		build\Base.props = build\Base.props
 		build\Binding.props = build\Binding.props
 		build\CoreLibraries.props = build\CoreLibraries.props
+		build\DevAnalyzers.props = build\DevAnalyzers.props
 		build\EmbedXaml.props = build\EmbedXaml.props
 		build\HarfBuzzSharp.props = build\HarfBuzzSharp.props
+		build\ImageSharp.props = build\ImageSharp.props
 		build\JetBrains.Annotations.props = build\JetBrains.Annotations.props
 		build\JetBrains.dotMemoryUnit.props = build\JetBrains.dotMemoryUnit.props
-		build\Magick.NET-Q16-AnyCPU.props = build\Magick.NET-Q16-AnyCPU.props
 		build\Microsoft.CSharp.props = build\Microsoft.CSharp.props
 		build\Microsoft.Reactive.Testing.props = build\Microsoft.Reactive.Testing.props
 		build\Moq.props = build\Moq.props
@@ -134,6 +110,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1
 		build\SharedVersion.props = build\SharedVersion.props
 		build\SharpDX.props = build\SharpDX.props
 		build\SkiaSharp.props = build\SkiaSharp.props
+		build\SourceGenerators.props = build\SourceGenerators.props
 		build\SourceLink.props = build\SourceLink.props
 		build\System.Drawing.Common.props = build\System.Drawing.Common.props
 		build\System.Memory.props = build\System.Memory.props
@@ -184,8 +161,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Build.Tasks", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "nukebuild\_build.csproj", "{3F00BC43-5095-477F-93D8-E65B08179A00}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Animation.UnitTests", "tests\Avalonia.Animation.UnitTests\Avalonia.Animation.UnitTests.csproj", "{AF227847-E65C-4BE9-BCE9-B551357788E0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.X11", "src\Avalonia.X11\Avalonia.X11.csproj", "{41B02319-965D-4945-8005-C1A3D1224165}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlatformSanityChecks", "samples\PlatformSanityChecks\PlatformSanityChecks.csproj", "{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}"
@@ -200,8 +175,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.FreeDesktop", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.DataGrid.UnitTests", "tests\Avalonia.Controls.DataGrid.UnitTests\Avalonia.Controls.DataGrid.UnitTests.csproj", "{351337F5-D66F-461B-A957-4EF60BDB4BA6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeEmbedSample", "samples\interop\NativeEmbedSample\NativeEmbedSample.csproj", "{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Fluent", "src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj", "{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Headless", "src\Avalonia.Headless\Avalonia.Headless.csproj", "{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}"
@@ -230,2014 +203,304 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsInteropTest", "sampl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlSamples", "samples\SampleControls\ControlSamples.csproj", "{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.PlatformSupport", "src\Avalonia.PlatformSupport\Avalonia.PlatformSupport.csproj", "{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.iOS", "samples\ControlCatalog.iOS\ControlCatalog.iOS.csproj", "{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.SourceGenerator", "src\Avalonia.SourceGenerator\Avalonia.SourceGenerator.csproj", "{CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevAnalyzers", "src\tools\DevAnalyzers\DevAnalyzers.csproj", "{2B390431-288C-435C-BB6B-A374033BD8D1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.iOS", "samples\ControlCatalog.iOS\ControlCatalog.iOS.csproj", "{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.ColorPicker", "src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj", "{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.iOS.Legacy", "samples\ControlCatalog.iOS.Legacy\ControlCatalog.iOS.Legacy.csproj", "{3AF75F00-B497-4517-9491-922173DE216E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport.Tests", "tests\Avalonia.DesignerSupport.Tests\Avalonia.DesignerSupport.Tests.csproj", "{EABE2161-989B-42BF-BD8D-1E34B20C21F1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
-		Ad-Hoc|iPhone = Ad-Hoc|iPhone
-		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
-		AppStore|Any CPU = AppStore|Any CPU
-		AppStore|iPhone = AppStore|iPhone
-		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
 		Debug|Any CPU = Debug|Any CPU
-		Debug|iPhone = Debug|iPhone
-		Debug|iPhoneSimulator = Debug|iPhoneSimulator
 		Release|Any CPU = Release|Any CPU
-		Release|iPhone = Release|iPhone
-		Release|iPhoneSimulator = Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhone.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhone.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhone.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhone.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhone.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhone.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhone.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhone.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhone.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhone.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhone.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhone.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhone.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhone.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhone.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhone.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhone.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhone.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|iPhone.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhone.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|iPhone.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhone.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhone.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhone.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhone.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhone.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhone.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhone.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhone.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhone.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhone.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhone.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhone.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhone.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhone.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|iPhone.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhone.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhone.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhone.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhone.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|iPhone.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhone.Build.0 = Release|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|iPhone.Build.0 = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhone.Build.0 = Release|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhone.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Release|iPhone.Build.0 = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhone.Build.0 = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhone.Build.0 = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhone.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhone.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|iPhone.Build.0 = Release|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|iPhone.Build.0 = Release|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{12A91A62-C064-42CA-9A8C-A1272F354388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{12A91A62-C064-42CA-9A8C-A1272F354388}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|iPhone.Build.0 = Release|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|iPhone.Build.0 = Release|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|iPhone.Build.0 = Release|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|iPhone.Build.0 = Release|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|iPhone.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|iPhone.Build.0 = Release|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{41B02319-965D-4945-8005-C1A3D1224165}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41B02319-965D-4945-8005-C1A3D1224165}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Release|iPhone.Build.0 = Release|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|iPhone.Build.0 = Release|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhone.Build.0 = Release|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|iPhone.Build.0 = Release|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|iPhone.Build.0 = Release|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|iPhone.Build.0 = Release|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Release|iPhone.Build.0 = Release|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{351337F5-D66F-461B-A957-4EF60BDB4BA6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Release|iPhone.Build.0 = Release|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|iPhone.Build.0 = Release|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|iPhone.Build.0 = Release|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|iPhone.Build.0 = Release|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|Any CPU.Build.0 = Release|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|iPhone.Build.0 = Release|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhone.Build.0 = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|iPhone.Build.0 = Release|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|iPhone.Build.0 = Release|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Release|Any CPU.Build.0 = Release|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Release|iPhone.Build.0 = Release|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Release|iPhone.Build.0 = Release|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{25831348-EB2A-483E-9576-E8F6528674A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25831348-EB2A-483E-9576-E8F6528674A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Release|iPhone.Build.0 = Release|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{25831348-EB2A-483E-9576-E8F6528674A5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Release|iPhone.Build.0 = Release|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{C08E9894-AA92-426E-BF56-033E262CAD3E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|iPhone.Build.0 = Release|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhone.Build.0 = Release|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhone.Build.0 = Release|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E8A597F0-2AB5-4BDA-A235-41162DAF53CF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|iPhone.Build.0 = Release|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Release|iPhone.Build.0 = Release|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3AF75F00-B497-4517-9491-922173DE216E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B390431-288C-435C-BB6B-A374033BD8D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B390431-288C-435C-BB6B-A374033BD8D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B390431-288C-435C-BB6B-A374033BD8D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B390431-288C-435C-BB6B-A374033BD8D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2245,14 +508,9 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{76716382-3159-460E-BDA6-C5715CF606D7} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{2905FF23-53FB-45E6-AA49-6AF47A172056} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{DB070A10-BF39-4752-8456-86E9D5928478} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{99135EAB-653D-47E4-A378-C96E1278CA44} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{3E53A01A-B331-47F3-B828-4A5717E77A24} = {8B6A8209-894F-4BA1-B880-965FD453982C}
@@ -2260,14 +518,12 @@ Global
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23} = {7CF9789C-F1D3-4D0E-90E5-F1DF67A2753F}
-		{FF69B927-C545-49AE-8E16-3D14D621AA12} = {7CF9789C-F1D3-4D0E-90E5-F1DF67A2753F}
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E} = {0CB0B92E-6CFF-4240-80A5-CCAFE75D91E1}
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{88060192-33D5-4932-B0F9-8BD2763E857D} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{52F55355-D120-42AC-8116-8410A7D602FA} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{FBCAF3D0-2808-4934-8E96-3F607594517B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{A0CC0258-D18C-4AB3-854F-7101680FC3F9} = {9B9E3891-2366-4253-A952-D08BCEB71098}
@@ -2275,7 +531,6 @@ Global
 		{29132311-1848-4FD6-AE0C-4FF841151BD3} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322} = {3743B0F2-CC41-4F14-A8C8-267F579BF91E}
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B} = {A689DEF5-D50F-4975-8B72-124C9EB54066}
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
 		{638580B0-7910-40EF-B674-DCB34DA308CD} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
@@ -2286,12 +541,10 @@ Global
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{D49233F8-F29C-47DD-9975-C4C9E4502720} = {E870DCD7-F46A-498D-83FC-D0FD13E0A11C}
 		{3C471044-3640-45E3-B1B2-16D2FF8399EE} = {E870DCD7-F46A-498D-83FC-D0FD13E0A11C}
-		{AF227847-E65C-4BE9-BCE9-B551357788E0} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{41B02319-965D-4945-8005-C1A3D1224165} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
 		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{351337F5-D66F-461B-A957-4EF60BDB4BA6} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{3C84E04B-36CF-4D0D-B965-C26DD649D1F3} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
 		{909A8CBD-7D0E-42FD-B841-022AD8925820} = {8B6A8209-894F-4BA1-B880-965FD453982C}
 		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5} = {9B9E3891-2366-4253-A952-D08BCEB71098}
@@ -2302,7 +555,8 @@ Global
 		{26A98DA1-D89D-4A95-8152-349F404DA2E2} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
 		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{3AF75F00-B497-4517-9491-922173DE216E} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{2B390431-288C-435C-BB6B-A374033BD8D1} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
+		{EABE2161-989B-42BF-BD8D-1E34B20C21F1} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}
diff --git a/Directory.Build.props b/Directory.Build.props
index 835decc672..42daa2df7f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,9 +1,11 @@
 <Project>
+  <Import Project="$(MSBuildThisFileDirectory)/build/AvaloniaPublicKey.props"/>
   <PropertyGroup>
       <PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(MSBuildThisFileDirectory)build-intermediate/nuget</PackageOutputPath>
       <AvaloniaPreviewerNetCoreToolPath>$(MSBuildThisFileDirectory)\src\tools\Avalonia.Designer.HostApp\bin\$(Configuration)\netcoreapp2.0\Avalonia.Designer.HostApp.dll</AvaloniaPreviewerNetCoreToolPath>
       <!-- https://github.com/dotnet/msbuild/issues/2661 -->
       <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
       <MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
+      <RunApiCompat>False</RunApiCompat>
   </PropertyGroup>
 </Project>
diff --git a/NuGet.Config b/NuGet.Config
index 7a1f28bea7..7d2bd8abd2 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -5,5 +5,6 @@
     <clear />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-eng" value="https://nuget.avaloniaui.net/repository/avalonia-devdeps/index.json" protocolVersion="3" />
+    <add key="skiasharp" value="https://aka.ms/skiasharp-eap/index.json" />
   </packageSources>
 </configuration>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 79456b117b..edf3c3d819 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -31,14 +31,14 @@ jobs:
     vmImage: 'ubuntu-20.04'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 3.1.414'
+    displayName: 'Use .NET Core SDK 3.1.418'
     inputs:
-      version: 3.1.414
+      version: 3.1.418
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.100'
+    displayName: 'Use .NET Core SDK 6.0.202'
     inputs:
-      version: 6.0.200
+      version: 6.0.202
 
   - task: CmdLine@2
     displayName: 'Run Build'
@@ -62,14 +62,14 @@ jobs:
     vmImage: 'macOS-10.15'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 3.1.414'
+    displayName: 'Use .NET Core SDK 3.1.418'
     inputs:
-      version: 3.1.414
+      version: 3.1.418
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.100'
+    displayName: 'Use .NET Core SDK 6.0.202'
     inputs:
-      version: 6.0.200
+      version: 6.0.202
       
   - task: CmdLine@2
     displayName: 'Install Mono 5.18'
@@ -134,20 +134,20 @@ jobs:
     SolutionDir: '$(Build.SourcesDirectory)'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 3.1.414'
+    displayName: 'Use .NET Core SDK 3.1.418'
     inputs:
-      version: 3.1.414
+      version: 3.1.418
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.100'
+    displayName: 'Use .NET Core SDK 6.0.202'
     inputs:
-      version: 6.0.200
+      version: 6.0.202
 
   - task: CmdLine@2
     displayName: 'Install Workloads'
     inputs:
       script: |
-       dotnet workload install --no-cache --disable-parallel android ios --skip-manifest-update --source "https://api.nuget.org/v3/index.json"
+       dotnet workload install android ios
 
   - task: CmdLine@2
     displayName: 'Install Nuke'
diff --git a/build/ApiCompatAttributeExcludeList.txt b/build/ApiCompatAttributeExcludeList.txt
new file mode 100644
index 0000000000..1df5a30ec3
--- /dev/null
+++ b/build/ApiCompatAttributeExcludeList.txt
@@ -0,0 +1,2 @@
+T:Avalonia.Metadata.NotClientImplementableAttribute
+T:Avalonia.Metadata.UnstableAttribute
diff --git a/build/AvaloniaPublicKey.props b/build/AvaloniaPublicKey.props
new file mode 100644
index 0000000000..89215635c0
--- /dev/null
+++ b/build/AvaloniaPublicKey.props
@@ -0,0 +1,5 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <AvaloniaPublicKey>0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87</AvaloniaPublicKey>
+  </PropertyGroup>
+</Project>
diff --git a/build/CoreLibraries.props b/build/CoreLibraries.props
index 6bf69603c0..00a1e3094b 100644
--- a/build/CoreLibraries.props
+++ b/build/CoreLibraries.props
@@ -1,21 +1,12 @@
 <Project>
   <ItemGroup>
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Base/Avalonia.Base.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Animation/Avalonia.Animation.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Controls/Avalonia.Controls.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Input/Avalonia.Input.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Interactivity/Avalonia.Interactivity.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Layout/Avalonia.Layout.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Visuals/Avalonia.Visuals.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Styling/Avalonia.Styling.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.OpenGL/Avalonia.OpenGL.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Dialogs/Avalonia.Dialogs.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Markup/Avalonia.Markup/Avalonia.Markup.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj" />
       <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.MicroCom/Avalonia.MicroCom.csproj" />
-      <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj" />
   </ItemGroup>
 </Project>
diff --git a/build/DevAnalyzers.props b/build/DevAnalyzers.props
new file mode 100644
index 0000000000..14e4f6a563
--- /dev/null
+++ b/build/DevAnalyzers.props
@@ -0,0 +1,9 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\src\tools\DevAnalyzers\DevAnalyzers.csproj"
+                      PrivateAssets="all"
+                      ReferenceOutputAssembly="false"
+                      OutputItemType="Analyzer"
+                      SetTargetFramework="TargetFramework=netstandard2.0"/>
+  </ItemGroup>
+</Project>
diff --git a/build/HarfBuzzSharp.props b/build/HarfBuzzSharp.props
index 6dd6cccb53..85e7a1f34d 100644
--- a/build/HarfBuzzSharp.props
+++ b/build/HarfBuzzSharp.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp" Version="2.8.2-preview.209" />
-    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2-preview.209" />
-    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="2.8.2-preview.209"/>
+    <PackageReference Include="HarfBuzzSharp" Version="2.8.2" />
+    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2" />
+    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="2.8.2" />
   </ItemGroup>
 </Project>
diff --git a/build/ImageSharp.props b/build/ImageSharp.props
new file mode 100644
index 0000000000..178c274ac9
--- /dev/null
+++ b/build/ImageSharp.props
@@ -0,0 +1,5 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.1" />
+  </ItemGroup>
+</Project>
diff --git a/build/JetBrains.dotMemoryUnit.props b/build/JetBrains.dotMemoryUnit.props
index eb4e2b6f15..5d74d474cf 100644
--- a/build/JetBrains.dotMemoryUnit.props
+++ b/build/JetBrains.dotMemoryUnit.props
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="JetBrains.DotMemoryUnit" Version="3.1.20200127.214830" />
+    <PackageReference Include="JetBrains.DotMemoryUnit" Version="3.2.20220510" />
   </ItemGroup>
 </Project>
diff --git a/build/Magick.NET-Q16-AnyCPU.props b/build/Magick.NET-Q16-AnyCPU.props
deleted file mode 100644
index 21d9cdcb1f..0000000000
--- a/build/Magick.NET-Q16-AnyCPU.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="7.9.0.2" />
-  </ItemGroup>
-</Project>
diff --git a/build/NetFX.props b/build/NetFX.props
index 8ffc9ec561..14adb54035 100644
--- a/build/NetFX.props
+++ b/build/NetFX.props
@@ -1,7 +1,6 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/build/SkiaSharp.props b/build/SkiaSharp.props
index 60bebaad40..d54cffba08 100644
--- a/build/SkiaSharp.props
+++ b/build/SkiaSharp.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.0-preview.209" />
-    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.88.0-preview.209" />
-    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.0-preview.209"/>
+    <PackageReference Include="SkiaSharp" Version="2.88.1-preview.1" />
+    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.88.1-preview.1" />
+    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.1-preview.1" />
   </ItemGroup>
 </Project>
diff --git a/build/SourceGenerators.props b/build/SourceGenerators.props
new file mode 100644
index 0000000000..d000af1bf6
--- /dev/null
+++ b/build/SourceGenerators.props
@@ -0,0 +1,10 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ProjectReference 
+      Include="$(MSBuildThisFileDirectory)/../src/Avalonia.SourceGenerator/Avalonia.SourceGenerator.csproj" 
+      OutputItemType="Analyzer" 
+      ReferenceOutputAssembly="false"
+      PrivateAssets="all" />
+    <Compile Include="$(MSBuildThisFileDirectory)/../src/Shared/SourceGeneratorAttributes.cs" />
+  </ItemGroup>
+</Project>
diff --git a/build/SourceLink.props b/build/SourceLink.props
index 9f05848881..dd7ecc8d2a 100644
--- a/build/SourceLink.props
+++ b/build/SourceLink.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 
   <!-- Workaround for https://github.com/dotnet/sdk/issues/11105 -->
diff --git a/global.json b/global.json
index 30265268dc..a6792b05c7 100644
--- a/global.json
+++ b/global.json
@@ -1,11 +1,10 @@
 {
     "sdk": {
-        "version": "6.0.200",
+        "version": "6.0.202",
         "rollForward": "latestFeature"
     },
     "msbuild-sdks": {
         "Microsoft.Build.Traversal": "1.0.43",
-        "Xamarin.Legacy.Sdk": "0.1.2-alpha6",
         "MSBuild.Sdk.Extras": "3.0.22",
         "AggregatePackage.NuGet.Sdk" : "0.1.12"
     }
diff --git a/native/Avalonia.Native/inc/rendertarget.h b/native/Avalonia.Native/inc/rendertarget.h
index 2b0338d099..a59915777f 100644
--- a/native/Avalonia.Native/inc/rendertarget.h
+++ b/native/Avalonia.Native/inc/rendertarget.h
@@ -1,3 +1,8 @@
+#pragma once
+
+#include "com.h"
+#include "comimpl.h"
+#include "avalonia-native.h"
 
 @protocol IRenderTarget
 -(void) setNewLayer: (CALayer*) layer;
diff --git a/native/Avalonia.Native/src/OSX/AutoFitContentView.h b/native/Avalonia.Native/src/OSX/AutoFitContentView.h
new file mode 100644
index 0000000000..7f1f764141
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/AutoFitContentView.h
@@ -0,0 +1,17 @@
+//
+// Created by Dan Walmsley on 05/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#pragma once
+
+#import <Foundation/Foundation.h>
+#include "avalonia-native.h"
+
+@interface AutoFitContentView : NSView
+-(AutoFitContentView* _Nonnull) initWithContent: (NSView* _Nonnull) content;
+-(void) ShowTitleBar: (bool) show;
+-(void) SetTitleBarHeightHint: (double) height;
+
+-(void) ShowBlur: (bool) show;
+@end
\ No newline at end of file
diff --git a/native/Avalonia.Native/src/OSX/AutoFitContentView.mm b/native/Avalonia.Native/src/OSX/AutoFitContentView.mm
new file mode 100644
index 0000000000..0fa4540726
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/AutoFitContentView.mm
@@ -0,0 +1,106 @@
+//
+// Created by Dan Walmsley on 05/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#include "AvnView.h"
+#include "AutoFitContentView.h"
+#include "WindowInterfaces.h"
+#include "WindowProtocol.h"
+
+@implementation AutoFitContentView
+{
+    NSVisualEffectView* _titleBarMaterial;
+    NSBox* _titleBarUnderline;
+    NSView* _content;
+    NSVisualEffectView* _blurBehind;
+    double _titleBarHeightHint;
+    bool _settingSize;
+}
+
+-(AutoFitContentView* _Nonnull) initWithContent:(NSView *)content
+{
+    _titleBarHeightHint = -1;
+    _content = content;
+    _settingSize = false;
+
+    [self setAutoresizesSubviews:true];
+    [self setWantsLayer:true];
+
+    _titleBarMaterial = [NSVisualEffectView new];
+    [_titleBarMaterial setBlendingMode:NSVisualEffectBlendingModeWithinWindow];
+    [_titleBarMaterial setMaterial:NSVisualEffectMaterialTitlebar];
+    [_titleBarMaterial setWantsLayer:true];
+    _titleBarMaterial.hidden = true;
+
+    _titleBarUnderline = [NSBox new];
+    _titleBarUnderline.boxType = NSBoxSeparator;
+    _titleBarUnderline.fillColor = [NSColor underPageBackgroundColor];
+    _titleBarUnderline.hidden = true;
+
+    [self addSubview:_titleBarMaterial];
+    [self addSubview:_titleBarUnderline];
+
+    _blurBehind = [NSVisualEffectView new];
+    [_blurBehind setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
+    [_blurBehind setMaterial:NSVisualEffectMaterialLight];
+    [_blurBehind setWantsLayer:true];
+    _blurBehind.hidden = true;
+
+    [_blurBehind setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+    [_content setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+
+    [self addSubview:_blurBehind];
+    [self addSubview:_content];
+
+    [self setWantsLayer:true];
+    return self;
+}
+
+-(void) ShowBlur:(bool)show
+{
+    _blurBehind.hidden = !show;
+}
+
+-(void) ShowTitleBar: (bool) show
+{
+    _titleBarMaterial.hidden = !show;
+    _titleBarUnderline.hidden = !show;
+}
+
+-(void) SetTitleBarHeightHint: (double) height
+{
+    _titleBarHeightHint = height;
+
+    [self setFrameSize:self.frame.size];
+}
+
+-(void)setFrameSize:(NSSize)newSize
+{
+    if(_settingSize)
+    {
+        return;
+    }
+
+    _settingSize = true;
+    [super setFrameSize:newSize];
+
+    auto window = (id <AvnWindowProtocol>) [self window];
+
+    // TODO get actual titlebar size
+
+    double height = _titleBarHeightHint == -1 ? [window getExtendedTitleBarHeight] : _titleBarHeightHint;
+
+    NSRect tbar;
+    tbar.origin.x = 0;
+    tbar.origin.y = newSize.height - height;
+    tbar.size.width = newSize.width;
+    tbar.size.height = height;
+
+    [_titleBarMaterial setFrame:tbar];
+    tbar.size.height = height < 1 ? 0 : 1;
+    [_titleBarUnderline setFrame:tbar];
+
+    _settingSize = false;
+}
+@end
\ No newline at end of file
diff --git a/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
index 7571d51c9f..6fc3977d4e 100644
--- a/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
+++ b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
@@ -7,6 +7,24 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		18391068E48EF96E3DB5FDAB /* ResizeScope.mm in Sources */ = {isa = PBXBuildFile; fileRef = 18391E45702740FE9DD69695 /* ResizeScope.mm */; };
+		1839125F057B0A4EB1760058 /* WindowImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 183919BF108EB72A029F7671 /* WindowImpl.mm */; };
+		183914E50CF6D2EFC1667F7C /* WindowInterfaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 18391DB45C7D892E61BF388C /* WindowInterfaces.h */; };
+		1839151F32D1BB1AB51A7BB6 /* AvnPanelWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 18391884C7476DA4E53A492D /* AvnPanelWindow.mm */; };
+		183916173528EC2737DBE5E1 /* WindowBaseImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 183915BFF0E234CD3604A7CD /* WindowBaseImpl.h */; };
+		1839171DCC651B0638603AC4 /* INSWindowHolder.h in Headers */ = {isa = PBXBuildFile; fileRef = 18391BBB7782C296D424071F /* INSWindowHolder.h */; };
+		1839179A55FC1421BEE83330 /* WindowBaseImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 18391676ECF0E983F4964357 /* WindowBaseImpl.mm */; };
+		183919D91DB9AAB5D700C2EA /* WindowImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 18391CD090AA776E7E841AC9 /* WindowImpl.h */; };
+		18391AA7E0BBA74D184C5734 /* AutoFitContentView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1839166350F32661F3ABD70F /* AutoFitContentView.mm */; };
+		18391AC16726CBC45856233B /* AvnWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1839155B28B20FFB672D29C6 /* AvnWindow.mm */; };
+		18391AC65ADD7DDD33FBE737 /* PopupImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 183910513F396141938832B5 /* PopupImpl.h */; };
+		18391C28BF1823B5464FDD36 /* ResizeScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 1839171D898F9BFC1373631A /* ResizeScope.h */; };
+		18391CF07316F819E76B617C /* IWindowStateChanged.h in Headers */ = {isa = PBXBuildFile; fileRef = 183913C6BFD6856BD42D19FD /* IWindowStateChanged.h */; };
+		18391D4EB311BC7EF8B8C0A6 /* AvnView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1839132D0E2454D911F1D1F9 /* AvnView.mm */; };
+		18391D8CD1756DC858DC1A09 /* PopupImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 18391BB698579F40F1783F31 /* PopupImpl.mm */; };
+		18391E1381E2D5BFD60265A9 /* AutoFitContentView.h in Headers */ = {isa = PBXBuildFile; fileRef = 18391654EF0E7AB3D3AB4071 /* AutoFitContentView.h */; };
+		18391ED5F611FF62C45F196D /* AvnView.h in Headers */ = {isa = PBXBuildFile; fileRef = 18391D1669284AD2EC9E866A /* AvnView.h */; };
+		18391F1E2411C79405A9943A /* WindowProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 1839122E037567BDD1D09DEB /* WindowProtocol.h */; };
 		1A002B9E232135EE00021753 /* app.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A002B9D232135EE00021753 /* app.mm */; };
 		1A1852DC23E05814008F0DED /* deadlock.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1852DB23E05814008F0DED /* deadlock.mm */; };
 		1A3E5EA823E9E83B00EDE661 /* rendertarget.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3E5EA723E9E83B00EDE661 /* rendertarget.mm */; };
@@ -28,13 +46,30 @@
 		AB00E4F72147CA920032A60A /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB00E4F62147CA920032A60A /* main.mm */; };
 		AB1E522C217613570091CD71 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB1E522B217613570091CD71 /* OpenGL.framework */; };
 		AB661C1E2148230F00291242 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB661C1D2148230F00291242 /* AppKit.framework */; };
-		AB661C202148286E00291242 /* window.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB661C1F2148286E00291242 /* window.mm */; };
 		AB8F7D6B21482D7F0057DBA5 /* platformthreading.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB8F7D6A21482D7F0057DBA5 /* platformthreading.mm */; };
 		BC11A5BE2608D58F0017BAD0 /* automation.h in Headers */ = {isa = PBXBuildFile; fileRef = BC11A5BC2608D58F0017BAD0 /* automation.h */; };
 		BC11A5BF2608D58F0017BAD0 /* automation.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC11A5BD2608D58F0017BAD0 /* automation.mm */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		183910513F396141938832B5 /* PopupImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopupImpl.h; sourceTree = "<group>"; };
+		1839122E037567BDD1D09DEB /* WindowProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowProtocol.h; sourceTree = "<group>"; };
+		1839132D0E2454D911F1D1F9 /* AvnView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AvnView.mm; sourceTree = "<group>"; };
+		183913C6BFD6856BD42D19FD /* IWindowStateChanged.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IWindowStateChanged.h; sourceTree = "<group>"; };
+		1839155B28B20FFB672D29C6 /* AvnWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AvnWindow.mm; sourceTree = "<group>"; };
+		183915BFF0E234CD3604A7CD /* WindowBaseImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowBaseImpl.h; sourceTree = "<group>"; };
+		18391654EF0E7AB3D3AB4071 /* AutoFitContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoFitContentView.h; sourceTree = "<group>"; };
+		1839166350F32661F3ABD70F /* AutoFitContentView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AutoFitContentView.mm; sourceTree = "<group>"; };
+		18391676ECF0E983F4964357 /* WindowBaseImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WindowBaseImpl.mm; sourceTree = "<group>"; };
+		1839171D898F9BFC1373631A /* ResizeScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResizeScope.h; sourceTree = "<group>"; };
+		18391884C7476DA4E53A492D /* AvnPanelWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AvnPanelWindow.mm; sourceTree = "<group>"; };
+		183919BF108EB72A029F7671 /* WindowImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WindowImpl.mm; sourceTree = "<group>"; };
+		18391BB698579F40F1783F31 /* PopupImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PopupImpl.mm; sourceTree = "<group>"; };
+		18391BBB7782C296D424071F /* INSWindowHolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = INSWindowHolder.h; sourceTree = "<group>"; };
+		18391CD090AA776E7E841AC9 /* WindowImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowImpl.h; sourceTree = "<group>"; };
+		18391D1669284AD2EC9E866A /* AvnView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AvnView.h; sourceTree = "<group>"; };
+		18391DB45C7D892E61BF388C /* WindowInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowInterfaces.h; sourceTree = "<group>"; };
+		18391E45702740FE9DD69695 /* ResizeScope.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResizeScope.mm; sourceTree = "<group>"; };
 		1A002B9D232135EE00021753 /* app.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = app.mm; sourceTree = "<group>"; };
 		1A1852DB23E05814008F0DED /* deadlock.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = deadlock.mm; sourceTree = "<group>"; };
 		1A3E5EA723E9E83B00EDE661 /* rendertarget.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = rendertarget.mm; sourceTree = "<group>"; };
@@ -48,7 +83,6 @@
 		37A4E71A2178846A00EACBCD /* headers */ = {isa = PBXFileReference; lastKnownFileType = folder; name = headers; path = ../../inc; sourceTree = "<group>"; };
 		37A517B22159597E00FBA241 /* Screens.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = Screens.mm; sourceTree = "<group>"; };
 		37C09D8721580FE4006A6758 /* SystemDialogs.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemDialogs.mm; sourceTree = "<group>"; };
-		37C09D8A21581EF2006A6758 /* window.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = "<group>"; };
 		37DDA9AF219330F8002E132B /* AvnString.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AvnString.mm; sourceTree = "<group>"; };
 		37DDA9B121933371002E132B /* AvnString.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AvnString.h; sourceTree = "<group>"; };
 		37E2330E21583241000CB7E2 /* KeyTransform.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KeyTransform.mm; sourceTree = "<group>"; };
@@ -62,7 +96,6 @@
 		AB00E4F62147CA920032A60A /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
 		AB1E522B217613570091CD71 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		AB661C1D2148230F00291242 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
-		AB661C1F2148286E00291242 /* window.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = window.mm; sourceTree = "<group>"; };
 		AB661C212148288600291242 /* common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = "<group>"; };
 		AB7A61EF2147C815003C5833 /* libAvalonia.Native.OSX.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libAvalonia.Native.OSX.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		AB8F7D6A21482D7F0057DBA5 /* platformthreading.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platformthreading.mm; sourceTree = "<group>"; };
@@ -118,8 +151,6 @@
 				AB661C212148288600291242 /* common.h */,
 				379860FE214DA0C000CD0246 /* KeyTransform.h */,
 				37E2330E21583241000CB7E2 /* KeyTransform.mm */,
-				AB661C1F2148286E00291242 /* window.mm */,
-				37C09D8A21581EF2006A6758 /* window.h */,
 				AB00E4F62147CA920032A60A /* main.mm */,
 				37155CE3233C00EB0034DCE9 /* menu.h */,
 				520624B222973F4100C4DCEF /* menu.mm */,
@@ -130,6 +161,24 @@
 				37C09D8721580FE4006A6758 /* SystemDialogs.mm */,
 				AB7A61F02147C815003C5833 /* Products */,
 				AB661C1C2148230E00291242 /* Frameworks */,
+				18391676ECF0E983F4964357 /* WindowBaseImpl.mm */,
+				183915BFF0E234CD3604A7CD /* WindowBaseImpl.h */,
+				18391BBB7782C296D424071F /* INSWindowHolder.h */,
+				183919BF108EB72A029F7671 /* WindowImpl.mm */,
+				18391CD090AA776E7E841AC9 /* WindowImpl.h */,
+				183913C6BFD6856BD42D19FD /* IWindowStateChanged.h */,
+				18391E45702740FE9DD69695 /* ResizeScope.mm */,
+				1839171D898F9BFC1373631A /* ResizeScope.h */,
+				1839132D0E2454D911F1D1F9 /* AvnView.mm */,
+				18391D1669284AD2EC9E866A /* AvnView.h */,
+				1839166350F32661F3ABD70F /* AutoFitContentView.mm */,
+				18391654EF0E7AB3D3AB4071 /* AutoFitContentView.h */,
+				18391884C7476DA4E53A492D /* AvnPanelWindow.mm */,
+				1839122E037567BDD1D09DEB /* WindowProtocol.h */,
+				1839155B28B20FFB672D29C6 /* AvnWindow.mm */,
+				18391DB45C7D892E61BF388C /* WindowInterfaces.h */,
+				18391BB698579F40F1783F31 /* PopupImpl.mm */,
+				183910513F396141938832B5 /* PopupImpl.h */,
 			);
 			sourceTree = "<group>";
 		};
@@ -150,6 +199,16 @@
 			files = (
 				37155CE4233C00EB0034DCE9 /* menu.h in Headers */,
 				BC11A5BE2608D58F0017BAD0 /* automation.h in Headers */,
+				183916173528EC2737DBE5E1 /* WindowBaseImpl.h in Headers */,
+				1839171DCC651B0638603AC4 /* INSWindowHolder.h in Headers */,
+				183919D91DB9AAB5D700C2EA /* WindowImpl.h in Headers */,
+				18391CF07316F819E76B617C /* IWindowStateChanged.h in Headers */,
+				18391C28BF1823B5464FDD36 /* ResizeScope.h in Headers */,
+				18391ED5F611FF62C45F196D /* AvnView.h in Headers */,
+				18391E1381E2D5BFD60265A9 /* AutoFitContentView.h in Headers */,
+				18391F1E2411C79405A9943A /* WindowProtocol.h in Headers */,
+				183914E50CF6D2EFC1667F7C /* WindowInterfaces.h in Headers */,
+				18391AC65ADD7DDD33FBE737 /* PopupImpl.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -228,7 +287,14 @@
 				1A465D10246AB61600C5858B /* dnd.mm in Sources */,
 				AB00E4F72147CA920032A60A /* main.mm in Sources */,
 				37C09D8821580FE4006A6758 /* SystemDialogs.mm in Sources */,
-				AB661C202148286E00291242 /* window.mm in Sources */,
+				1839179A55FC1421BEE83330 /* WindowBaseImpl.mm in Sources */,
+				1839125F057B0A4EB1760058 /* WindowImpl.mm in Sources */,
+				18391068E48EF96E3DB5FDAB /* ResizeScope.mm in Sources */,
+				18391D4EB311BC7EF8B8C0A6 /* AvnView.mm in Sources */,
+				18391AA7E0BBA74D184C5734 /* AutoFitContentView.mm in Sources */,
+				1839151F32D1BB1AB51A7BB6 /* AvnPanelWindow.mm in Sources */,
+				18391AC16726CBC45856233B /* AvnWindow.mm in Sources */,
+				18391D8CD1756DC858DC1A09 /* PopupImpl.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
index 5d20a135b9..87a8312c38 100644
--- a/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
+++ b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
@@ -56,10 +56,14 @@
       </MacroExpansion>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "bin/Debug/netcoreapp3.1/ControlCatalog.NetCore.dll"
+            argument = "bin/Debug/net6.0/ControlCatalog.NetCore.dll"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
+      <LocationScenarioReference
+         identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+         referenceType = "1">
+      </LocationScenarioReference>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/native/Avalonia.Native/src/OSX/AvnPanelWindow.mm b/native/Avalonia.Native/src/OSX/AvnPanelWindow.mm
new file mode 100644
index 0000000000..b49005de8a
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/AvnPanelWindow.mm
@@ -0,0 +1,9 @@
+//
+// Created by Dan Walmsley on 06/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#define IS_NSPANEL
+
+#include "AvnWindow.mm"
+
diff --git a/native/Avalonia.Native/src/OSX/AvnView.h b/native/Avalonia.Native/src/OSX/AvnView.h
new file mode 100644
index 0000000000..86a68d34c5
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/AvnView.h
@@ -0,0 +1,27 @@
+//
+// Created by Dan Walmsley on 05/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+#pragma once
+#import <Foundation/Foundation.h>
+
+
+#import <Foundation/Foundation.h>
+#import <AppKit/AppKit.h>
+#include "common.h"
+#include "WindowImpl.h"
+#include "KeyTransform.h"
+
+@class AvnAccessibilityElement;
+
+@interface AvnView : NSView<NSTextInputClient, NSDraggingDestination>
+-(AvnView* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent;
+-(NSEvent* _Nonnull) lastMouseDownEvent;
+-(AvnPoint) translateLocalPoint:(AvnPoint)pt;
+-(void) setSwRenderedFrame: (AvnFramebuffer* _Nonnull) fb dispose: (IUnknown* _Nonnull) dispose;
+-(void) onClosed;
+
+-(AvnPlatformResizeReason) getResizeReason;
+-(void) setResizeReason:(AvnPlatformResizeReason)reason;
++ (AvnPoint)toAvnPoint:(CGPoint)p;
+@end
\ No newline at end of file
diff --git a/native/Avalonia.Native/src/OSX/AvnView.mm b/native/Avalonia.Native/src/OSX/AvnView.mm
new file mode 100644
index 0000000000..01725ace03
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/AvnView.mm
@@ -0,0 +1,717 @@
+//
+// Created by Dan Walmsley on 05/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+#include "AvnView.h"
+#include "automation.h"
+#import "WindowInterfaces.h"
+
+@implementation AvnView
+{
+    ComPtr<WindowBaseImpl> _parent;
+    NSTrackingArea* _area;
+    bool _isLeftPressed, _isMiddlePressed, _isRightPressed, _isXButton1Pressed, _isXButton2Pressed;
+    AvnInputModifiers _modifierState;
+    NSEvent* _lastMouseDownEvent;
+    bool _lastKeyHandled;
+    AvnPixelSize _lastPixelSize;
+    NSObject<IRenderTarget>* _renderTarget;
+    AvnPlatformResizeReason _resizeReason;
+    AvnAccessibilityElement* _accessibilityChild;
+}
+
+- (void)onClosed
+{
+    @synchronized (self)
+    {
+        _parent = nullptr;
+    }
+}
+
+- (NSEvent*) lastMouseDownEvent
+{
+    return _lastMouseDownEvent;
+}
+
+- (void) updateRenderTarget
+{
+    [_renderTarget resize:_lastPixelSize withScale:static_cast<float>([[self window] backingScaleFactor])];
+    [self setNeedsDisplayInRect:[self frame]];
+}
+
+-(AvnView*)  initWithParent: (WindowBaseImpl*) parent
+{
+    self = [super init];
+    _renderTarget = parent->renderTarget;
+    [self setWantsLayer:YES];
+    [self setLayerContentsRedrawPolicy: NSViewLayerContentsRedrawDuringViewResize];
+
+    _parent = parent;
+    _area = nullptr;
+    _lastPixelSize.Height = 100;
+    _lastPixelSize.Width = 100;
+    [self registerForDraggedTypes: @[@"public.data", GetAvnCustomDataType()]];
+
+    _modifierState = AvnInputModifiersNone;
+    return self;
+}
+
+- (BOOL)isFlipped
+{
+    return YES;
+}
+
+- (BOOL)wantsUpdateLayer
+{
+    return YES;
+}
+
+- (void)setLayer:(CALayer *)layer
+{
+    [_renderTarget setNewLayer: layer];
+    [super setLayer: layer];
+}
+
+- (BOOL)isOpaque
+{
+    return YES;
+}
+
+- (BOOL)acceptsFirstResponder
+{
+    return true;
+}
+
+- (BOOL)acceptsFirstMouse:(NSEvent *)event
+{
+    return true;
+}
+
+- (BOOL)canBecomeKeyView
+{
+    return true;
+}
+
+-(void)setFrameSize:(NSSize)newSize
+{
+    [super setFrameSize:newSize];
+
+    if(_area != nullptr)
+    {
+        [self removeTrackingArea:_area];
+        _area = nullptr;
+    }
+
+    if (_parent == nullptr)
+    {
+        return;
+    }
+
+    NSRect rect = NSZeroRect;
+    rect.size = newSize;
+
+    NSTrackingAreaOptions options = NSTrackingActiveAlways | NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingEnabledDuringMouseDrag;
+    _area = [[NSTrackingArea alloc] initWithRect:rect options:options owner:self userInfo:nullptr];
+    [self addTrackingArea:_area];
+
+    _parent->UpdateCursor();
+
+    auto fsize = [self convertSizeToBacking: [self frame].size];
+
+    if(_lastPixelSize.Width != (int)fsize.width || _lastPixelSize.Height != (int)fsize.height)
+    {
+        _lastPixelSize.Width = (int)fsize.width;
+        _lastPixelSize.Height = (int)fsize.height;
+        [self updateRenderTarget];
+
+        auto reason = [self inLiveResize] ? ResizeUser : _resizeReason;
+        _parent->BaseEvents->Resized(AvnSize{newSize.width, newSize.height}, reason);
+    }
+}
+
+- (void)updateLayer
+{
+    AvnInsidePotentialDeadlock deadlock;
+    if (_parent == nullptr)
+    {
+        return;
+    }
+
+    _parent->BaseEvents->RunRenderPriorityJobs();
+
+    if (_parent == nullptr)
+    {
+        return;
+    }
+
+    _parent->BaseEvents->Paint();
+}
+
+- (void)drawRect:(NSRect)dirtyRect
+{
+    return;
+}
+
+-(void) setSwRenderedFrame: (AvnFramebuffer*) fb dispose: (IUnknown*) dispose
+{
+    @autoreleasepool {
+        [_renderTarget setSwFrame:fb];
+        dispose->Release();
+    }
+}
+
+- (AvnPoint) translateLocalPoint:(AvnPoint)pt
+{
+    pt.Y = [self bounds].size.height - pt.Y;
+    return pt;
+}
+
++ (AvnPoint)toAvnPoint:(CGPoint)p
+{
+    AvnPoint result;
+
+    result.X = p.x;
+    result.Y = p.y;
+
+    return result;
+}
+
+- (void) viewDidChangeBackingProperties
+{
+    auto fsize = [self convertSizeToBacking: [self frame].size];
+    _lastPixelSize.Width = (int)fsize.width;
+    _lastPixelSize.Height = (int)fsize.height;
+    [self updateRenderTarget];
+
+    if(_parent != nullptr)
+    {
+        _parent->BaseEvents->ScalingChanged([_parent->Window backingScaleFactor]);
+    }
+
+    [super viewDidChangeBackingProperties];
+}
+
+- (bool) ignoreUserInput:(bool)trigerInputWhenDisabled
+{
+    if(_parent == nullptr)
+    {
+        return TRUE;
+    }
+
+    auto parentWindow = _parent->GetWindowProtocol();
+
+    if(parentWindow == nil || ![parentWindow shouldTryToHandleEvents])
+    {
+        if(trigerInputWhenDisabled)
+        {
+            auto window = dynamic_cast<WindowImpl*>(_parent.getRaw());
+
+            if(window != nullptr)
+            {
+                window->WindowEvents->GotInputWhenDisabled();
+            }
+        }
+
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+- (void)mouseEvent:(NSEvent *)event withType:(AvnRawMouseEventType) type
+{
+    bool triggerInputWhenDisabled = type != Move && type != LeaveWindow;
+
+    if([self ignoreUserInput: triggerInputWhenDisabled])
+    {
+        return;
+    }
+
+    auto localPoint = [self convertPoint:[event locationInWindow] toView:self];
+    auto avnPoint = [AvnView toAvnPoint:localPoint];
+    auto point = [self translateLocalPoint:avnPoint];
+    AvnVector delta = { 0, 0};
+
+    if(type == Wheel)
+    {
+        auto speed = 5;
+
+        if([event hasPreciseScrollingDeltas])
+        {
+            speed = 50;
+        }
+
+        delta.X = [event scrollingDeltaX] / speed;
+        delta.Y = [event scrollingDeltaY] / speed;
+
+        if(delta.X == 0 && delta.Y == 0)
+        {
+            return;
+        }
+    }
+    else if (type == Magnify)
+    {
+        delta.X = delta.Y = [event magnification];
+    }
+    else if (type == Rotate)
+    {
+        delta.X = delta.Y = [event rotation];
+    }
+    else if (type == Swipe)
+    {
+        delta.X = [event deltaX];
+        delta.Y = [event deltaY];
+    }
+
+    uint32 timestamp = static_cast<uint32>([event timestamp] * 1000);
+    auto modifiers = [self getModifiers:[event modifierFlags]];
+
+    if(type != Move ||
+            (
+                    [self window] != nil &&
+                            (
+                                    [[self window] firstResponder] == nil
+                                            || ![[[self window] firstResponder] isKindOfClass: [NSView class]]
+                            )
+            )
+            )
+        [self becomeFirstResponder];
+
+    if(_parent != nullptr)
+    {
+        _parent->BaseEvents->RawMouseEvent(type, timestamp, modifiers, point, delta);
+    }
+
+    [super mouseMoved:event];
+}
+
+- (BOOL) resignFirstResponder
+{
+    _parent->BaseEvents->LostFocus();
+    return YES;
+}
+
+- (void)mouseMoved:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Move];
+}
+
+- (void)mouseDown:(NSEvent *)event
+{
+    _isLeftPressed = true;
+    _lastMouseDownEvent = event;
+    [self mouseEvent:event withType:LeftButtonDown];
+}
+
+- (void)otherMouseDown:(NSEvent *)event
+{
+    _lastMouseDownEvent = event;
+
+    switch(event.buttonNumber)
+    {
+        case 2:
+        case 3:
+            _isMiddlePressed = true;
+            [self mouseEvent:event withType:MiddleButtonDown];
+            break;
+        case 4:
+            _isXButton1Pressed = true;
+            [self mouseEvent:event withType:XButton1Down];
+            break;
+        case 5:
+            _isXButton2Pressed = true;
+            [self mouseEvent:event withType:XButton2Down];
+            break;
+
+        default:
+            break;
+    }
+}
+
+- (void)rightMouseDown:(NSEvent *)event
+{
+    _isRightPressed = true;
+    _lastMouseDownEvent = event;
+    [self mouseEvent:event withType:RightButtonDown];
+}
+
+- (void)mouseUp:(NSEvent *)event
+{
+    _isLeftPressed = false;
+    [self mouseEvent:event withType:LeftButtonUp];
+}
+
+- (void)otherMouseUp:(NSEvent *)event
+{
+    switch(event.buttonNumber)
+    {
+        case 2:
+        case 3:
+            _isMiddlePressed = false;
+            [self mouseEvent:event withType:MiddleButtonUp];
+            break;
+        case 4:
+            _isXButton1Pressed = false;
+            [self mouseEvent:event withType:XButton1Up];
+            break;
+        case 5:
+            _isXButton2Pressed = false;
+            [self mouseEvent:event withType:XButton2Up];
+            break;
+
+        default:
+            break;
+    }
+}
+
+- (void)rightMouseUp:(NSEvent *)event
+{
+    _isRightPressed = false;
+    [self mouseEvent:event withType:RightButtonUp];
+}
+
+- (void)mouseDragged:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Move];
+    [super mouseDragged:event];
+}
+
+- (void)otherMouseDragged:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Move];
+    [super otherMouseDragged:event];
+}
+
+- (void)rightMouseDragged:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Move];
+    [super rightMouseDragged:event];
+}
+
+- (void)scrollWheel:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Wheel];
+    [super scrollWheel:event];
+}
+
+- (void)magnifyWithEvent:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Magnify];
+    [super magnifyWithEvent:event];
+}
+
+- (void)rotateWithEvent:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Rotate];
+    [super rotateWithEvent:event];
+}
+
+- (void)swipeWithEvent:(NSEvent *)event
+{
+    [self mouseEvent:event withType:Swipe];
+    [super swipeWithEvent:event];
+}
+
+- (void)mouseEntered:(NSEvent *)event
+{
+    [super mouseEntered:event];
+}
+
+- (void)mouseExited:(NSEvent *)event
+{
+    [self mouseEvent:event withType:LeaveWindow];
+    [super mouseExited:event];
+}
+
+- (void) keyboardEvent: (NSEvent *) event withType: (AvnRawKeyEventType)type
+{
+    if([self ignoreUserInput: false])
+    {
+        return;
+    }
+
+    auto key = s_KeyMap[[event keyCode]];
+
+    uint32_t timestamp = static_cast<uint32_t>([event timestamp] * 1000);
+    auto modifiers = [self getModifiers:[event modifierFlags]];
+
+    if(_parent != nullptr)
+    {
+        auto handled = _parent->BaseEvents->RawKeyEvent(type, timestamp, modifiers, key);
+        if (key != LeftCtrl && key != RightCtrl) {
+          _lastKeyHandled = handled;
+        } else {
+          _lastKeyHandled = false;
+        }
+    }
+}
+
+- (BOOL)performKeyEquivalent:(NSEvent *)event
+{
+    bool result = _lastKeyHandled;
+
+    _lastKeyHandled = false;
+
+    return result;
+}
+
+- (void)flagsChanged:(NSEvent *)event
+{
+    auto newModifierState = [self getModifiers:[event modifierFlags]];
+
+    bool isAltCurrentlyPressed = (_modifierState & Alt) == Alt;
+    bool isControlCurrentlyPressed = (_modifierState & Control) == Control;
+    bool isShiftCurrentlyPressed = (_modifierState & Shift) == Shift;
+    bool isCommandCurrentlyPressed = (_modifierState & Windows) == Windows;
+
+    bool isAltPressed = (newModifierState & Alt) == Alt;
+    bool isControlPressed = (newModifierState & Control) == Control;
+    bool isShiftPressed = (newModifierState & Shift) == Shift;
+    bool isCommandPressed = (newModifierState & Windows) == Windows;
+
+
+    if (isAltPressed && !isAltCurrentlyPressed)
+    {
+        [self keyboardEvent:event withType:KeyDown];
+    }
+    else if (isAltCurrentlyPressed && !isAltPressed)
+    {
+        [self keyboardEvent:event withType:KeyUp];
+    }
+
+    if (isControlPressed && !isControlCurrentlyPressed)
+    {
+        [self keyboardEvent:event withType:KeyDown];
+    }
+    else if (isControlCurrentlyPressed && !isControlPressed)
+    {
+        [self keyboardEvent:event withType:KeyUp];
+    }
+
+    if (isShiftPressed && !isShiftCurrentlyPressed)
+    {
+        [self keyboardEvent:event withType:KeyDown];
+    }
+    else if(isShiftCurrentlyPressed && !isShiftPressed)
+    {
+        [self keyboardEvent:event withType:KeyUp];
+    }
+
+    if(isCommandPressed && !isCommandCurrentlyPressed)
+    {
+        [self keyboardEvent:event withType:KeyDown];
+    }
+    else if(isCommandCurrentlyPressed && ! isCommandPressed)
+    {
+        [self keyboardEvent:event withType:KeyUp];
+    }
+
+    _modifierState = newModifierState;
+
+    [[self inputContext] handleEvent:event];
+    [super flagsChanged:event];
+}
+
+- (void)keyDown:(NSEvent *)event
+{
+    [self keyboardEvent:event withType:KeyDown];
+    [[self inputContext] handleEvent:event];
+    [super keyDown:event];
+}
+
+- (void)keyUp:(NSEvent *)event
+{
+    [self keyboardEvent:event withType:KeyUp];
+    [super keyUp:event];
+}
+
+- (AvnInputModifiers)getModifiers:(NSEventModifierFlags)mod
+{
+    unsigned int rv = 0;
+
+    if (mod & NSEventModifierFlagControl)
+        rv |= Control;
+    if (mod & NSEventModifierFlagShift)
+        rv |= Shift;
+    if (mod & NSEventModifierFlagOption)
+        rv |= Alt;
+    if (mod & NSEventModifierFlagCommand)
+        rv |= Windows;
+
+    if (_isLeftPressed)
+        rv |= LeftMouseButton;
+    if (_isMiddlePressed)
+        rv |= MiddleMouseButton;
+    if (_isRightPressed)
+        rv |= RightMouseButton;
+    if (_isXButton1Pressed)
+        rv |= XButton1MouseButton;
+    if (_isXButton2Pressed)
+        rv |= XButton2MouseButton;
+
+    return (AvnInputModifiers)rv;
+}
+
+- (BOOL)hasMarkedText
+{
+    return _lastKeyHandled;
+}
+
+- (NSRange)markedRange
+{
+    return NSMakeRange(NSNotFound, 0);
+}
+
+- (NSRange)selectedRange
+{
+    return NSMakeRange(NSNotFound, 0);
+}
+
+- (void)setMarkedText:(id)string selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
+{
+
+}
+
+- (void)unmarkText
+{
+
+}
+
+- (NSArray<NSString *> *)validAttributesForMarkedText
+{
+    return [NSArray new];
+}
+
+- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)range actualRange:(NSRangePointer)actualRange
+{
+    return [NSAttributedString new];
+}
+
+- (void)insertText:(id)string replacementRange:(NSRange)replacementRange
+{
+    if(!_lastKeyHandled)
+    {
+        if(_parent != nullptr)
+        {
+            _lastKeyHandled = _parent->BaseEvents->RawTextInputEvent(0, [string UTF8String]);
+        }
+    }
+}
+
+- (NSUInteger)characterIndexForPoint:(NSPoint)point
+{
+    return 0;
+}
+
+- (NSRect)firstRectForCharacterRange:(NSRange)range actualRange:(NSRangePointer)actualRange
+{
+    CGRect result = { 0 };
+
+    return result;
+}
+
+- (NSDragOperation)triggerAvnDragEvent: (AvnDragEventType) type info: (id <NSDraggingInfo>)info
+{
+    auto localPoint = [self convertPoint:[info draggingLocation] toView:self];
+    auto avnPoint = [AvnView toAvnPoint:localPoint];
+    auto point = [self translateLocalPoint:avnPoint];
+    auto modifiers = [self getModifiers:[[NSApp currentEvent] modifierFlags]];
+    NSDragOperation nsop = [info draggingSourceOperationMask];
+
+    auto effects = ConvertDragDropEffects(nsop);
+    int reffects = (int)_parent->BaseEvents
+            ->DragEvent(type, point, modifiers, effects,
+                    CreateClipboard([info draggingPasteboard], nil),
+                    GetAvnDataObjectHandleFromDraggingInfo(info));
+
+    NSDragOperation ret = static_cast<NSDragOperation>(0);
+
+    // Ensure that the managed part didn't add any new effects
+    reffects = (int)effects & reffects;
+
+    // OSX requires exactly one operation
+    if((reffects & (int)AvnDragDropEffects::Copy) != 0)
+        ret = NSDragOperationCopy;
+    else if((reffects & (int)AvnDragDropEffects::Move) != 0)
+        ret = NSDragOperationMove;
+    else if((reffects & (int)AvnDragDropEffects::Link) != 0)
+        ret = NSDragOperationLink;
+    if(ret == 0)
+        ret = NSDragOperationNone;
+    return ret;
+}
+
+- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
+{
+    return [self triggerAvnDragEvent: AvnDragEventType::Enter info:sender];
+}
+
+- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
+{
+    return [self triggerAvnDragEvent: AvnDragEventType::Over info:sender];
+}
+
+- (void)draggingExited:(id <NSDraggingInfo>)sender
+{
+    [self triggerAvnDragEvent: AvnDragEventType::Leave info:sender];
+}
+
+- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
+{
+    return [self triggerAvnDragEvent: AvnDragEventType::Over info:sender] != NSDragOperationNone;
+}
+
+- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
+{
+    return [self triggerAvnDragEvent: AvnDragEventType::Drop info:sender] != NSDragOperationNone;
+}
+
+- (void)concludeDragOperation:(nullable id <NSDraggingInfo>)sender
+{
+
+}
+
+- (AvnPlatformResizeReason)getResizeReason
+{
+    return _resizeReason;
+}
+
+- (void)setResizeReason:(AvnPlatformResizeReason)reason
+{
+    _resizeReason = reason;
+}
+
+- (AvnAccessibilityElement *) accessibilityChild
+{
+    if (_accessibilityChild == nil)
+    {
+        auto peer = _parent->BaseEvents->GetAutomationPeer();
+
+        if (peer == nil)
+            return nil;
+
+        _accessibilityChild = [AvnAccessibilityElement acquire:peer];
+    }
+
+    return _accessibilityChild;
+}
+
+- (NSArray *)accessibilityChildren
+{
+    auto child = [self accessibilityChild];
+    return NSAccessibilityUnignoredChildrenForOnlyChild(child);
+}
+
+- (id)accessibilityHitTest:(NSPoint)point
+{
+    return [[self accessibilityChild] accessibilityHitTest:point];
+}
+
+- (id)accessibilityFocusedUIElement
+{
+    return [[self accessibilityChild] accessibilityFocusedUIElement];
+}
+
+@end
diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
new file mode 100644
index 0000000000..ebd9f39d30
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -0,0 +1,486 @@
+//
+// Created by Dan Walmsley on 06/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+
+#import <AppKit/AppKit.h>
+#import "WindowProtocol.h"
+#import "WindowBaseImpl.h"
+
+#ifdef IS_NSPANEL
+#define BASE_CLASS NSPanel
+#define CLASS_NAME AvnPanel
+#else
+#define BASE_CLASS NSWindow
+#define CLASS_NAME AvnWindow
+#endif
+
+#import <AppKit/AppKit.h>
+#include "common.h"
+#include "menu.h"
+#include "automation.h"
+#include "WindowBaseImpl.h"
+#include "WindowImpl.h"
+#include "AvnView.h"
+#include "WindowInterfaces.h"
+#include "PopupImpl.h"
+
+@implementation CLASS_NAME
+{
+    ComPtr<WindowBaseImpl> _parent;
+    bool _closed;
+    bool _isEnabled;
+    bool _canBecomeKeyWindow;
+    bool _isExtended;
+    bool _isTransitioningToFullScreen;
+    AvnMenu* _menu;
+}
+
+-(void) setIsExtended:(bool)value;
+{
+    _isExtended = value;
+}
+
+-(bool) isDialog
+{
+    return _parent->IsDialog();
+}
+
+-(double) getExtendedTitleBarHeight
+{
+    if(_isExtended)
+    {
+        for (id subview in self.contentView.superview.subviews)
+        {
+            if ([subview isKindOfClass:NSClassFromString(@"NSTitlebarContainerView")])
+            {
+                NSView *titlebarView = [subview subviews][0];
+
+                return (double)titlebarView.frame.size.height;
+            }
+        }
+
+        return -1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+- (void)performClose:(id _Nullable )sender
+{
+    if([[self delegate] respondsToSelector:@selector(windowShouldClose:)])
+    {
+        if(![[self delegate] windowShouldClose:self]) return;
+    }
+    else if([self respondsToSelector:@selector(windowShouldClose:)])
+    {
+        if(![self windowShouldClose:self]) return;
+    }
+
+    [self close];
+}
+
+- (void)pollModalSession:(nonnull NSModalSession)session
+{
+    auto response = [NSApp runModalSession:session];
+
+    if(response == NSModalResponseContinue)
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self pollModalSession:session];
+        });
+    }
+    else if (!_closed)
+    {
+        [self orderOut:self];
+        [NSApp endModalSession:session];
+    }
+}
+
+-(void) showWindowMenuWithAppMenu
+{
+    if(_menu != nullptr)
+    {
+        auto appMenuItem = ::GetAppMenuItem();
+
+        if(appMenuItem != nullptr)
+        {
+            auto appMenu = [appMenuItem menu];
+
+            [appMenu removeItem:appMenuItem];
+
+            [_menu insertItem:appMenuItem atIndex:0];
+
+            [_menu setHasGlobalMenuItem:true];
+        }
+
+        [NSApp setMenu:_menu];
+    }
+    else
+    {
+        [self showAppMenuOnly];
+    }
+}
+
+-(void) showAppMenuOnly
+{
+    auto appMenuItem = ::GetAppMenuItem();
+
+    if(appMenuItem != nullptr)
+    {
+        auto appMenu = ::GetAppMenu();
+
+        auto nativeAppMenu = dynamic_cast<AvnAppMenu*>(appMenu);
+
+        [[appMenuItem menu] removeItem:appMenuItem];
+
+        if(_menu != nullptr)
+        {
+            [_menu setHasGlobalMenuItem:false];
+        }
+
+        [nativeAppMenu->GetNative() addItem:appMenuItem];
+
+        [NSApp setMenu:nativeAppMenu->GetNative()];
+    }
+}
+
+-(void) applyMenu:(AvnMenu *_Nullable)menu
+{
+    if(menu == nullptr)
+    {
+        menu = [AvnMenu new];
+    }
+
+    _menu = menu;
+}
+
+-(CLASS_NAME*_Nonnull)  initWithParent: (WindowBaseImpl*_Nonnull) parent contentRect: (NSRect)contentRect styleMask: (NSWindowStyleMask)styleMask;
+{
+    // https://jameshfisher.com/2020/07/10/why-is-the-contentrect-of-my-nswindow-ignored/
+    // create nswindow with specific contentRect, otherwise we wont be able to resize the window
+    // until several ms after the window is physically on the screen.
+    self = [super initWithContentRect:contentRect styleMask: styleMask backing:NSBackingStoreBuffered defer:false];
+
+    [self setReleasedWhenClosed:false];
+    _parent = parent;
+    [self setDelegate:self];
+    _closed = false;
+    _isEnabled = true;
+
+    [self backingScaleFactor];
+    [self setOpaque:NO];
+    [self setBackgroundColor: [NSColor clearColor]];
+
+    _isExtended = false;
+    _isTransitioningToFullScreen = false;
+
+    if(self.isDialog)
+    {
+        [self setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces|NSWindowCollectionBehaviorFullScreenAuxiliary];
+    }
+
+    return self;
+}
+
+- (BOOL)windowShouldClose:(NSWindow *_Nonnull)sender
+{
+    auto window = dynamic_cast<WindowImpl*>(_parent.getRaw());
+
+    if(window != nullptr)
+    {
+        return !window->WindowEvents->Closing();
+    }
+
+    return true;
+}
+
+- (void)windowDidChangeBackingProperties:(NSNotification *_Nonnull)notification
+{
+    [self backingScaleFactor];
+}
+
+
+
+- (void)windowWillClose:(NSNotification *_Nonnull)notification
+{
+    _closed = true;
+    if(_parent)
+    {
+        ComPtr<WindowBaseImpl> parent = _parent;
+        _parent = NULL;
+        
+        auto window = dynamic_cast<WindowImpl*>(parent.getRaw());
+        
+        if(window != nullptr)
+        {
+            window->SetParent(nullptr);
+        }
+        
+        parent->BaseEvents->Closed();
+        [parent->View onClosed];
+    }
+}
+
+-(BOOL)canBecomeKeyWindow
+{
+    if(_canBecomeKeyWindow)
+    {
+        // If the window has a child window being shown as a dialog then don't allow it to become the key window.
+        auto parent = dynamic_cast<WindowImpl*>(_parent.getRaw());
+        
+        if(parent != nullptr)
+        {
+            return parent->CanBecomeKeyWindow();
+        }
+
+        return true;
+    }
+    
+    return false;
+}
+
+#ifndef IS_NSPANEL
+-(BOOL)canBecomeMainWindow
+{
+    return true;
+}
+#endif
+
+-(void)setCanBecomeKeyWindow:(bool)value
+{
+    _canBecomeKeyWindow = value;
+}
+
+-(bool)shouldTryToHandleEvents
+{
+    return _isEnabled;
+}
+
+-(void) setEnabled:(bool)enable
+{
+    _isEnabled = enable;
+    
+    [[self standardWindowButton:NSWindowCloseButton] setEnabled:enable];
+    [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:enable];
+    [[self standardWindowButton:NSWindowZoomButton] setEnabled:enable];
+}
+
+-(void)becomeKeyWindow
+{
+    [self showWindowMenuWithAppMenu];
+
+    if(_parent != nullptr)
+    {
+        _parent->BaseEvents->Activated();
+    }
+
+    [super becomeKeyWindow];
+}
+
+- (void)windowDidBecomeKey:(NSNotification *_Nonnull)notification
+{
+    _parent->BringToFront();
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        @try {
+        [self invalidateShadow];
+        }
+        @finally{
+        }
+    });
+}
+
+- (void)windowDidMiniaturize:(NSNotification *_Nonnull)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->WindowStateChanged();
+    }
+}
+
+- (void)windowDidDeminiaturize:(NSNotification *_Nonnull)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->WindowStateChanged();
+    }
+}
+
+- (void)windowDidResize:(NSNotification *_Nonnull)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->WindowStateChanged();
+    }
+}
+
+- (void)windowWillExitFullScreen:(NSNotification *_Nonnull)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->StartStateTransition();
+    }
+}
+
+- (void)windowDidExitFullScreen:(NSNotification *_Nonnull)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->EndStateTransition();
+
+        if(parent->Decorations() != SystemDecorationsFull && parent->WindowState() == Maximized)
+        {
+            NSRect screenRect = [[self screen] visibleFrame];
+            [self setFrame:screenRect display:YES];
+        }
+
+        if(parent->WindowState() == Minimized)
+        {
+            [self miniaturize:nullptr];
+        }
+
+        parent->WindowStateChanged();
+    }
+}
+
+- (void)windowWillEnterFullScreen:(NSNotification *_Nonnull)notification
+{
+    _isTransitioningToFullScreen = true;
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->StartStateTransition();
+    }
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification *_Nonnull)notification
+{
+    _isTransitioningToFullScreen = false;
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+
+    if(parent != nullptr)
+    {
+        parent->EndStateTransition();
+        parent->WindowStateChanged();
+    }
+}
+
+- (BOOL)windowShouldZoom:(NSWindow *_Nonnull)window toFrame:(NSRect)newFrame
+{
+    return true;
+}
+
+-(void)resignKeyWindow
+{
+    if(_parent)
+        _parent->BaseEvents->Deactivated();
+
+    [self showAppMenuOnly];
+    
+    [self invalidateShadow];
+
+    [super resignKeyWindow];
+}
+
+- (void)windowDidMove:(NSNotification *_Nonnull)notification
+{
+    AvnPoint position;
+
+    if(_parent != nullptr)
+    {
+        auto cparent = dynamic_cast<WindowImpl*>(_parent.getRaw());
+
+        if(cparent != nullptr)
+        {
+            if(!cparent->IsShown())
+            {
+                return;
+            }
+
+            if(cparent->WindowState() == Maximized)
+            {
+                cparent->SetWindowState(Normal);
+            }
+        }
+
+        _parent->GetPosition(&position);
+        _parent->BaseEvents->PositionChanged(position);
+    }
+}
+
+- (AvnPoint) translateLocalPoint:(AvnPoint)pt
+{
+    pt.Y = [self frame].size.height - pt.Y;
+    return pt;
+}
+
+- (void)sendEvent:(NSEvent *_Nonnull)event
+{
+    [super sendEvent:event];
+
+    /// This is to detect non-client clicks. This can only be done on Windows... not popups, hence the dynamic_cast.
+    if(_parent != nullptr && dynamic_cast<WindowImpl*>(_parent.getRaw()) != nullptr)
+    {
+        switch(event.type)
+        {
+            case NSEventTypeLeftMouseDown:
+            {
+                AvnView* view = _parent->View;
+                NSPoint windowPoint = [event locationInWindow];
+                NSPoint viewPoint = [view convertPoint:windowPoint fromView:nil];
+
+                if (!NSPointInRect(viewPoint, view.bounds))
+                {
+                    auto avnPoint = [AvnView toAvnPoint:windowPoint];
+                    auto point = [self translateLocalPoint:avnPoint];
+                    AvnVector delta = { 0, 0 };
+
+                    _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, static_cast<uint32>([event timestamp] * 1000), AvnInputModifiersNone, point, delta);
+                }
+                
+                if(!_isTransitioningToFullScreen)
+                {
+                    _parent->BringToFront();
+                }
+            }
+            break;
+
+            case NSEventTypeMouseEntered:
+            {
+                _parent->UpdateCursor();
+            }
+                break;
+
+            case NSEventTypeMouseExited:
+            {
+                [[NSCursor arrowCursor] set];
+            }
+                break;
+
+            default:
+                break;
+        }
+    }
+}
+
+- (void)disconnectParent {
+    _parent = nullptr;
+}
+
+@end
+
diff --git a/native/Avalonia.Native/src/OSX/INSWindowHolder.h b/native/Avalonia.Native/src/OSX/INSWindowHolder.h
new file mode 100644
index 0000000000..3c5010966b
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/INSWindowHolder.h
@@ -0,0 +1,17 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#ifndef AVALONIA_NATIVE_OSX_INSWINDOWHOLDER_H
+#define AVALONIA_NATIVE_OSX_INSWINDOWHOLDER_H
+
+@class AvnView;
+
+struct INSWindowHolder
+{
+    virtual NSWindow* _Nonnull GetNSWindow () = 0;
+    virtual AvnView* _Nonnull GetNSView () = 0;
+};
+
+#endif //AVALONIA_NATIVE_OSX_INSWINDOWHOLDER_H
diff --git a/native/Avalonia.Native/src/OSX/IWindowStateChanged.h b/native/Avalonia.Native/src/OSX/IWindowStateChanged.h
new file mode 100644
index 0000000000..f0905da3ac
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/IWindowStateChanged.h
@@ -0,0 +1,18 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#ifndef AVALONIA_NATIVE_OSX_IWINDOWSTATECHANGED_H
+#define AVALONIA_NATIVE_OSX_IWINDOWSTATECHANGED_H
+
+struct IWindowStateChanged
+{
+    virtual void WindowStateChanged () = 0;
+    virtual void StartStateTransition () = 0;
+    virtual void EndStateTransition () = 0;
+    virtual SystemDecorations Decorations () = 0;
+    virtual AvnWindowState WindowState () = 0;
+};
+
+#endif //AVALONIA_NATIVE_OSX_IWINDOWSTATECHANGED_H
diff --git a/native/Avalonia.Native/src/OSX/PopupImpl.h b/native/Avalonia.Native/src/OSX/PopupImpl.h
new file mode 100644
index 0000000000..451019a6a4
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/PopupImpl.h
@@ -0,0 +1,9 @@
+//
+// Created by Dan Walmsley on 06/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#ifndef AVALONIA_NATIVE_OSX_POPUPIMPL_H
+#define AVALONIA_NATIVE_OSX_POPUPIMPL_H
+
+#endif //AVALONIA_NATIVE_OSX_POPUPIMPL_H
diff --git a/native/Avalonia.Native/src/OSX/PopupImpl.mm b/native/Avalonia.Native/src/OSX/PopupImpl.mm
new file mode 100644
index 0000000000..9820a9f052
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/PopupImpl.mm
@@ -0,0 +1,57 @@
+//
+// Created by Dan Walmsley on 06/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#include "WindowInterfaces.h"
+#include "AvnView.h"
+#include "WindowImpl.h"
+#include "automation.h"
+#include "menu.h"
+#include "common.h"
+#import "WindowBaseImpl.h"
+#import "WindowProtocol.h"
+#import <AppKit/AppKit.h>
+#include "PopupImpl.h"
+
+class PopupImpl : public virtual WindowBaseImpl, public IAvnPopup
+{
+private:
+    BEGIN_INTERFACE_MAP()
+    INHERIT_INTERFACE_MAP(WindowBaseImpl)
+    INTERFACE_MAP_ENTRY(IAvnPopup, IID_IAvnPopup)
+    END_INTERFACE_MAP()
+    virtual ~PopupImpl(){}
+    ComPtr<IAvnWindowEvents> WindowEvents;
+    PopupImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
+    {
+        WindowEvents = events;
+        [Window setLevel:NSPopUpMenuWindowLevel];
+    }
+protected:
+    virtual NSWindowStyleMask GetStyle() override
+    {
+        return NSWindowStyleMaskBorderless;
+    }
+
+public:
+    virtual bool ShouldTakeFocusOnShow() override
+    {
+        return false;
+    }
+
+    virtual HRESULT Show(bool activate, bool isDialog) override
+    {
+        return WindowBaseImpl::Show(activate, true);
+    }
+};
+
+
+extern IAvnPopup* CreateAvnPopup(IAvnWindowEvents*events, IAvnGlContext* gl)
+{
+    @autoreleasepool
+    {
+        IAvnPopup* ptr = dynamic_cast<IAvnPopup*>(new PopupImpl(events, gl));
+        return ptr;
+    }
+}
diff --git a/native/Avalonia.Native/src/OSX/ResizeScope.h b/native/Avalonia.Native/src/OSX/ResizeScope.h
new file mode 100644
index 0000000000..9a43c158fe
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/ResizeScope.h
@@ -0,0 +1,24 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#ifndef AVALONIA_NATIVE_OSX_RESIZESCOPE_H
+#define AVALONIA_NATIVE_OSX_RESIZESCOPE_H
+
+#include "avalonia-native.h"
+
+@class AvnView;
+
+class ResizeScope
+{
+public:
+    ResizeScope(AvnView* _Nonnull view, AvnPlatformResizeReason reason);
+
+    ~ResizeScope();
+private:
+    AvnView* _Nonnull _view;
+    AvnPlatformResizeReason _restore;
+};
+
+#endif //AVALONIA_NATIVE_OSX_RESIZESCOPE_H
diff --git a/native/Avalonia.Native/src/OSX/ResizeScope.mm b/native/Avalonia.Native/src/OSX/ResizeScope.mm
new file mode 100644
index 0000000000..9f1177af8b
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/ResizeScope.mm
@@ -0,0 +1,18 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+#include "ResizeScope.h"
+#include "AvnView.h"
+
+ResizeScope::ResizeScope(AvnView *view, AvnPlatformResizeReason reason) {
+    _view = view;
+    _restore = [view getResizeReason];
+    [view setResizeReason:reason];
+}
+
+ResizeScope::~ResizeScope() {
+    [_view setResizeReason:_restore];
+}
diff --git a/native/Avalonia.Native/src/OSX/SystemDialogs.mm b/native/Avalonia.Native/src/OSX/SystemDialogs.mm
index a47221056b..535b6c3b66 100644
--- a/native/Avalonia.Native/src/OSX/SystemDialogs.mm
+++ b/native/Avalonia.Native/src/OSX/SystemDialogs.mm
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "window.h"
+#include "INSWindowHolder.h"
 
 class SystemDialogs : public ComSingleObject<IAvnSystemDialogs, &IID_IAvnSystemDialogs>
 {
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
new file mode 100644
index 0000000000..2baf3b09b5
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
@@ -0,0 +1,135 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#ifndef AVALONIA_NATIVE_OSX_WINDOWBASEIMPL_H
+#define AVALONIA_NATIVE_OSX_WINDOWBASEIMPL_H
+
+#include "rendertarget.h"
+#include "INSWindowHolder.h"
+
+@class AutoFitContentView;
+@class AvnMenu;
+@protocol AvnWindowProtocol;
+
+class WindowBaseImpl : public virtual ComObject,
+                       public virtual IAvnWindowBase,
+                       public INSWindowHolder {
+
+public:
+    FORWARD_IUNKNOWN()
+
+BEGIN_INTERFACE_MAP()
+        INTERFACE_MAP_ENTRY(IAvnWindowBase, IID_IAvnWindowBase)
+    END_INTERFACE_MAP()
+
+    virtual ~WindowBaseImpl();
+
+    WindowBaseImpl(IAvnWindowBaseEvents *events, IAvnGlContext *gl, bool usePanel = false);
+
+    virtual HRESULT ObtainNSWindowHandle(void **ret) override;
+
+    virtual HRESULT ObtainNSWindowHandleRetained(void **ret) override;
+
+    virtual HRESULT ObtainNSViewHandle(void **ret) override;
+
+    virtual HRESULT ObtainNSViewHandleRetained(void **ret) override;
+
+    virtual NSWindow *GetNSWindow() override;
+
+    virtual AvnView *GetNSView() override;
+
+    virtual HRESULT Show(bool activate, bool isDialog) override;
+
+    virtual bool IsShown ();
+
+    virtual bool ShouldTakeFocusOnShow();
+
+    virtual HRESULT Hide() override;
+
+    virtual HRESULT Activate() override;
+
+    virtual HRESULT SetTopMost(bool value) override;
+
+    virtual HRESULT Close() override;
+
+    virtual HRESULT GetClientSize(AvnSize *ret) override;
+
+    virtual HRESULT GetFrameSize(AvnSize *ret) override;
+
+    virtual HRESULT GetScaling(double *ret) override;
+
+    virtual HRESULT SetMinMaxSize(AvnSize minSize, AvnSize maxSize) override;
+
+    virtual HRESULT Resize(double x, double y, AvnPlatformResizeReason reason) override;
+
+    virtual HRESULT Invalidate(__attribute__((unused)) AvnRect rect) override;
+
+    virtual HRESULT SetMainMenu(IAvnMenu *menu) override;
+
+    virtual HRESULT BeginMoveDrag() override;
+
+    virtual HRESULT BeginResizeDrag(__attribute__((unused)) AvnWindowEdge edge) override;
+
+    virtual HRESULT GetPosition(AvnPoint *ret) override;
+
+    virtual HRESULT SetPosition(AvnPoint point) override;
+
+    virtual HRESULT PointToClient(AvnPoint point, AvnPoint *ret) override;
+
+    virtual HRESULT PointToScreen(AvnPoint point, AvnPoint *ret) override;
+
+    virtual HRESULT ThreadSafeSetSwRenderedFrame(AvnFramebuffer *fb, IUnknown *dispose) override;
+
+    virtual HRESULT SetCursor(IAvnCursor *cursor) override;
+
+    virtual void UpdateCursor();
+
+    virtual HRESULT CreateGlRenderTarget(IAvnGlSurfaceRenderTarget **ppv) override;
+
+    virtual HRESULT CreateNativeControlHost(IAvnNativeControlHost **retOut) override;
+
+    virtual HRESULT SetBlurEnabled(bool enable) override;
+
+    virtual HRESULT BeginDragAndDropOperation(AvnDragDropEffects effects, AvnPoint point,
+            IAvnClipboard *clipboard, IAvnDndResultCallback *cb,
+            void *sourceHandle) override;
+
+    virtual bool IsDialog();
+
+    id<AvnWindowProtocol> GetWindowProtocol ();
+                           
+    virtual void BringToFront ();
+
+protected:
+    virtual NSWindowStyleMask GetStyle();
+
+    void UpdateStyle();
+
+private:
+    void CreateNSWindow (bool isDialog);
+    void CleanNSWindow ();
+
+    NSCursor *cursor;
+    ComPtr<IAvnGlContext> _glContext;
+    bool hasPosition;
+    NSSize lastSize;
+    NSSize lastMinSize;
+    NSSize lastMaxSize;
+    AvnMenu* lastMenu;
+    bool _inResize;
+
+protected:
+    AvnPoint lastPositionSet;
+    AutoFitContentView *StandardContainer;
+    bool _shown;
+
+public:
+    NSObject <IRenderTarget> *renderTarget;
+    NSWindow * Window;
+    ComPtr<IAvnWindowBaseEvents> BaseEvents;
+    AvnView *View;
+};
+
+#endif //AVALONIA_NATIVE_OSX_WINDOWBASEIMPL_H
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
new file mode 100644
index 0000000000..f133fa34f6
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -0,0 +1,604 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+#include "common.h"
+#include "AvnView.h"
+#include "menu.h"
+#include "automation.h"
+#include "cursor.h"
+#include "ResizeScope.h"
+#include "AutoFitContentView.h"
+#import "WindowProtocol.h"
+#import "WindowInterfaces.h"
+#include "WindowBaseImpl.h"
+
+
+WindowBaseImpl::~WindowBaseImpl() {
+    View = nullptr;
+    Window = nullptr;
+}
+
+WindowBaseImpl::WindowBaseImpl(IAvnWindowBaseEvents *events, IAvnGlContext *gl, bool usePanel) {
+    _shown = false;
+    _inResize = false;
+    BaseEvents = events;
+    _glContext = gl;
+    renderTarget = [[IOSurfaceRenderTarget alloc] initWithOpenGlContext:gl];
+    View = [[AvnView alloc] initWithParent:this];
+    StandardContainer = [[AutoFitContentView new] initWithContent:View];
+
+    lastPositionSet = { 0, 0 };
+    hasPosition = false;
+    lastSize = NSSize { 100, 100 };
+    lastMaxSize = NSSize { CGFLOAT_MAX, CGFLOAT_MAX};
+    lastMinSize = NSSize { 0, 0 };
+
+    lastMenu = nullptr;
+    
+    CreateNSWindow(usePanel);
+    
+    [Window setContentView:StandardContainer];
+    [Window setStyleMask:NSWindowStyleMaskBorderless];
+    [Window setBackingType:NSBackingStoreBuffered];
+
+    [Window setContentMinSize:lastMinSize];
+    [Window setContentMaxSize:lastMaxSize];
+
+    [Window setOpaque:false];
+    [Window setHasShadow:true];
+}
+
+HRESULT WindowBaseImpl::ObtainNSViewHandle(void **ret) {
+    START_COM_CALL;
+
+    if (ret == nullptr) {
+        return E_POINTER;
+    }
+
+    *ret = (__bridge void *) View;
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::ObtainNSViewHandleRetained(void **ret) {
+    START_COM_CALL;
+
+    if (ret == nullptr) {
+        return E_POINTER;
+    }
+
+    *ret = (__bridge_retained void *) View;
+
+    return S_OK;
+}
+
+NSWindow *WindowBaseImpl::GetNSWindow() {
+    return Window;
+}
+
+AvnView *WindowBaseImpl::GetNSView() {
+    return View;
+}
+
+HRESULT WindowBaseImpl::ObtainNSWindowHandleRetained(void **ret) {
+    START_COM_CALL;
+
+    if (ret == nullptr) {
+        return E_POINTER;
+    }
+
+    *ret = (__bridge_retained void *) Window;
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::Show(bool activate, bool isDialog) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        [Window setContentSize:lastSize];
+        
+        if(hasPosition)
+        {
+            SetPosition(lastPositionSet);
+        } else
+        {
+            [Window center];
+        }
+
+        UpdateStyle();
+        
+        [Window invalidateShadow];
+
+        if (ShouldTakeFocusOnShow() && activate) {
+            [Window orderFront:Window];
+            [Window makeKeyAndOrderFront:Window];
+            [Window makeFirstResponder:View];
+            [NSApp activateIgnoringOtherApps:YES];
+        } else {
+            [Window orderFront:Window];
+        }
+
+        _shown = true;
+
+        return S_OK;
+    }
+}
+
+bool WindowBaseImpl::IsShown ()
+{
+    return _shown;
+}
+
+bool WindowBaseImpl::ShouldTakeFocusOnShow() {
+    return true;
+}
+
+HRESULT WindowBaseImpl::ObtainNSWindowHandle(void **ret) {
+    START_COM_CALL;
+
+    if (ret == nullptr) {
+        return E_POINTER;
+    }
+
+    *ret = (__bridge void *) Window;
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::Hide() {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (Window != nullptr) {
+            [Window orderOut:Window];
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::Activate() {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (Window != nullptr) {
+            [Window makeKeyAndOrderFront:nil];
+            [NSApp activateIgnoringOtherApps:YES];
+        }
+    }
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::SetTopMost(bool value) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        [Window setLevel:value ? NSFloatingWindowLevel : NSNormalWindowLevel];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::Close() {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (Window != nullptr) {
+            auto window = Window;
+            Window = nullptr;
+
+            try {
+                // Seems to throw sometimes on application exit.
+                [window close];
+            }
+            catch (NSException *) {}
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::GetClientSize(AvnSize *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr)
+            return E_POINTER;
+
+        ret->Width = lastSize.width;
+        ret->Height = lastSize.height;
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::GetFrameSize(AvnSize *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr)
+            return E_POINTER;
+
+        if(Window != nullptr){
+            auto frame = [Window frame];
+            ret->Width = frame.size.width;
+            ret->Height = frame.size.height;
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::GetScaling(double *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr)
+            return E_POINTER;
+
+        if (Window == nullptr) {
+            *ret = 1;
+            return S_OK;
+        }
+
+        *ret = [Window backingScaleFactor];
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::SetMinMaxSize(AvnSize minSize, AvnSize maxSize) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        lastMinSize = ToNSSize(minSize);
+        lastMaxSize = ToNSSize(maxSize);
+
+        if(Window != nullptr) {
+            [Window setContentMinSize:lastMinSize];
+            [Window setContentMaxSize:lastMaxSize];
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::Resize(double x, double y, AvnPlatformResizeReason reason) {
+    if (_inResize) {
+        return S_OK;
+    }
+
+    _inResize = true;
+
+    START_COM_CALL;
+    auto resizeBlock = ResizeScope(View, reason);
+
+    @autoreleasepool {
+        auto maxSize = lastMaxSize;
+        auto minSize = lastMinSize;
+
+        if (x < minSize.width) {
+            x = minSize.width;
+        }
+
+        if (y < minSize.height) {
+            y = minSize.height;
+        }
+
+        if (x > maxSize.width) {
+            x = maxSize.width;
+        }
+
+        if (y > maxSize.height) {
+            y = maxSize.height;
+        }
+
+        @try {
+            if(x != lastSize.width || y != lastSize.height) {
+                lastSize = NSSize{x, y};
+
+                if (!_shown) {
+                    BaseEvents->Resized(AvnSize{x, y}, reason);
+                } else if (Window != nullptr) {
+                    [Window setContentSize:lastSize];
+                    [Window invalidateShadow];
+                }
+            }
+        }
+        @finally {
+            _inResize = false;
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::Invalidate(__attribute__((unused)) AvnRect rect) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        [View setNeedsDisplayInRect:[View frame]];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::SetMainMenu(IAvnMenu *menu) {
+    START_COM_CALL;
+
+    auto nativeMenu = dynamic_cast<AvnAppMenu *>(menu);
+
+    lastMenu = nativeMenu->GetNative();
+
+    if(Window != nullptr) {
+        [GetWindowProtocol() applyMenu:lastMenu];
+
+        if ([Window isKeyWindow]) {
+            [GetWindowProtocol() showWindowMenuWithAppMenu];
+        }
+    }
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::BeginMoveDrag() {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        auto lastEvent = [View lastMouseDownEvent];
+
+        if (lastEvent == nullptr) {
+            return S_OK;
+        }
+
+        [Window performWindowDragWithEvent:lastEvent];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::BeginResizeDrag(__attribute__((unused)) AvnWindowEdge edge) {
+    START_COM_CALL;
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::GetPosition(AvnPoint *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr) {
+            return E_POINTER;
+        }
+
+        if(Window != nullptr) {
+            auto frame = [Window frame];
+
+            ret->X = frame.origin.x;
+            ret->Y = frame.origin.y + frame.size.height;
+
+            *ret = ConvertPointY(*ret);
+        } else
+        {
+            *ret = lastPositionSet;
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::SetPosition(AvnPoint point) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        lastPositionSet = point;
+        hasPosition = true;
+
+        if(Window != nullptr) {
+            [Window setFrameTopLeftPoint:ToNSPoint(ConvertPointY(point))];
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::PointToClient(AvnPoint point, AvnPoint *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr) {
+            return E_POINTER;
+        }
+
+        point = ConvertPointY(point);
+        NSRect convertRect = [Window convertRectFromScreen:NSMakeRect(point.X, point.Y, 0.0, 0.0)];
+        auto viewPoint = NSMakePoint(convertRect.origin.x, convertRect.origin.y);
+
+        *ret = [View translateLocalPoint:ToAvnPoint(viewPoint)];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::PointToScreen(AvnPoint point, AvnPoint *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr) {
+            return E_POINTER;
+        }
+
+        auto cocoaViewPoint = ToNSPoint([View translateLocalPoint:point]);
+        NSRect convertRect = [Window convertRectToScreen:NSMakeRect(cocoaViewPoint.x, cocoaViewPoint.y, 0.0, 0.0)];
+        auto cocoaScreenPoint = NSPointFromCGPoint(NSMakePoint(convertRect.origin.x, convertRect.origin.y));
+        *ret = ConvertPointY(ToAvnPoint(cocoaScreenPoint));
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowBaseImpl::ThreadSafeSetSwRenderedFrame(AvnFramebuffer *fb, IUnknown *dispose) {
+    START_COM_CALL;
+
+    [View setSwRenderedFrame:fb dispose:dispose];
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::SetCursor(IAvnCursor *cursor) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        Cursor *avnCursor = dynamic_cast<Cursor *>(cursor);
+        this->cursor = avnCursor->GetNative();
+        UpdateCursor();
+
+        if (avnCursor->IsHidden()) {
+            [NSCursor hide];
+        } else {
+            [NSCursor unhide];
+        }
+
+        return S_OK;
+    }
+}
+
+void WindowBaseImpl::UpdateCursor() {
+    if (cursor != nil) {
+        [cursor set];
+    }
+}
+
+HRESULT WindowBaseImpl::CreateGlRenderTarget(IAvnGlSurfaceRenderTarget **ppv) {
+    START_COM_CALL;
+
+    if (View == NULL)
+        return E_FAIL;
+    *ppv = [renderTarget createSurfaceRenderTarget];
+    return static_cast<HRESULT>(*ppv == nil ? E_FAIL : S_OK);
+}
+
+HRESULT WindowBaseImpl::CreateNativeControlHost(IAvnNativeControlHost **retOut) {
+    START_COM_CALL;
+
+    if (View == NULL)
+        return E_FAIL;
+    *retOut = ::CreateNativeControlHost(View);
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::SetBlurEnabled(bool enable) {
+    START_COM_CALL;
+
+    [StandardContainer ShowBlur:enable];
+
+    return S_OK;
+}
+
+HRESULT WindowBaseImpl::BeginDragAndDropOperation(AvnDragDropEffects effects, AvnPoint point, IAvnClipboard *clipboard, IAvnDndResultCallback *cb, void *sourceHandle) {
+    START_COM_CALL;
+
+    auto item = TryGetPasteboardItem(clipboard);
+    [item setString:@"" forType:GetAvnCustomDataType()];
+    if (item == nil)
+        return E_INVALIDARG;
+    if (View == NULL)
+        return E_FAIL;
+
+    auto nsevent = [NSApp currentEvent];
+    auto nseventType = [nsevent type];
+
+    // If current event isn't a mouse one (probably due to malfunctioning user app)
+    // attempt to forge a new one
+    if (!((nseventType >= NSEventTypeLeftMouseDown && nseventType <= NSEventTypeMouseExited)
+            || (nseventType >= NSEventTypeOtherMouseDown && nseventType <= NSEventTypeOtherMouseDragged))) {
+        NSRect convertRect = [Window convertRectToScreen:NSMakeRect(point.X, point.Y, 0.0, 0.0)];
+        auto nspoint = NSMakePoint(convertRect.origin.x, convertRect.origin.y);
+        CGPoint cgpoint = NSPointToCGPoint(nspoint);
+        auto cgevent = CGEventCreateMouseEvent(NULL, kCGEventLeftMouseDown, cgpoint, kCGMouseButtonLeft);
+        nsevent = [NSEvent eventWithCGEvent:cgevent];
+        CFRelease(cgevent);
+    }
+
+    auto dragItem = [[NSDraggingItem alloc] initWithPasteboardWriter:item];
+
+    auto dragItemImage = [NSImage imageNamed:NSImageNameMultipleDocuments];
+    NSRect dragItemRect = {(float) point.X, (float) point.Y, [dragItemImage size].width, [dragItemImage size].height};
+    [dragItem setDraggingFrame:dragItemRect contents:dragItemImage];
+
+    int op = 0;
+    int ieffects = (int) effects;
+    if ((ieffects & (int) AvnDragDropEffects::Copy) != 0)
+        op |= NSDragOperationCopy;
+    if ((ieffects & (int) AvnDragDropEffects::Link) != 0)
+        op |= NSDragOperationLink;
+    if ((ieffects & (int) AvnDragDropEffects::Move) != 0)
+        op |= NSDragOperationMove;
+    [View beginDraggingSessionWithItems:@[dragItem] event:nsevent
+                                 source:CreateDraggingSource((NSDragOperation) op, cb, sourceHandle)];
+    return S_OK;
+}
+
+bool WindowBaseImpl::IsDialog() {
+    return false;
+}
+
+NSWindowStyleMask WindowBaseImpl::GetStyle() {
+    return NSWindowStyleMaskBorderless;
+}
+
+void WindowBaseImpl::UpdateStyle() {
+    [Window setStyleMask:GetStyle()];
+}
+
+void WindowBaseImpl::CleanNSWindow() {
+    if(Window != nullptr) {
+        [GetWindowProtocol() disconnectParent];
+        [Window close];
+        Window = nullptr;
+    }
+}
+
+void WindowBaseImpl::CreateNSWindow(bool isDialog) {
+    if (isDialog) {
+        if (![Window isKindOfClass:[AvnPanel class]]) {
+            CleanNSWindow();
+
+            Window = [[AvnPanel alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:GetStyle()];
+            
+            [Window setHidesOnDeactivate:false];
+        }
+    } else {
+        if (![Window isKindOfClass:[AvnWindow class]]) {
+            CleanNSWindow();
+
+            Window = [[AvnWindow alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:GetStyle()];
+        }
+    }
+}
+
+id <AvnWindowProtocol> WindowBaseImpl::GetWindowProtocol() {
+    if(Window == nullptr)
+    {
+        return nullptr;
+    }
+
+    return (id <AvnWindowProtocol>) Window;
+}
+
+void WindowBaseImpl::BringToFront()
+{
+    // do nothing.
+}
+
+extern IAvnWindow* CreateAvnWindow(IAvnWindowEvents*events, IAvnGlContext* gl)
+{
+    @autoreleasepool
+    {
+        IAvnWindow* ptr = (IAvnWindow*)new WindowImpl(events, gl);
+        return ptr;
+    }
+}
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.h b/native/Avalonia.Native/src/OSX/WindowImpl.h
new file mode 100644
index 0000000000..b4b1d4e70b
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.h
@@ -0,0 +1,108 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#ifndef AVALONIA_NATIVE_OSX_WINDOWIMPL_H
+#define AVALONIA_NATIVE_OSX_WINDOWIMPL_H
+
+#import "WindowBaseImpl.h"
+#include "IWindowStateChanged.h"
+#include <list>
+
+class WindowImpl : public virtual WindowBaseImpl, public virtual IAvnWindow, public IWindowStateChanged
+{
+private:
+    bool _isEnabled;
+    bool _canResize;
+    bool _fullScreenActive;
+    SystemDecorations _decorations;
+    AvnWindowState _lastWindowState;
+    AvnWindowState _actualWindowState;
+    bool _inSetWindowState;
+    NSRect _preZoomSize;
+    bool _transitioningWindowState;
+    bool _isClientAreaExtended;
+    bool _isDialog;
+    WindowImpl* _parent;
+    std::list<WindowImpl*> _children;
+    AvnExtendClientAreaChromeHints _extendClientHints;
+
+    FORWARD_IUNKNOWN()
+BEGIN_INTERFACE_MAP()
+        INHERIT_INTERFACE_MAP(WindowBaseImpl)
+        INTERFACE_MAP_ENTRY(IAvnWindow, IID_IAvnWindow)
+    END_INTERFACE_MAP()
+    virtual ~WindowImpl()
+    {
+    }
+
+    ComPtr<IAvnWindowEvents> WindowEvents;
+
+    WindowImpl(IAvnWindowEvents* events, IAvnGlContext* gl);
+
+    void HideOrShowTrafficLights ();
+
+    virtual HRESULT Show (bool activate, bool isDialog) override;
+
+    virtual HRESULT SetEnabled (bool enable) override;
+
+    virtual HRESULT SetParent (IAvnWindow* parent) override;
+
+    void StartStateTransition () override ;
+
+    void EndStateTransition () override ;
+
+    SystemDecorations Decorations () override ;
+
+    AvnWindowState WindowState () override ;
+
+    void WindowStateChanged () override ;
+
+    bool UndecoratedIsMaximized ();
+
+    bool IsZoomed ();
+
+    void DoZoom();
+
+    virtual HRESULT SetCanResize(bool value) override;
+
+    virtual HRESULT SetDecorations(SystemDecorations value) override;
+
+    virtual HRESULT SetTitle (char* utf8title) override;
+
+    virtual HRESULT SetTitleBarColor(AvnColor color) override;
+
+    virtual HRESULT GetWindowState (AvnWindowState*ret) override;
+
+    virtual HRESULT TakeFocusFromChildren () override;
+
+    virtual HRESULT SetExtendClientArea (bool enable) override;
+
+    virtual HRESULT SetExtendClientAreaHints (AvnExtendClientAreaChromeHints hints) override;
+
+    virtual HRESULT GetExtendTitleBarHeight (double*ret) override;
+
+    virtual HRESULT SetExtendTitleBarHeight (double value) override;
+
+    void EnterFullScreenMode ();
+
+    void ExitFullScreenMode ();
+
+    virtual HRESULT SetWindowState (AvnWindowState state) override;
+
+    virtual bool IsDialog() override;
+    
+    virtual void BringToFront () override;
+    
+    bool CanBecomeKeyWindow ();
+
+protected:
+    virtual NSWindowStyleMask GetStyle() override;
+
+private:
+    void OnInitialiseNSWindow();
+    NSString *_lastTitle;
+};
+
+#endif //AVALONIA_NATIVE_OSX_WINDOWIMPL_H
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
new file mode 100644
index 0000000000..6db586f3ca
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -0,0 +1,597 @@
+//
+// Created by Dan Walmsley on 04/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+#include "AutoFitContentView.h"
+#include "AvnView.h"
+#include "automation.h"
+#include "WindowProtocol.h"
+
+WindowImpl::WindowImpl(IAvnWindowEvents *events, IAvnGlContext *gl) : WindowBaseImpl(events, gl) {
+    _isEnabled = true;
+    _children = std::list<WindowImpl*>();
+    _isClientAreaExtended = false;
+    _extendClientHints = AvnDefaultChrome;
+    _fullScreenActive = false;
+    _canResize = true;
+    _decorations = SystemDecorationsFull;
+    _transitioningWindowState = false;
+    _inSetWindowState = false;
+    _lastWindowState = Normal;
+    _actualWindowState = Normal;
+    _lastTitle = @"";
+    _parent = nullptr;
+    WindowEvents = events;
+    
+    OnInitialiseNSWindow();
+}
+
+void WindowImpl::HideOrShowTrafficLights() {
+    if (Window == nil) {
+        return;
+    }
+
+    bool wantsChrome = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
+    bool hasTrafficLights = _isClientAreaExtended ? wantsChrome : _decorations == SystemDecorationsFull;
+    
+    [[Window standardWindowButton:NSWindowCloseButton] setHidden:!hasTrafficLights];
+    [[Window standardWindowButton:NSWindowMiniaturizeButton] setHidden:!hasTrafficLights];
+    [[Window standardWindowButton:NSWindowZoomButton] setHidden:!hasTrafficLights];
+}
+
+void WindowImpl::OnInitialiseNSWindow(){
+    [GetWindowProtocol() setCanBecomeKeyWindow:true];
+    
+    [Window disableCursorRects];
+    [Window setTabbingMode:NSWindowTabbingModeDisallowed];
+    [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
+
+    [Window setTitle:_lastTitle];
+    
+    if(_isClientAreaExtended)
+    {
+        [GetWindowProtocol() setIsExtended:true];
+        SetExtendClientArea(true);
+    }
+}
+
+HRESULT WindowImpl::Show(bool activate, bool isDialog) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        _isDialog = isDialog;
+
+        WindowBaseImpl::Show(activate, isDialog);
+
+        HideOrShowTrafficLights();
+
+        return SetWindowState(_lastWindowState);
+    }
+}
+
+HRESULT WindowImpl::SetEnabled(bool enable) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        _isEnabled = enable;
+        [GetWindowProtocol() setEnabled:enable];
+        UpdateStyle();
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetParent(IAvnWindow *parent) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if(_parent != nullptr)
+        {
+            _parent->_children.remove(this);
+            
+            _parent->BringToFront();
+        }
+
+        auto cparent = dynamic_cast<WindowImpl *>(parent);
+        
+        _parent = cparent;
+        
+        if(_parent != nullptr && Window != nullptr){
+            // If one tries to show a child window with a minimized parent window, then the parent window will be
+            // restored but macOS isn't kind enough to *tell* us that, so the window will be left in a non-interactive
+            // state. Detect this and explicitly restore the parent window ourselves to avoid this situation.
+            if (cparent->WindowState() == Minimized)
+                cparent->SetWindowState(Normal);
+
+            [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
+                
+            cparent->_children.push_back(this);
+                
+            UpdateStyle();
+        }
+
+        return S_OK;
+    }
+}
+
+void WindowImpl::BringToFront()
+{
+    if(Window != nullptr)
+    {
+        if(IsDialog())
+        {
+            Activate();
+        }
+        else
+        {
+            [Window orderFront:nullptr];
+        }
+        
+        [Window invalidateShadow];
+        
+        for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
+        {
+            (*iterator)->BringToFront();
+        }
+    }
+}
+
+bool WindowImpl::CanBecomeKeyWindow()
+{
+    for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
+    {
+        if((*iterator)->IsDialog())
+        {
+            return false;
+        }
+    }
+    
+    return true;
+}
+
+void WindowImpl::StartStateTransition() {
+    _transitioningWindowState = true;
+}
+
+void WindowImpl::EndStateTransition() {
+    _transitioningWindowState = false;
+}
+
+SystemDecorations WindowImpl::Decorations() {
+    return _decorations;
+}
+
+AvnWindowState WindowImpl::WindowState() {
+    return _lastWindowState;
+}
+
+void WindowImpl::WindowStateChanged() {
+    if (_shown && !_inSetWindowState && !_transitioningWindowState) {
+        AvnWindowState state;
+        GetWindowState(&state);
+
+        if (_lastWindowState != state) {
+            if (_isClientAreaExtended) {
+                if (_lastWindowState == FullScreen) {
+                    // we exited fs.
+                    if (_extendClientHints & AvnOSXThickTitleBar) {
+                        Window.toolbar = [NSToolbar new];
+                        Window.toolbar.showsBaselineSeparator = false;
+                    }
+
+                    [Window setTitlebarAppearsTransparent:true];
+
+                    [StandardContainer setFrameSize:StandardContainer.frame.size];
+                } else if (state == FullScreen) {
+                    // we entered fs.
+                    if (_extendClientHints & AvnOSXThickTitleBar) {
+                        Window.toolbar = nullptr;
+                    }
+
+                    [Window setTitlebarAppearsTransparent:false];
+
+                    [StandardContainer setFrameSize:StandardContainer.frame.size];
+                }
+            }
+
+            _lastWindowState = state;
+            _actualWindowState = state;
+            WindowEvents->WindowStateChanged(state);
+        }
+    }
+}
+
+bool WindowImpl::UndecoratedIsMaximized() {
+    auto windowSize = [Window frame];
+    auto available = [Window screen].visibleFrame;
+    return CGRectEqualToRect(windowSize, available);
+}
+
+bool WindowImpl::IsZoomed() {
+    return _decorations == SystemDecorationsFull ? [Window isZoomed] : UndecoratedIsMaximized();
+}
+
+void WindowImpl::DoZoom() {
+    switch (_decorations) {
+        case SystemDecorationsNone:
+        case SystemDecorationsBorderOnly:
+            [Window setFrame:[Window screen].visibleFrame display:true];
+            break;
+
+
+        case SystemDecorationsFull:
+            [Window performZoom:Window];
+            break;
+    }
+}
+
+HRESULT WindowImpl::SetCanResize(bool value) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        _canResize = value;
+        UpdateStyle();
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetDecorations(SystemDecorations value) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        auto currentWindowState = _lastWindowState;
+        _decorations = value;
+
+        if (_fullScreenActive) {
+            return S_OK;
+        }
+
+        UpdateStyle();
+
+        HideOrShowTrafficLights();
+
+        switch (_decorations) {
+            case SystemDecorationsNone:
+                [Window setHasShadow:NO];
+                [Window setTitleVisibility:NSWindowTitleHidden];
+                [Window setTitlebarAppearsTransparent:YES];
+
+                if (currentWindowState == Maximized) {
+                    if (!UndecoratedIsMaximized()) {
+                        DoZoom();
+                    }
+                }
+                break;
+
+            case SystemDecorationsBorderOnly:
+                [Window setHasShadow:YES];
+                [Window setTitleVisibility:NSWindowTitleHidden];
+                [Window setTitlebarAppearsTransparent:YES];
+
+                if (currentWindowState == Maximized) {
+                    if (!UndecoratedIsMaximized()) {
+                        DoZoom();
+                    }
+                }
+                break;
+
+            case SystemDecorationsFull:
+                [Window setHasShadow:YES];
+                [Window setTitleVisibility:NSWindowTitleVisible];
+                [Window setTitlebarAppearsTransparent:NO];
+                [Window setTitle:_lastTitle];
+
+                if (currentWindowState == Maximized) {
+                    auto newFrame = [Window contentRectForFrameRect:[Window frame]].size;
+
+                    [View setFrameSize:newFrame];
+                }
+                break;
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetTitle(char *utf8title) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        _lastTitle = [NSString stringWithUTF8String:(const char *) utf8title];
+        [Window setTitle:_lastTitle];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetTitleBarColor(AvnColor color) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        float a = (float) color.Alpha / 255.0f;
+        float r = (float) color.Red / 255.0f;
+        float g = (float) color.Green / 255.0f;
+        float b = (float) color.Blue / 255.0f;
+
+        auto nscolor = [NSColor colorWithSRGBRed:r green:g blue:b alpha:a];
+
+        // Based on the titlebar color we have to choose either light or dark
+        // OSX doesnt let you set a foreground color for titlebar.
+        if ((r * 0.299 + g * 0.587 + b * 0.114) > 186.0f / 255.0f) {
+            [Window setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantLight]];
+        } else {
+            [Window setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantDark]];
+        }
+
+        [Window setTitlebarAppearsTransparent:true];
+        [Window setBackgroundColor:nscolor];
+    }
+
+    return S_OK;
+}
+
+HRESULT WindowImpl::GetWindowState(AvnWindowState *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr) {
+            return E_POINTER;
+        }
+
+        if (([Window styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen) {
+            *ret = FullScreen;
+            return S_OK;
+        }
+
+        if ([Window isMiniaturized]) {
+            *ret = Minimized;
+            return S_OK;
+        }
+
+        if (IsZoomed()) {
+            *ret = Maximized;
+            return S_OK;
+        }
+
+        *ret = Normal;
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::TakeFocusFromChildren() {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (Window == nil)
+            return S_OK;
+        if ([Window isKeyWindow])
+            [Window makeFirstResponder:View];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetExtendClientArea(bool enable) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        _isClientAreaExtended = enable;
+
+        if(Window != nullptr) {
+            if (enable) {
+                Window.titleVisibility = NSWindowTitleHidden;
+
+                [Window setTitlebarAppearsTransparent:true];
+
+                auto wantsTitleBar = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
+
+                if (wantsTitleBar) {
+                    [StandardContainer ShowTitleBar:true];
+                } else {
+                    [StandardContainer ShowTitleBar:false];
+                }
+
+                if (_extendClientHints & AvnOSXThickTitleBar) {
+                    Window.toolbar = [NSToolbar new];
+                    Window.toolbar.showsBaselineSeparator = false;
+                } else {
+                    Window.toolbar = nullptr;
+                }
+            } else {
+                Window.titleVisibility = NSWindowTitleVisible;
+                Window.toolbar = nullptr;
+                [Window setTitlebarAppearsTransparent:false];
+                View.layer.zPosition = 0;
+            }
+
+            [GetWindowProtocol() setIsExtended:enable];
+
+            HideOrShowTrafficLights();
+
+            UpdateStyle();
+        }
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetExtendClientAreaHints(AvnExtendClientAreaChromeHints hints) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        _extendClientHints = hints;
+
+        SetExtendClientArea(_isClientAreaExtended);
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::GetExtendTitleBarHeight(double *ret) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        if (ret == nullptr) {
+            return E_POINTER;
+        }
+
+        *ret = [GetWindowProtocol() getExtendedTitleBarHeight];
+
+        return S_OK;
+    }
+}
+
+HRESULT WindowImpl::SetExtendTitleBarHeight(double value) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        [StandardContainer SetTitleBarHeightHint:value];
+        return S_OK;
+    }
+}
+
+void WindowImpl::EnterFullScreenMode() {
+    _fullScreenActive = true;
+
+    [Window setTitle:_lastTitle];
+    [Window toggleFullScreen:nullptr];
+}
+
+void WindowImpl::ExitFullScreenMode() {
+    [Window toggleFullScreen:nullptr];
+
+    _fullScreenActive = false;
+
+    SetDecorations(_decorations);
+}
+
+HRESULT WindowImpl::SetWindowState(AvnWindowState state) {
+    START_COM_CALL;
+
+    @autoreleasepool {
+        auto currentState = _actualWindowState;
+        _lastWindowState = state;
+
+        if (Window == nullptr) {
+            return S_OK;
+        }
+
+        if (_actualWindowState == state) {
+            return S_OK;
+        }
+
+        _inSetWindowState = true;
+
+        if (currentState == Normal) {
+            _preZoomSize = [Window frame];
+        }
+
+        if (_shown) {
+            switch (state) {
+                case Maximized:
+                    if (currentState == FullScreen) {
+                        ExitFullScreenMode();
+                    }
+
+                    lastPositionSet.X = 0;
+                    lastPositionSet.Y = 0;
+
+                    if ([Window isMiniaturized]) {
+                        [Window deminiaturize:Window];
+                    }
+
+                    if (!IsZoomed()) {
+                        DoZoom();
+                    }
+                    break;
+
+                case Minimized:
+                    if (currentState == FullScreen) {
+                        ExitFullScreenMode();
+                    } else {
+                        [Window miniaturize:Window];
+                    }
+                    break;
+
+                case FullScreen:
+                    if ([Window isMiniaturized]) {
+                        [Window deminiaturize:Window];
+                    }
+
+                    EnterFullScreenMode();
+                    break;
+
+                case Normal:
+                    if ([Window isMiniaturized]) {
+                        [Window deminiaturize:Window];
+                    }
+
+                    if (currentState == FullScreen) {
+                        ExitFullScreenMode();
+                    }
+
+                    if (IsZoomed()) {
+                        if (_decorations == SystemDecorationsFull) {
+                            DoZoom();
+                        } else {
+                            [Window setFrame:_preZoomSize display:true];
+                            auto newFrame = [Window contentRectForFrameRect:[Window frame]].size;
+
+                            [View setFrameSize:newFrame];
+                        }
+
+                    }
+                    break;
+            }
+
+            _actualWindowState = _lastWindowState;
+            WindowEvents->WindowStateChanged(_actualWindowState);
+        }
+
+
+        _inSetWindowState = false;
+
+        return S_OK;
+    }
+}
+
+bool WindowImpl::IsDialog() {
+    return _isDialog;
+}
+
+NSWindowStyleMask WindowImpl::GetStyle() {
+    unsigned long s = NSWindowStyleMaskBorderless;
+    
+    if(_actualWindowState == FullScreen)
+    {
+        s |= NSWindowStyleMaskFullScreen;
+    }
+
+    switch (_decorations) {
+        case SystemDecorationsNone:
+            s = s | NSWindowStyleMaskFullSizeContentView;
+            break;
+
+        case SystemDecorationsBorderOnly:
+            s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskFullSizeContentView;
+            break;
+
+        case SystemDecorationsFull:
+            s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskClosable;
+
+            if (_canResize && _isEnabled) {
+                s = s | NSWindowStyleMaskResizable;
+            }
+            break;
+    }
+
+    if (!IsDialog()) {
+        s |= NSWindowStyleMaskMiniaturizable;
+    }
+
+    if (_isClientAreaExtended) {
+        s |= NSWindowStyleMaskFullSizeContentView | NSWindowStyleMaskTexturedBackground;
+    }
+    return s;
+}
diff --git a/native/Avalonia.Native/src/OSX/WindowInterfaces.h b/native/Avalonia.Native/src/OSX/WindowInterfaces.h
new file mode 100644
index 0000000000..6e6d62e85e
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/WindowInterfaces.h
@@ -0,0 +1,17 @@
+//
+// Created by Dan Walmsley on 06/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <AppKit/AppKit.h>
+#include "WindowProtocol.h"
+#include "WindowBaseImpl.h"
+
+@interface AvnWindow : NSWindow <AvnWindowProtocol, NSWindowDelegate>
+-(AvnWindow* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent contentRect: (NSRect)contentRect styleMask: (NSWindowStyleMask)styleMask;
+@end
+
+@interface AvnPanel : NSPanel <AvnWindowProtocol, NSWindowDelegate>
+-(AvnPanel* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent contentRect: (NSRect)contentRect styleMask: (NSWindowStyleMask)styleMask;
+@end
\ No newline at end of file
diff --git a/native/Avalonia.Native/src/OSX/WindowProtocol.h b/native/Avalonia.Native/src/OSX/WindowProtocol.h
new file mode 100644
index 0000000000..cb5f86bdb9
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/WindowProtocol.h
@@ -0,0 +1,26 @@
+//
+// Created by Dan Walmsley on 06/05/2022.
+// Copyright (c) 2022 Avalonia. All rights reserved.
+//
+
+#pragma once
+
+#import <AppKit/AppKit.h>
+
+@class AvnMenu;
+
+@protocol AvnWindowProtocol
+-(void) pollModalSession: (NSModalSession _Nonnull) session;
+-(bool) shouldTryToHandleEvents;
+-(void) setEnabled: (bool) enable;
+-(void) showAppMenuOnly;
+-(void) showWindowMenuWithAppMenu;
+-(void) applyMenu:(AvnMenu* _Nullable)menu;
+
+-(double) getExtendedTitleBarHeight;
+-(void) setIsExtended:(bool)value;
+-(void) disconnectParent;
+-(bool) isDialog;
+
+-(void) setCanBecomeKeyWindow:(bool)value;
+@end
diff --git a/native/Avalonia.Native/src/OSX/app.mm b/native/Avalonia.Native/src/OSX/app.mm
index 79175d9ff1..a15d0c9601 100644
--- a/native/Avalonia.Native/src/OSX/app.mm
+++ b/native/Avalonia.Native/src/OSX/app.mm
@@ -73,12 +73,17 @@ ComPtr<IAvnApplicationEvents> _events;
     _isHandlingSendEvent = true;
     @try {
         [super sendEvent: event];
+        if ([event type] == NSEventTypeKeyUp && ([event modifierFlags] & NSEventModifierFlagCommand))
+        {
+            [[self keyWindow] sendEvent:event];
+        }
+        
     } @finally {
         _isHandlingSendEvent = oldHandling;
     }
 }
 
-// This is needed for certain embedded controls
+// This is needed for certain embedded controls DO NOT REMOVE..
 - (BOOL) isHandlingSendEvent
 {
     return _isHandlingSendEvent;
@@ -88,7 +93,6 @@ ComPtr<IAvnApplicationEvents> _events;
 {
     _isHandlingSendEvent = handlingSendEvent;
 }
-
 @end
 
 extern void InitializeAvnApp(IAvnApplicationEvents* events)
diff --git a/native/Avalonia.Native/src/OSX/automation.h b/native/Avalonia.Native/src/OSX/automation.h
index 4a12a965fd..367df3619d 100644
--- a/native/Avalonia.Native/src/OSX/automation.h
+++ b/native/Avalonia.Native/src/OSX/automation.h
@@ -1,6 +1,6 @@
-#import <Cocoa/Cocoa.h>
-#include "window.h"
+#pragma once
 
+#import <Cocoa/Cocoa.h>
 NS_ASSUME_NONNULL_BEGIN
 
 class IAvnAutomationPeer;
diff --git a/native/Avalonia.Native/src/OSX/automation.mm b/native/Avalonia.Native/src/OSX/automation.mm
index 7d697140c2..d0c8d7a9db 100644
--- a/native/Avalonia.Native/src/OSX/automation.mm
+++ b/native/Avalonia.Native/src/OSX/automation.mm
@@ -1,7 +1,8 @@
 #include "common.h"
 #include "automation.h"
 #include "AvnString.h"
-#include "window.h"
+#include "INSWindowHolder.h"
+#include "AvnView.h"
 
 @interface AvnAccessibilityElement (Events)
 - (void) raiseChildrenChanged;
diff --git a/native/Avalonia.Native/src/OSX/common.h b/native/Avalonia.Native/src/OSX/common.h
index 9186d9e15a..a90a235b9d 100644
--- a/native/Avalonia.Native/src/OSX/common.h
+++ b/native/Avalonia.Native/src/OSX/common.h
@@ -27,7 +27,7 @@ extern IAvnMenuItem* CreateAppMenuItem();
 extern IAvnMenuItem* CreateAppMenuItemSeparator();
 extern IAvnApplicationCommands* CreateApplicationCommands();
 extern IAvnNativeControlHost* CreateNativeControlHost(NSView* parent);
-extern void SetAppMenu (NSString* appName, IAvnMenu* appMenu);
+extern void SetAppMenu(IAvnMenu *menu);
 extern void SetServicesMenu (IAvnMenu* menu);
 extern IAvnMenu* GetAppMenu ();
 extern NSMenuItem* GetAppMenuItem ();
@@ -38,7 +38,6 @@ extern NSPoint ToNSPoint (AvnPoint p);
 extern NSRect ToNSRect (AvnRect r);
 extern AvnPoint ToAvnPoint (NSPoint p);
 extern AvnPoint ConvertPointY (AvnPoint p);
-extern CGFloat PrimaryDisplayHeight();
 extern NSSize ToNSSize (AvnSize s);
 #ifdef DEBUG
 #define NSDebugLog(...) NSLog(__VA_ARGS__)
diff --git a/native/Avalonia.Native/src/OSX/controlhost.mm b/native/Avalonia.Native/src/OSX/controlhost.mm
index f8e9a3b6d1..5683a5a975 100644
--- a/native/Avalonia.Native/src/OSX/controlhost.mm
+++ b/native/Avalonia.Native/src/OSX/controlhost.mm
@@ -36,7 +36,10 @@ public:
     virtual void DestroyDefaultChild(void* child) override
     {
         // ARC will release the object for us
+        #pragma clang diagnostic push
+        #pragma clang diagnostic ignored "-Wunused-value"
         (__bridge_transfer NSView*) child;
+        #pragma clang diagnostic pop
     }
 };
 
diff --git a/native/Avalonia.Native/src/OSX/cursor.mm b/native/Avalonia.Native/src/OSX/cursor.mm
index dc38294a18..8638a03531 100644
--- a/native/Avalonia.Native/src/OSX/cursor.mm
+++ b/native/Avalonia.Native/src/OSX/cursor.mm
@@ -1,6 +1,5 @@
 #include "common.h"
 #include "cursor.h"
-#include <map>
 
 class CursorFactory : public ComSingleObject<IAvnCursorFactory, &IID_IAvnCursorFactory>
 {
diff --git a/native/Avalonia.Native/src/OSX/main.mm b/native/Avalonia.Native/src/OSX/main.mm
index ea79c494d7..6ee86b21ae 100644
--- a/native/Avalonia.Native/src/OSX/main.mm
+++ b/native/Avalonia.Native/src/OSX/main.mm
@@ -1,7 +1,6 @@
 //This file will contain actual IID structures
 #define COM_GUIDS_MATERIALIZE
 #include "common.h"
-#include "window.h"
 
 static NSString* s_appTitle = @"Avalonia";
 
@@ -343,7 +342,7 @@ public:
         
         @autoreleasepool
         {
-            ::SetAppMenu(s_appTitle, appMenu);
+            ::SetAppMenu(appMenu);
             return S_OK;
         }
     }
@@ -428,7 +427,3 @@ AvnPoint ConvertPointY (AvnPoint p)
     return p;
 }
 
-CGFloat PrimaryDisplayHeight()
-{
-  return NSMaxY([[[NSScreen screens] firstObject] frame]);
-}
diff --git a/native/Avalonia.Native/src/OSX/menu.h b/native/Avalonia.Native/src/OSX/menu.h
index 186fcf255b..ce46ac11e0 100644
--- a/native/Avalonia.Native/src/OSX/menu.h
+++ b/native/Avalonia.Native/src/OSX/menu.h
@@ -31,7 +31,6 @@ private:
     NSMenuItem* _native; // here we hold a pointer to an AvnMenuItem
     IAvnActionCallback* _callback;
     IAvnPredicateCallback* _predicate;
-    bool _isSeparator;
     bool _isCheckable;
     
 public:
diff --git a/native/Avalonia.Native/src/OSX/menu.mm b/native/Avalonia.Native/src/OSX/menu.mm
index 2dbe76bc6d..b05588a441 100644
--- a/native/Avalonia.Native/src/OSX/menu.mm
+++ b/native/Avalonia.Native/src/OSX/menu.mm
@@ -1,7 +1,6 @@
 
 #include "common.h"
 #include "menu.h"
-#include "window.h"
 #include "KeyTransform.h"
 #include <CoreFoundation/CoreFoundation.h>
 #include <Carbon/Carbon.h> /* For kVK_ constants, and TIS functions. */
@@ -74,8 +73,7 @@
 AvnAppMenuItem::AvnAppMenuItem(bool isSeparator)
 {
     _isCheckable = false;
-    _isSeparator = isSeparator;
-    
+
     if(isSeparator)
     {
         _native = [NSMenuItem separatorItem];
@@ -460,7 +458,7 @@ extern IAvnMenuItem* CreateAppMenuItemSeparator()
 static IAvnMenu* s_appMenu = nullptr;
 static NSMenuItem* s_appMenuItem = nullptr;
 
-extern void SetAppMenu (NSString* appName, IAvnMenu* menu)
+extern void SetAppMenu(IAvnMenu *menu)
 {
     s_appMenu = menu;
     
diff --git a/native/Avalonia.Native/src/OSX/rendertarget.mm b/native/Avalonia.Native/src/OSX/rendertarget.mm
index dc5c24e41e..266d0345d1 100644
--- a/native/Avalonia.Native/src/OSX/rendertarget.mm
+++ b/native/Avalonia.Native/src/OSX/rendertarget.mm
@@ -1,14 +1,10 @@
 #include "common.h"
 #include "rendertarget.h"
-#import <IOSurface/IOSurface.h>
 #import <IOSurface/IOSurfaceObjC.h>
 #import <QuartzCore/QuartzCore.h>
 
-#include <OpenGL/CGLIOSurface.h>
-#include <OpenGL/OpenGL.h>
 #include <OpenGL/glext.h>
 #include <OpenGL/gl3.h>
-#include <OpenGL/gl3ext.h>
 
 @interface IOSurfaceHolder : NSObject
 @end
diff --git a/native/Avalonia.Native/src/OSX/window.h b/native/Avalonia.Native/src/OSX/window.h
deleted file mode 100644
index 1369ceaea0..0000000000
--- a/native/Avalonia.Native/src/OSX/window.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef window_h
-#define window_h
-
-class WindowBaseImpl;
-
-@interface AvnView : NSView<NSTextInputClient, NSDraggingDestination>
--(AvnView* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent;
--(NSEvent* _Nonnull) lastMouseDownEvent;
--(AvnPoint) translateLocalPoint:(AvnPoint)pt;
--(void) setSwRenderedFrame: (AvnFramebuffer* _Nonnull) fb dispose: (IUnknown* _Nonnull) dispose;
--(void) onClosed;
--(AvnPixelSize) getPixelSize;
--(AvnPlatformResizeReason) getResizeReason;
--(void) setResizeReason:(AvnPlatformResizeReason)reason;
-+ (AvnPoint)toAvnPoint:(CGPoint)p;
-@end
-
-@interface AutoFitContentView : NSView
--(AutoFitContentView* _Nonnull) initWithContent: (NSView* _Nonnull) content;
--(void) ShowTitleBar: (bool) show;
--(void) SetTitleBarHeightHint: (double) height;
--(void) SetContent: (NSView* _Nonnull) content;
--(void) ShowBlur: (bool) show;
-@end
-
-@interface AvnWindow : NSWindow <NSWindowDelegate>
-+(void) closeAll;
--(AvnWindow* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent;
--(void) setCanBecomeKeyAndMain;
--(void) pollModalSession: (NSModalSession _Nonnull) session;
--(void) restoreParentWindow;
--(bool) shouldTryToHandleEvents;
--(void) setEnabled: (bool) enable;
--(void) showAppMenuOnly;
--(void) showWindowMenuWithAppMenu;
--(void) applyMenu:(NSMenu* _Nullable)menu;
--(double) getScaling;
--(double) getExtendedTitleBarHeight;
--(void) setIsExtended:(bool)value;
--(bool) isDialog;
-@end
-
-struct INSWindowHolder
-{
-    virtual AvnWindow* _Nonnull GetNSWindow () = 0;
-    virtual AvnView* _Nonnull GetNSView () = 0;
-};
-
-struct IWindowStateChanged
-{
-    virtual void WindowStateChanged () = 0;
-    virtual void StartStateTransition () = 0;
-    virtual void EndStateTransition () = 0;
-    virtual SystemDecorations Decorations () = 0;
-    virtual AvnWindowState WindowState () = 0;
-};
-
-class ResizeScope
-{
-public:
-    ResizeScope(AvnView* _Nonnull view, AvnPlatformResizeReason reason)
-    {
-        _view = view;
-        _restore = [view getResizeReason];
-        [view setResizeReason:reason];
-    }
-    
-    ~ResizeScope()
-    {
-        [_view setResizeReason:_restore];
-    }
-private:
-    AvnView* _Nonnull _view;
-    AvnPlatformResizeReason _restore;
-};
-
-#endif /* window_h */
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
deleted file mode 100644
index 4312ee4f16..0000000000
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ /dev/null
@@ -1,2582 +0,0 @@
-#include "common.h"
-#include "window.h"
-#include "KeyTransform.h"
-#include "cursor.h"
-#include "menu.h"
-#include <OpenGL/gl.h>
-#include "rendertarget.h"
-#include "AvnString.h"
-#include "automation.h"
-
-class WindowBaseImpl : public virtual ComObject,
-    public virtual IAvnWindowBase,
-    public INSWindowHolder
-{
-private:
-    NSCursor* cursor;
-
-public:
-    FORWARD_IUNKNOWN()
-    BEGIN_INTERFACE_MAP()
-    INTERFACE_MAP_ENTRY(IAvnWindowBase, IID_IAvnWindowBase)
-    END_INTERFACE_MAP()
-
-    virtual ~WindowBaseImpl()
-    {
-        View = NULL;
-        Window = NULL;
-    }
-    AutoFitContentView* StandardContainer;
-    AvnView* View;
-    AvnWindow* Window;
-    ComPtr<IAvnWindowBaseEvents> BaseEvents;
-    ComPtr<IAvnGlContext> _glContext;
-    NSObject<IRenderTarget>* renderTarget;
-    AvnPoint lastPositionSet;
-    NSString* _lastTitle;
-    IAvnMenu* _mainMenu;
-    
-    bool _shown;
-    bool _inResize;
-    
-    WindowBaseImpl(IAvnWindowBaseEvents* events, IAvnGlContext* gl)
-    {
-        _shown = false;
-        _inResize = false;
-        _mainMenu = nullptr;
-        BaseEvents = events;
-        _glContext = gl;
-        renderTarget = [[IOSurfaceRenderTarget alloc] initWithOpenGlContext: gl];
-        View = [[AvnView alloc] initWithParent:this];
-        StandardContainer = [[AutoFitContentView new] initWithContent:View];
-
-        Window = [[AvnWindow alloc] initWithParent:this];
-        [Window setContentView: StandardContainer];
-        
-        lastPositionSet.X = 100;
-        lastPositionSet.Y = 100;
-        _lastTitle = @"";
-        
-        [Window setStyleMask:NSWindowStyleMaskBorderless];
-        [Window setBackingType:NSBackingStoreBuffered];
-        
-        [Window setOpaque:false];
-    }
-    
-    virtual HRESULT ObtainNSWindowHandle(void** ret) override
-    {
-        START_COM_CALL;
-        
-        if (ret == nullptr)
-        {
-            return E_POINTER;
-        }
-        
-        *ret =  (__bridge void*)Window;
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT ObtainNSWindowHandleRetained(void** ret) override
-    {
-        START_COM_CALL;
-        
-        if (ret == nullptr)
-        {
-            return E_POINTER;
-        }
-        
-        *ret =  (__bridge_retained void*)Window;
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT ObtainNSViewHandle(void** ret) override
-    {
-        START_COM_CALL;
-        
-        if (ret == nullptr)
-        {
-            return E_POINTER;
-        }
-        
-        *ret =  (__bridge void*)View;
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT ObtainNSViewHandleRetained(void** ret) override
-    {
-        START_COM_CALL;
-        
-        if (ret == nullptr)
-        {
-            return E_POINTER;
-        }
-        
-        *ret =  (__bridge_retained void*)View;
-        
-        return S_OK;
-    }
-    
-    virtual AvnWindow* GetNSWindow() override
-    {
-        return Window;
-    }
-
-    virtual AvnView* GetNSView() override
-    {
-        return View;
-    }
-
-    virtual HRESULT Show(bool activate, bool isDialog) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            SetPosition(lastPositionSet);
-            UpdateStyle();
-            
-            [Window setTitle:_lastTitle];
-            
-            if(ShouldTakeFocusOnShow() && activate)
-            {
-                [Window orderFront: Window];
-                [Window makeKeyAndOrderFront:Window];
-                [Window makeFirstResponder:View];
-                [NSApp activateIgnoringOtherApps:YES];
-            }
-            else
-            {
-                [Window orderFront: Window];
-            }
-            
-            _shown = true;
-            
-            return S_OK;
-        }
-    }
-    
-    virtual bool ShouldTakeFocusOnShow()
-    {
-        return true;
-    }
-    
-    virtual HRESULT Hide () override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(Window != nullptr)
-            {
-                [Window orderOut:Window];
-                [Window restoreParentWindow];
-            }
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT Activate () override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(Window != nullptr)
-            {
-                [Window makeKeyAndOrderFront:nil];
-                [NSApp activateIgnoringOtherApps:YES];
-            }
-        }
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT SetTopMost (bool value) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            [Window setLevel: value ? NSFloatingWindowLevel : NSNormalWindowLevel];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT Close() override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if (Window != nullptr)
-            {
-                auto window = Window;
-                Window = nullptr;
-                
-                try{
-                    // Seems to throw sometimes on application exit.
-                    [window close];
-                }
-                catch(NSException*){}
-            }
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT GetClientSize(AvnSize* ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-                return E_POINTER;
-            
-            auto frame = [View frame];
-            ret->Width = frame.size.width;
-            ret->Height = frame.size.height;
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT GetFrameSize(AvnSize* ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-                return E_POINTER;
-            
-            auto frame = [Window frame];
-            ret->Width = frame.size.width;
-            ret->Height = frame.size.height;
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT GetScaling (double* ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-                return E_POINTER;
-            
-            if(Window == nullptr)
-            {
-                *ret = 1;
-                return S_OK;
-            }
-            
-            *ret = [Window backingScaleFactor];
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetMinMaxSize (AvnSize minSize, AvnSize maxSize) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            [Window setMinSize: ToNSSize(minSize)];
-            [Window setMaxSize: ToNSSize(maxSize)];
-        
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT Resize(double x, double y, AvnPlatformResizeReason reason) override
-    {
-        if(_inResize)
-        {
-            return S_OK;
-        }
-        
-        _inResize = true;
-        
-        START_COM_CALL;
-        auto resizeBlock = ResizeScope(View, reason);
-        
-        @autoreleasepool
-        {
-            auto maxSize = [Window maxSize];
-            auto minSize = [Window minSize];
-            
-            if (x < minSize.width)
-            {
-                x = minSize.width;
-            }
-            
-            if (y < minSize.height)
-            {
-                y = minSize.height;
-            }
-            
-            if (x > maxSize.width)
-            {
-                x = maxSize.width;
-            }
-            
-            if (y > maxSize.height)
-            {
-                y = maxSize.height;
-            }
-            
-            @try
-            {
-                if(!_shown)
-                {
-                    BaseEvents->Resized(AvnSize{x,y}, reason);
-                }
-                
-                [Window setContentSize:NSSize{x,y}];
-                [Window invalidateShadow];
-            }
-            @finally
-            {
-                _inResize = false;
-            }
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT Invalidate (AvnRect rect) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            [View setNeedsDisplayInRect:[View frame]];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetMainMenu(IAvnMenu* menu) override
-    {
-        START_COM_CALL;
-        
-        _mainMenu = menu;
-        
-        auto nativeMenu = dynamic_cast<AvnAppMenu*>(menu);
-        
-        auto nsmenu = nativeMenu->GetNative();
-        
-        [Window applyMenu:nsmenu];
-        
-        if ([Window isKeyWindow])
-        {
-            [Window showWindowMenuWithAppMenu];
-        }
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT BeginMoveDrag () override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            auto lastEvent = [View lastMouseDownEvent];
-            
-            if(lastEvent == nullptr)
-            {
-                return S_OK;
-            }
-            
-            [Window performWindowDragWithEvent:lastEvent];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT BeginResizeDrag (AvnWindowEdge edge) override
-    {
-        START_COM_CALL;
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT GetPosition (AvnPoint* ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-            {
-                return E_POINTER;
-            }
-            
-            auto frame = [Window frame];
-            
-            ret->X = frame.origin.x;
-            ret->Y = frame.origin.y + frame.size.height;
-            
-            *ret = ConvertPointY(*ret);
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetPosition (AvnPoint point) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            lastPositionSet = point;
-            [Window setFrameTopLeftPoint:ToNSPoint(ConvertPointY(point))];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT PointToClient (AvnPoint point, AvnPoint* ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-            {
-                return E_POINTER;
-            }
-            
-            point = ConvertPointY(point);
-            auto viewPoint = [Window convertScreenToBase:ToNSPoint(point)];
-            
-            *ret = [View translateLocalPoint:ToAvnPoint(viewPoint)];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT PointToScreen (AvnPoint point, AvnPoint* ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-            {
-                return E_POINTER;
-            }
-            
-            auto cocoaViewPoint =  ToNSPoint([View translateLocalPoint:point]);
-            auto cocoaScreenPoint = [Window convertBaseToScreen:cocoaViewPoint];
-            *ret = ConvertPointY(ToAvnPoint(cocoaScreenPoint));
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT ThreadSafeSetSwRenderedFrame(AvnFramebuffer* fb, IUnknown* dispose) override
-    {
-        START_COM_CALL;
-        
-        [View setSwRenderedFrame: fb dispose: dispose];
-        return S_OK;
-    }
-    
-    virtual HRESULT SetCursor(IAvnCursor* cursor) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            Cursor* avnCursor = dynamic_cast<Cursor*>(cursor);
-            this->cursor = avnCursor->GetNative();
-            UpdateCursor();
-            
-            if(avnCursor->IsHidden())
-            {
-                [NSCursor hide];
-            }
-            else
-            {
-                [NSCursor unhide];
-            }
-            
-            return S_OK;
-        }
-    }
-
-    virtual void UpdateCursor()
-    {
-        if (cursor != nil)
-        {
-            [cursor set];
-        }
-    }
-    
-    virtual HRESULT CreateGlRenderTarget(IAvnGlSurfaceRenderTarget** ppv) override
-    {
-        START_COM_CALL;
-        
-        if(View == NULL)
-            return E_FAIL;
-        *ppv = [renderTarget createSurfaceRenderTarget];
-        return *ppv == nil ? E_FAIL : S_OK;
-    }
-    
-    virtual HRESULT CreateNativeControlHost(IAvnNativeControlHost** retOut) override
-    {
-        START_COM_CALL;
-        
-        if(View == NULL)
-            return E_FAIL;
-        *retOut = ::CreateNativeControlHost(View);
-        return S_OK;
-    }
-    
-    virtual HRESULT SetBlurEnabled (bool enable) override
-    {
-        START_COM_CALL;
-        
-        [StandardContainer ShowBlur:enable];
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT BeginDragAndDropOperation(AvnDragDropEffects effects, AvnPoint point,
-                                              IAvnClipboard* clipboard, IAvnDndResultCallback* cb,
-                                              void* sourceHandle) override
-    {
-        START_COM_CALL;
-        
-        auto item = TryGetPasteboardItem(clipboard);
-        [item setString:@"" forType:GetAvnCustomDataType()];
-        if(item == nil)
-            return E_INVALIDARG;
-        if(View == NULL)
-            return E_FAIL;
-        
-        auto nsevent = [NSApp currentEvent];
-        auto nseventType = [nsevent type];
-        
-        // If current event isn't a mouse one (probably due to malfunctioning user app)
-        // attempt to forge a new one
-        if(!((nseventType >= NSEventTypeLeftMouseDown && nseventType <= NSEventTypeMouseExited)
-           || (nseventType >= NSEventTypeOtherMouseDown && nseventType <= NSEventTypeOtherMouseDragged)))
-        {
-            auto nspoint = [Window convertBaseToScreen: ToNSPoint(point)];
-            CGPoint cgpoint = NSPointToCGPoint(nspoint);
-            auto cgevent = CGEventCreateMouseEvent(NULL, kCGEventLeftMouseDown, cgpoint, kCGMouseButtonLeft);
-            nsevent = [NSEvent eventWithCGEvent: cgevent];
-            CFRelease(cgevent);
-        }
-        
-        auto dragItem = [[NSDraggingItem alloc] initWithPasteboardWriter: item];
-        
-        auto dragItemImage = [NSImage imageNamed:NSImageNameMultipleDocuments];
-        NSRect dragItemRect = {(float)point.X, (float)point.Y, [dragItemImage size].width, [dragItemImage size].height};
-        [dragItem setDraggingFrame: dragItemRect contents: dragItemImage];
-        
-        int op = 0; int ieffects = (int)effects;
-        if((ieffects & (int)AvnDragDropEffects::Copy) != 0)
-            op |= NSDragOperationCopy;
-        if((ieffects & (int)AvnDragDropEffects::Link) != 0)
-            op |= NSDragOperationLink;
-        if((ieffects & (int)AvnDragDropEffects::Move) != 0)
-            op |= NSDragOperationMove;
-        [View beginDraggingSessionWithItems: @[dragItem] event: nsevent
-                                     source: CreateDraggingSource((NSDragOperation) op, cb, sourceHandle)];
-        return S_OK;
-    }
-
-    virtual bool IsDialog()
-    {
-        return false;
-    }
-    
-protected:
-    virtual NSWindowStyleMask GetStyle()
-    {
-        return NSWindowStyleMaskBorderless;
-    }
-    
-    void UpdateStyle()
-    {
-        [Window setStyleMask: GetStyle()];
-    }
-    
-public:
-    virtual void OnResized ()
-    {
-        
-    }
-};
-
-class WindowImpl : public virtual WindowBaseImpl, public virtual IAvnWindow, public IWindowStateChanged
-{
-private:
-    bool _canResize;
-    bool _fullScreenActive;
-    SystemDecorations _decorations;
-    AvnWindowState _lastWindowState;
-    AvnWindowState _actualWindowState;
-    bool _inSetWindowState;
-    NSRect _preZoomSize;
-    bool _transitioningWindowState;
-    bool _isClientAreaExtended;
-    bool _isDialog;
-    AvnExtendClientAreaChromeHints _extendClientHints;
-    
-    FORWARD_IUNKNOWN()
-    BEGIN_INTERFACE_MAP()
-    INHERIT_INTERFACE_MAP(WindowBaseImpl)
-    INTERFACE_MAP_ENTRY(IAvnWindow, IID_IAvnWindow)
-    END_INTERFACE_MAP()
-    virtual ~WindowImpl()
-    {
-    }
-    
-    ComPtr<IAvnWindowEvents> WindowEvents;
-    WindowImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
-    {
-        _isClientAreaExtended = false;
-        _extendClientHints = AvnDefaultChrome;
-        _fullScreenActive = false;
-        _canResize = true;
-        _decorations = SystemDecorationsFull;
-        _transitioningWindowState = false;
-        _inSetWindowState = false;
-        _lastWindowState = Normal;
-        _actualWindowState = Normal;
-        WindowEvents = events;
-        [Window setCanBecomeKeyAndMain];
-        [Window disableCursorRects];
-        [Window setTabbingMode:NSWindowTabbingModeDisallowed];
-        [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
-    }
-    
-    void HideOrShowTrafficLights ()
-    {
-        if (Window == nil)
-        {
-            return;
-        }
-        
-        for (id subview in Window.contentView.superview.subviews) {
-            if ([subview isKindOfClass:NSClassFromString(@"NSTitlebarContainerView")]) {
-                NSView *titlebarView = [subview subviews][0];
-                for (id button in titlebarView.subviews) {
-                    if ([button isKindOfClass:[NSButton class]])
-                    {
-                        if(_isClientAreaExtended)
-                        {
-                            auto wantsChrome = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
-                            
-                            [button setHidden: !wantsChrome];
-                        }
-                        else
-                        {
-                            [button setHidden: (_decorations != SystemDecorationsFull)];
-                        }
-                        
-                        [button setWantsLayer:true];
-                    }
-                }
-            }
-        }
-    }
-    
-    virtual HRESULT Show (bool activate, bool isDialog) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            _isDialog = isDialog;
-            WindowBaseImpl::Show(activate, isDialog);
-            
-            HideOrShowTrafficLights();
-            
-            return SetWindowState(_lastWindowState);
-        }
-    }
-    
-    virtual HRESULT SetEnabled (bool enable) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            [Window setEnabled:enable];
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetParent (IAvnWindow* parent) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(parent == nullptr)
-                return E_POINTER;
-
-            auto cparent = dynamic_cast<WindowImpl*>(parent);
-            if(cparent == nullptr)
-                return E_INVALIDARG;
-            
-            // If one tries to show a child window with a minimized parent window, then the parent window will be
-            // restored but macOS isn't kind enough to *tell* us that, so the window will be left in a non-interactive
-            // state. Detect this and explicitly restore the parent window ourselves to avoid this situation.
-            if (cparent->WindowState() == Minimized)
-                cparent->SetWindowState(Normal);
-            
-            [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
-            [cparent->Window addChildWindow:Window ordered:NSWindowAbove];
-            
-            UpdateStyle();
-            
-            return S_OK;
-        }
-    }
-    
-    void StartStateTransition () override
-    {
-        _transitioningWindowState = true;
-    }
-    
-    void EndStateTransition () override
-    {
-        _transitioningWindowState = false;
-    }
-    
-    SystemDecorations Decorations () override
-    {
-        return _decorations;
-    }
-    
-    AvnWindowState WindowState () override
-    {
-        return _lastWindowState;
-    }
-    
-    void WindowStateChanged () override
-    {
-        if(_shown && !_inSetWindowState && !_transitioningWindowState)
-        {
-            AvnWindowState state;
-            GetWindowState(&state);
-            
-            if(_lastWindowState != state)
-            {
-                if(_isClientAreaExtended)
-                {
-                    if(_lastWindowState == FullScreen)
-                    {
-                        // we exited fs.
-                       if(_extendClientHints & AvnOSXThickTitleBar)
-                       {
-                          Window.toolbar = [NSToolbar new];
-                          Window.toolbar.showsBaselineSeparator = false;
-                       }
-
-                       [Window setTitlebarAppearsTransparent:true];
-
-                       [StandardContainer setFrameSize: StandardContainer.frame.size];
-                    }
-                    else if(state == FullScreen)
-                    {
-                        // we entered fs.
-                        if(_extendClientHints & AvnOSXThickTitleBar)
-                        {
-                            Window.toolbar = nullptr;
-                        }
-                       
-                        [Window setTitlebarAppearsTransparent:false];
-                        
-                        [StandardContainer setFrameSize: StandardContainer.frame.size];
-                    }
-                }
-                
-                _lastWindowState = state;
-                _actualWindowState = state;
-                WindowEvents->WindowStateChanged(state);
-            }
-        }
-    }
-    
-    bool UndecoratedIsMaximized ()
-    {
-        auto windowSize = [Window frame];
-        auto available = [Window screen].visibleFrame;
-        return CGRectEqualToRect(windowSize, available);
-    }
-    
-    bool IsZoomed ()
-    {
-        return _decorations == SystemDecorationsFull ? [Window isZoomed] : UndecoratedIsMaximized();
-    }
-    
-    void DoZoom()
-    {
-        switch (_decorations)
-        {
-            case SystemDecorationsNone:
-            case SystemDecorationsBorderOnly:
-                [Window setFrame:[Window screen].visibleFrame display:true];
-                break;
-
-            
-            case SystemDecorationsFull:
-                [Window performZoom:Window];
-                break;
-        }
-    }
-    
-    virtual HRESULT SetCanResize(bool value) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            _canResize = value;
-            UpdateStyle();
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetDecorations(SystemDecorations value) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            auto currentWindowState = _lastWindowState;
-            _decorations = value;
-            
-            if(_fullScreenActive)
-            {
-                return S_OK;
-            }
-            
-            UpdateStyle();
-            
-            HideOrShowTrafficLights();
-
-            switch (_decorations)
-            {
-                case SystemDecorationsNone:
-                    [Window setHasShadow:NO];
-                    [Window setTitleVisibility:NSWindowTitleHidden];
-                    [Window setTitlebarAppearsTransparent:YES];
-                    
-                    if(currentWindowState == Maximized)
-                    {
-                        if(!UndecoratedIsMaximized())
-                        {
-                            DoZoom();
-                        }
-                    }
-                    break;
-
-                case SystemDecorationsBorderOnly:
-                    [Window setHasShadow:YES];
-                    [Window setTitleVisibility:NSWindowTitleHidden];
-                    [Window setTitlebarAppearsTransparent:YES];
-                    
-                    if(currentWindowState == Maximized)
-                    {
-                        if(!UndecoratedIsMaximized())
-                        {
-                            DoZoom();
-                        }
-                    }
-                    break;
-
-                case SystemDecorationsFull:
-                    [Window setHasShadow:YES];
-                    [Window setTitleVisibility:NSWindowTitleVisible];
-                    [Window setTitlebarAppearsTransparent:NO];
-                    [Window setTitle:_lastTitle];
-                    
-                    if(currentWindowState == Maximized)
-                    {
-                        auto newFrame = [Window contentRectForFrameRect:[Window frame]].size;
-                        
-                        [View setFrameSize:newFrame];
-                    }
-                    break;
-            }
-
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetTitle (char* utf8title) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            _lastTitle = [NSString stringWithUTF8String:(const char*)utf8title];
-            [Window setTitle:_lastTitle];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetTitleBarColor(AvnColor color) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            float a = (float)color.Alpha / 255.0f;
-            float r = (float)color.Red / 255.0f;
-            float g = (float)color.Green / 255.0f;
-            float b = (float)color.Blue / 255.0f;
-            
-            auto nscolor = [NSColor colorWithSRGBRed:r green:g blue:b alpha:a];
-            
-            // Based on the titlebar color we have to choose either light or dark
-            // OSX doesnt let you set a foreground color for titlebar.
-            if ((r*0.299 + g*0.587 + b*0.114) > 186.0f / 255.0f)
-            {
-                [Window setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantLight]];
-            }
-            else
-            {
-                [Window setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantDark]];
-            }
-            
-            [Window setTitlebarAppearsTransparent:true];
-            [Window setBackgroundColor:nscolor];
-        }
-        
-        return S_OK;
-    }
-    
-    virtual HRESULT GetWindowState (AvnWindowState*ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-            {
-                return E_POINTER;
-            }
-            
-            if(([Window styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen)
-            {
-                *ret = FullScreen;
-                return S_OK;
-            }
-            
-            if([Window isMiniaturized])
-            {
-                *ret = Minimized;
-                return S_OK;
-            }
-            
-            if(IsZoomed())
-            {
-                *ret = Maximized;
-                return S_OK;
-            }
-            
-            *ret = Normal;
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT TakeFocusFromChildren () override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(Window == nil)
-                return S_OK;
-            if([Window isKeyWindow])
-                [Window makeFirstResponder: View];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetExtendClientArea (bool enable) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            _isClientAreaExtended = enable;
-            
-            if(enable)
-            {
-                Window.titleVisibility = NSWindowTitleHidden;
-                
-                [Window setTitlebarAppearsTransparent:true];
-                
-                auto wantsTitleBar = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
-                
-                if (wantsTitleBar)
-                {
-                    [StandardContainer ShowTitleBar:true];
-                }
-                else
-                {
-                    [StandardContainer ShowTitleBar:false];
-                }
-                
-                if(_extendClientHints & AvnOSXThickTitleBar)
-                {
-                    Window.toolbar = [NSToolbar new];
-                    Window.toolbar.showsBaselineSeparator = false;
-                }
-                else
-                {
-                    Window.toolbar = nullptr;
-                }
-            }
-            else
-            {
-                Window.titleVisibility = NSWindowTitleVisible;
-                Window.toolbar = nullptr;
-                [Window setTitlebarAppearsTransparent:false];
-                View.layer.zPosition = 0;
-            }
-            
-            [Window setIsExtended:enable];
-            
-            HideOrShowTrafficLights();
-            
-            UpdateStyle();
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetExtendClientAreaHints (AvnExtendClientAreaChromeHints hints) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            _extendClientHints = hints;
-            
-            SetExtendClientArea(_isClientAreaExtended);
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT GetExtendTitleBarHeight (double*ret) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(ret == nullptr)
-            {
-                return E_POINTER;
-            }
-            
-            *ret = [Window getExtendedTitleBarHeight];
-            
-            return S_OK;
-        }
-    }
-    
-    virtual HRESULT SetExtendTitleBarHeight (double value) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            [StandardContainer SetTitleBarHeightHint:value];
-            return S_OK;
-        }
-    }
-    
-    void EnterFullScreenMode ()
-    {
-        _fullScreenActive = true;
-        
-        [Window setTitle:_lastTitle];
-        [Window toggleFullScreen:nullptr];
-    }
-    
-    void ExitFullScreenMode ()
-    {
-        [Window toggleFullScreen:nullptr];
-        
-        _fullScreenActive = false;
-        
-        SetDecorations(_decorations);
-    }
-    
-    virtual HRESULT SetWindowState (AvnWindowState state) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if(Window == nullptr)
-            {
-                return  S_OK;
-            }
-            
-            if(_actualWindowState == state)
-            {
-                return S_OK;
-            }
-            
-            _inSetWindowState = true;
-            
-            auto currentState = _actualWindowState;
-            _lastWindowState = state;
-            
-            if(currentState == Normal)
-            {
-                _preZoomSize = [Window frame];
-            }
-            
-            if(_shown)
-            {
-                switch (state) {
-                    case Maximized:
-                        if(currentState == FullScreen)
-                        {
-                            ExitFullScreenMode();
-                        }
-                        
-                        lastPositionSet.X = 0;
-                        lastPositionSet.Y = 0;
-                        
-                        if([Window isMiniaturized])
-                        {
-                            [Window deminiaturize:Window];
-                        }
-                        
-                        if(!IsZoomed())
-                        {
-                            DoZoom();
-                        }
-                        break;
-                        
-                    case Minimized:
-                        if(currentState == FullScreen)
-                        {
-                            ExitFullScreenMode();
-                        }
-                        else
-                        {
-                            [Window miniaturize:Window];
-                        }
-                        break;
-                        
-                    case FullScreen:
-                        if([Window isMiniaturized])
-                        {
-                            [Window deminiaturize:Window];
-                        }
-                        
-                        EnterFullScreenMode();
-                        break;
-                        
-                    case Normal:
-                        if([Window isMiniaturized])
-                        {
-                            [Window deminiaturize:Window];
-                        }
-                        
-                        if(currentState == FullScreen)
-                        {
-                            ExitFullScreenMode();
-                        }
-                        
-                        if(IsZoomed())
-                        {
-                            if(_decorations == SystemDecorationsFull)
-                            {
-                                DoZoom();
-                            }
-                            else
-                            {
-                                [Window setFrame:_preZoomSize display:true];
-                                auto newFrame = [Window contentRectForFrameRect:[Window frame]].size;
-                                
-                                [View setFrameSize:newFrame];
-                            }
-                            
-                        }
-                        break;
-                }
-                
-                _actualWindowState = _lastWindowState;
-                WindowEvents->WindowStateChanged(_actualWindowState);
-            }
-            
-            
-            _inSetWindowState = false;
-            
-            return S_OK;
-        }
-    }
-
-    virtual void OnResized () override
-    {
-        if(_shown && !_inSetWindowState && !_transitioningWindowState)
-        {
-            WindowStateChanged();
-        }
-    }
-    
-    virtual bool IsDialog() override
-    {
-        return _isDialog;
-    }
-    
-protected:
-    virtual NSWindowStyleMask GetStyle() override
-    {
-        unsigned long s = NSWindowStyleMaskBorderless;
-
-        switch (_decorations)
-        {
-            case SystemDecorationsNone:
-                s = s | NSWindowStyleMaskFullSizeContentView;
-                break;
-
-            case SystemDecorationsBorderOnly:
-                s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskFullSizeContentView;
-                break;
-
-            case SystemDecorationsFull:
-                s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskBorderless;
-                
-                if(_canResize)
-                {
-                    s = s | NSWindowStyleMaskResizable;
-                }
-                break;
-        }
-
-        if([Window parentWindow] == nullptr)
-        {
-            s |= NSWindowStyleMaskMiniaturizable;
-        }
-        
-        if(_isClientAreaExtended)
-        {
-            s |= NSWindowStyleMaskFullSizeContentView | NSWindowStyleMaskTexturedBackground;
-        }
-        return s;
-    }
-};
-
-NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEventTrackingRunLoopMode, NSModalPanelRunLoopMode, NSRunLoopCommonModes, NSConnectionReplyMode, nil];
-
-@implementation AutoFitContentView
-{
-    NSVisualEffectView* _titleBarMaterial;
-    NSBox* _titleBarUnderline;
-    NSView* _content;
-    NSVisualEffectView* _blurBehind;
-    double _titleBarHeightHint;
-    bool _settingSize;
-}
-
--(AutoFitContentView* _Nonnull) initWithContent:(NSView *)content
-{
-    _titleBarHeightHint = -1;
-    _content = content;
-    _settingSize = false;
-
-    [self setAutoresizesSubviews:true];
-    [self setWantsLayer:true];
-    
-    _titleBarMaterial = [NSVisualEffectView new];
-    [_titleBarMaterial setBlendingMode:NSVisualEffectBlendingModeWithinWindow];
-    [_titleBarMaterial setMaterial:NSVisualEffectMaterialTitlebar];
-    [_titleBarMaterial setWantsLayer:true];
-    _titleBarMaterial.hidden = true;
-    
-    _titleBarUnderline = [NSBox new];
-    _titleBarUnderline.boxType = NSBoxSeparator;
-    _titleBarUnderline.fillColor = [NSColor underPageBackgroundColor];
-    _titleBarUnderline.hidden = true;
-    
-    [self addSubview:_titleBarMaterial];
-    [self addSubview:_titleBarUnderline];
-    
-    _blurBehind = [NSVisualEffectView new];
-    [_blurBehind setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
-    [_blurBehind setMaterial:NSVisualEffectMaterialLight];
-    [_blurBehind setWantsLayer:true];
-    _blurBehind.hidden = true;
-    
-    [_blurBehind setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-    [_content setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-    
-    [self addSubview:_blurBehind];
-    [self addSubview:_content];
-    
-    [self setWantsLayer:true];
-    return self;
-}
-
--(void) ShowBlur:(bool)show
-{
-    _blurBehind.hidden = !show;
-}
-
--(void) ShowTitleBar: (bool) show
-{
-    _titleBarMaterial.hidden = !show;
-    _titleBarUnderline.hidden = !show;
-}
-
--(void) SetTitleBarHeightHint: (double) height
-{
-    _titleBarHeightHint = height;
-    
-    [self setFrameSize:self.frame.size];
-}
-
--(void)setFrameSize:(NSSize)newSize
-{
-    if(_settingSize)
-    {
-        return;
-    }
-    
-    _settingSize = true;
-    [super setFrameSize:newSize];
-    
-    auto window = objc_cast<AvnWindow>([self window]);
-    
-    // TODO get actual titlebar size
-    
-    double height = _titleBarHeightHint == -1 ? [window getExtendedTitleBarHeight] : _titleBarHeightHint;
-    
-    NSRect tbar;
-    tbar.origin.x = 0;
-    tbar.origin.y = newSize.height - height;
-    tbar.size.width = newSize.width;
-    tbar.size.height = height;
-    
-    [_titleBarMaterial setFrame:tbar];
-    tbar.size.height = height < 1 ? 0 : 1;
-    [_titleBarUnderline setFrame:tbar];
-
-    _settingSize = false;
-}
-
--(void) SetContent: (NSView* _Nonnull) content
-{
-    if(content != nullptr)
-    {
-        [content removeFromSuperview];
-        [self addSubview:content];
-        _content = content;
-    }
-}
-@end
-
-@implementation AvnView
-{
-    ComPtr<WindowBaseImpl> _parent;
-    ComPtr<IUnknown> _swRenderedFrame;
-    AvnFramebuffer _swRenderedFrameBuffer;
-    bool _queuedDisplayFromThread;
-    NSTrackingArea* _area;
-    bool _isLeftPressed, _isMiddlePressed, _isRightPressed, _isXButton1Pressed, _isXButton2Pressed, _isMouseOver;
-    AvnInputModifiers _modifierState;
-    NSEvent* _lastMouseDownEvent;
-    bool _lastKeyHandled;
-    AvnPixelSize _lastPixelSize;
-    NSObject<IRenderTarget>* _renderTarget;
-    AvnPlatformResizeReason _resizeReason;
-    AvnAccessibilityElement* _accessibilityChild;
-}
-
-- (void)onClosed
-{
-    @synchronized (self)
-    {
-        _parent = nullptr;
-    }
-}
-
--(AvnPixelSize) getPixelSize
-{
-    return _lastPixelSize;
-}
-
-- (NSEvent*) lastMouseDownEvent
-{
-    return _lastMouseDownEvent;
-}
-
-- (void) updateRenderTarget
-{
-    [_renderTarget resize:_lastPixelSize withScale: [[self window] backingScaleFactor]];
-    [self setNeedsDisplayInRect:[self frame]];
-}
-
--(AvnView*)  initWithParent: (WindowBaseImpl*) parent
-{
-    self = [super init];
-    _renderTarget = parent->renderTarget;
-    [self setWantsLayer:YES];
-    [self setLayerContentsRedrawPolicy: NSViewLayerContentsRedrawDuringViewResize];
-    
-    _parent = parent;
-    _area = nullptr;
-    _lastPixelSize.Height = 100;
-    _lastPixelSize.Width = 100;
-    [self registerForDraggedTypes: @[@"public.data", GetAvnCustomDataType()]];
-    
-    _modifierState = AvnInputModifiersNone;
-    return self;
-}
-
-- (BOOL)isFlipped
-{
-    return YES;
-}
-
-- (BOOL)wantsUpdateLayer
-{
-    return YES;
-}
-
-- (void)setLayer:(CALayer *)layer
-{
-    [_renderTarget setNewLayer: layer];
-    [super setLayer: layer];
-}
-
-- (BOOL)isOpaque
-{
-    return YES;
-}
-
-- (BOOL)acceptsFirstResponder
-{
-    return true;
-}
-
-- (BOOL)acceptsFirstMouse:(NSEvent *)event
-{
-    return true;
-}
-
-- (BOOL)canBecomeKeyView
-{
-    return true;
-}
-
--(void)setFrameSize:(NSSize)newSize
-{
-    [super setFrameSize:newSize];
-    
-    if(_area != nullptr)
-    {
-        [self removeTrackingArea:_area];
-        _area = nullptr;
-    }
-
-    if (_parent == nullptr)
-    {
-        return;
-    }
-
-    NSRect rect = NSZeroRect;
-    rect.size = newSize;
-    
-    NSTrackingAreaOptions options = NSTrackingActiveAlways | NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingEnabledDuringMouseDrag;
-    _area = [[NSTrackingArea alloc] initWithRect:rect options:options owner:self userInfo:nullptr];
-    [self addTrackingArea:_area];
-    
-    _parent->UpdateCursor();
-    
-    auto fsize = [self convertSizeToBacking: [self frame].size];
-    
-    if(_lastPixelSize.Width != (int)fsize.width || _lastPixelSize.Height != (int)fsize.height)
-    {
-        _lastPixelSize.Width = (int)fsize.width;
-        _lastPixelSize.Height = (int)fsize.height;
-        [self updateRenderTarget];
-    
-        auto reason = [self inLiveResize] ? ResizeUser : _resizeReason;
-        _parent->BaseEvents->Resized(AvnSize{newSize.width, newSize.height}, reason);
-    }
-}
-
-- (void)updateLayer
-{
-    AvnInsidePotentialDeadlock deadlock;
-    if (_parent == nullptr)
-    {
-        return;
-    }
-    
-    _parent->BaseEvents->RunRenderPriorityJobs();
-    
-    if (_parent == nullptr)
-    {
-        return;
-    }
-        
-    _parent->BaseEvents->Paint();
-}
-
-- (void)drawRect:(NSRect)dirtyRect
-{
-    return;
-}
-
--(void) setSwRenderedFrame: (AvnFramebuffer*) fb dispose: (IUnknown*) dispose
-{
-    @autoreleasepool {
-        [_renderTarget setSwFrame:fb];
-        dispose->Release();
-    }
-}
-
-- (AvnPoint) translateLocalPoint:(AvnPoint)pt
-{
-    pt.Y = [self bounds].size.height - pt.Y;
-    return pt;
-}
-
-+ (AvnPoint)toAvnPoint:(CGPoint)p
-{
-    AvnPoint result;
-    
-    result.X = p.x;
-    result.Y = p.y;
-    
-    return result;
-}
-
-- (void) viewDidChangeBackingProperties
-{
-    auto fsize = [self convertSizeToBacking: [self frame].size];
-    _lastPixelSize.Width = (int)fsize.width;
-    _lastPixelSize.Height = (int)fsize.height;
-    [self updateRenderTarget];
-    
-    if(_parent != nullptr)
-    {
-        _parent->BaseEvents->ScalingChanged([_parent->Window backingScaleFactor]);
-    }
-    
-    [super viewDidChangeBackingProperties];
-}
-
-- (bool) ignoreUserInput:(bool)trigerInputWhenDisabled
-{
-    auto parentWindow = objc_cast<AvnWindow>([self window]);
-    
-    if(parentWindow == nil || ![parentWindow shouldTryToHandleEvents])
-    {
-        if(trigerInputWhenDisabled)
-        {
-            auto window = dynamic_cast<WindowImpl*>(_parent.getRaw());
-            
-            if(window != nullptr)
-            {
-                window->WindowEvents->GotInputWhenDisabled();
-            }
-        }
-        
-        return TRUE;
-    }
-    
-    return FALSE;
-}
-
-- (void)mouseEvent:(NSEvent *)event withType:(AvnRawMouseEventType) type
-{
-    bool triggerInputWhenDisabled = type != Move;
-    
-    if([self ignoreUserInput: triggerInputWhenDisabled])
-    {
-        return;
-    }
-    
-    auto localPoint = [self convertPoint:[event locationInWindow] toView:self];
-    auto avnPoint = [AvnView toAvnPoint:localPoint];
-    auto point = [self translateLocalPoint:avnPoint];
-    AvnVector delta;
-    
-    if(type == Wheel)
-    {
-        auto speed = 5;
-        
-        if([event hasPreciseScrollingDeltas])
-        {
-            speed = 50;
-        }
-        
-        delta.X = [event scrollingDeltaX] / speed;
-        delta.Y = [event scrollingDeltaY] / speed;
-        
-        if(delta.X == 0 && delta.Y == 0)
-        {
-            return;
-        }
-    }
-    else if (type == Magnify)
-    {
-        delta.X = delta.Y = [event magnification];
-    }
-    else if (type == Rotate)
-    {
-        delta.X = delta.Y = [event rotation];
-    }
-    else if (type == Swipe)
-    {
-        delta.X = [event deltaX];
-        delta.Y = [event deltaY];
-    }
-    
-    auto timestamp = [event timestamp] * 1000;
-    auto modifiers = [self getModifiers:[event modifierFlags]];
-    
-    if(type != AvnRawMouseEventType::Move ||
-       (
-           [self window] != nil &&
-           (
-                [[self window] firstResponder] == nil
-                || ![[[self window] firstResponder] isKindOfClass: [NSView class]]
-           )
-       )
-    )
-        [self becomeFirstResponder];
-    
-    if(_parent != nullptr)
-    {
-        _parent->BaseEvents->RawMouseEvent(type, timestamp, modifiers, point, delta);
-    }
-    
-    [super mouseMoved:event];
-}
-
-- (BOOL) resignFirstResponder
-{
-    _parent->BaseEvents->LostFocus();
-    return YES;
-}
-
-- (void)mouseMoved:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Move];
-}
-
-- (void)mouseDown:(NSEvent *)event
-{
-    _isLeftPressed = true;
-    _lastMouseDownEvent = event;
-    [self mouseEvent:event withType:LeftButtonDown];
-}
-
-- (void)otherMouseDown:(NSEvent *)event
-{
-    _lastMouseDownEvent = event;
-
-    switch(event.buttonNumber)
-    {
-        case 2:
-        case 3:
-            _isMiddlePressed = true;
-            [self mouseEvent:event withType:MiddleButtonDown];
-            break;
-        case 4:
-            _isXButton1Pressed = true;
-            [self mouseEvent:event withType:XButton1Down];
-            break;
-        case 5:
-            _isXButton2Pressed = true;
-            [self mouseEvent:event withType:XButton2Down];
-            break;
-    }
-}
-
-- (void)rightMouseDown:(NSEvent *)event
-{
-    _isRightPressed = true;
-    _lastMouseDownEvent = event;
-    [self mouseEvent:event withType:RightButtonDown];
-}
-
-- (void)mouseUp:(NSEvent *)event
-{
-    _isLeftPressed = false;
-    [self mouseEvent:event withType:LeftButtonUp];
-}
-
-- (void)otherMouseUp:(NSEvent *)event
-{
-    switch(event.buttonNumber)
-    {
-        case 2:
-        case 3:
-            _isMiddlePressed = false;
-            [self mouseEvent:event withType:MiddleButtonUp];
-            break;
-        case 4:
-            _isXButton1Pressed = false;
-            [self mouseEvent:event withType:XButton1Up];
-            break;
-        case 5:
-            _isXButton2Pressed = false;
-            [self mouseEvent:event withType:XButton2Up];
-            break;
-    }
-}
-
-- (void)rightMouseUp:(NSEvent *)event
-{
-    _isRightPressed = false;
-    [self mouseEvent:event withType:RightButtonUp];
-}
-
-- (void)mouseDragged:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Move];
-    [super mouseDragged:event];
-}
-
-- (void)otherMouseDragged:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Move];
-    [super otherMouseDragged:event];
-}
-
-- (void)rightMouseDragged:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Move];
-    [super rightMouseDragged:event];
-}
-
-- (void)scrollWheel:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Wheel];
-    [super scrollWheel:event];
-}
-
-- (void)magnifyWithEvent:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Magnify];
-    [super magnifyWithEvent:event];
-}
-
-- (void)rotateWithEvent:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Rotate];
-    [super rotateWithEvent:event];
-}
-
-- (void)swipeWithEvent:(NSEvent *)event
-{
-    [self mouseEvent:event withType:Swipe];
-    [super swipeWithEvent:event];
-}
-
-- (void)mouseEntered:(NSEvent *)event
-{
-    _isMouseOver = true;
-    [super mouseEntered:event];
-}
-
-- (void)mouseExited:(NSEvent *)event
-{
-    _isMouseOver = false;
-    [self mouseEvent:event withType:LeaveWindow];
-    [super mouseExited:event];
-} 
-
-- (void) keyboardEvent: (NSEvent *) event withType: (AvnRawKeyEventType)type
-{
-    if([self ignoreUserInput: false])
-    {
-        return;
-    }
-    
-    auto key = s_KeyMap[[event keyCode]];
-    
-    auto timestamp = [event timestamp] * 1000;
-    auto modifiers = [self getModifiers:[event modifierFlags]];
-     
-    if(_parent != nullptr)
-    {
-        auto handled = _parent->BaseEvents->RawKeyEvent(type, timestamp, modifiers, key);
-        if (key != LeftCtrl && key != RightCtrl) {
-          _lastKeyHandled = handled;
-        } else {
-          _lastKeyHandled = false;
-        }
-    }
-}
-
-- (BOOL)performKeyEquivalent:(NSEvent *)event
-{
-    bool result = _lastKeyHandled;
-    
-    _lastKeyHandled = false;
-    
-    return result;
-}
-
-- (void)flagsChanged:(NSEvent *)event
-{
-    auto newModifierState = [self getModifiers:[event modifierFlags]];
-    
-    bool isAltCurrentlyPressed = (_modifierState & Alt) == Alt;
-    bool isControlCurrentlyPressed = (_modifierState & Control) == Control;
-    bool isShiftCurrentlyPressed = (_modifierState & Shift) == Shift;
-    bool isCommandCurrentlyPressed = (_modifierState & Windows) == Windows;
-    
-    bool isAltPressed = (newModifierState & Alt) == Alt;
-    bool isControlPressed = (newModifierState & Control) == Control;
-    bool isShiftPressed = (newModifierState & Shift) == Shift;
-    bool isCommandPressed = (newModifierState & Windows) == Windows;
-    
-    
-    if (isAltPressed && !isAltCurrentlyPressed)
-    {
-        [self keyboardEvent:event withType:KeyDown];
-    }
-    else if (isAltCurrentlyPressed && !isAltPressed)
-    {
-        [self keyboardEvent:event withType:KeyUp];
-    }
-    
-    if (isControlPressed && !isControlCurrentlyPressed)
-    {
-        [self keyboardEvent:event withType:KeyDown];
-    }
-    else if (isControlCurrentlyPressed && !isControlPressed)
-    {
-        [self keyboardEvent:event withType:KeyUp];
-    }
-    
-    if (isShiftPressed && !isShiftCurrentlyPressed)
-    {
-        [self keyboardEvent:event withType:KeyDown];
-    }
-    else if(isShiftCurrentlyPressed && !isShiftPressed)
-    {
-        [self keyboardEvent:event withType:KeyUp];
-    }
-    
-    if(isCommandPressed && !isCommandCurrentlyPressed)
-    {
-        [self keyboardEvent:event withType:KeyDown];
-    }
-    else if(isCommandCurrentlyPressed && ! isCommandPressed)
-    {
-        [self keyboardEvent:event withType:KeyUp];
-    }
-    
-    _modifierState = newModifierState;
-    
-    [[self inputContext] handleEvent:event];
-    [super flagsChanged:event];
-}
-
-- (void)keyDown:(NSEvent *)event
-{
-    [self keyboardEvent:event withType:KeyDown];
-    [[self inputContext] handleEvent:event];
-    [super keyDown:event];
-}
-
-- (void)keyUp:(NSEvent *)event
-{
-    [self keyboardEvent:event withType:KeyUp];
-    [super keyUp:event];
-}
-
-- (AvnInputModifiers)getModifiers:(NSEventModifierFlags)mod
-{
-    unsigned int rv = 0;
-    
-    if (mod & NSEventModifierFlagControl)
-        rv |= Control;
-    if (mod & NSEventModifierFlagShift)
-        rv |= Shift;
-    if (mod & NSEventModifierFlagOption)
-        rv |= Alt;
-    if (mod & NSEventModifierFlagCommand)
-        rv |= Windows;
-    
-    if (_isLeftPressed)
-        rv |= LeftMouseButton;
-    if (_isMiddlePressed)
-        rv |= MiddleMouseButton;
-    if (_isRightPressed)
-        rv |= RightMouseButton;
-    if (_isXButton1Pressed)
-        rv |= XButton1MouseButton;
-    if (_isXButton2Pressed)
-        rv |= XButton2MouseButton;
-    
-    return (AvnInputModifiers)rv;
-}
-
-- (BOOL)hasMarkedText
-{
-    return _lastKeyHandled;
-}
-
-- (NSRange)markedRange
-{
-    return NSMakeRange(NSNotFound, 0);
-}
-
-- (NSRange)selectedRange
-{
-    return NSMakeRange(NSNotFound, 0);
-}
-
-- (void)setMarkedText:(id)string selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
-{
-    
-}
-
-- (void)unmarkText
-{
-    
-}
-
-- (NSArray<NSString *> *)validAttributesForMarkedText
-{
-    return [NSArray new];
-}
-
-- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)range actualRange:(NSRangePointer)actualRange
-{
-    return [NSAttributedString new];
-}
-
-- (void)insertText:(id)string replacementRange:(NSRange)replacementRange
-{
-    if(!_lastKeyHandled)
-    {
-        if(_parent != nullptr)
-        {
-            _lastKeyHandled = _parent->BaseEvents->RawTextInputEvent(0, [string UTF8String]);
-        }
-    }
-}
-
-- (NSUInteger)characterIndexForPoint:(NSPoint)point
-{
-    return 0;
-}
-
-- (NSRect)firstRectForCharacterRange:(NSRange)range actualRange:(NSRangePointer)actualRange
-{
-    CGRect result;
-    
-    return result;
-}
-
-- (NSDragOperation)triggerAvnDragEvent: (AvnDragEventType) type info: (id <NSDraggingInfo>)info
-{
-    auto localPoint = [self convertPoint:[info draggingLocation] toView:self];
-    auto avnPoint = [AvnView toAvnPoint:localPoint];
-    auto point = [self translateLocalPoint:avnPoint];
-    auto modifiers = [self getModifiers:[[NSApp currentEvent] modifierFlags]];
-    NSDragOperation nsop = [info draggingSourceOperationMask];
-   
-        auto effects = ConvertDragDropEffects(nsop);
-    int reffects = (int)_parent->BaseEvents
-    ->DragEvent(type, point, modifiers, effects,
-                CreateClipboard([info draggingPasteboard], nil),
-                GetAvnDataObjectHandleFromDraggingInfo(info));
-    
-    NSDragOperation ret = 0;
-    
-    // Ensure that the managed part didn't add any new effects
-    reffects = (int)effects & (int)reffects;
-    
-    // OSX requires exactly one operation
-    if((reffects & (int)AvnDragDropEffects::Copy) != 0)
-        ret = NSDragOperationCopy;
-    else if((reffects & (int)AvnDragDropEffects::Move) != 0)
-        ret = NSDragOperationMove;
-    else if((reffects & (int)AvnDragDropEffects::Link) != 0)
-        ret = NSDragOperationLink;
-    if(ret == 0)
-        ret = NSDragOperationNone;
-    return ret;
-}
-
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
-{
-    return [self triggerAvnDragEvent: AvnDragEventType::Enter info:sender];
-}
-
-- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
-{
-    return [self triggerAvnDragEvent: AvnDragEventType::Over info:sender];
-}
-
-- (void)draggingExited:(id <NSDraggingInfo>)sender
-{
-    [self triggerAvnDragEvent: AvnDragEventType::Leave info:sender];
-}
-
-- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
-{
-    return [self triggerAvnDragEvent: AvnDragEventType::Over info:sender] != NSDragOperationNone;
-}
-
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
-{
-    return [self triggerAvnDragEvent: AvnDragEventType::Drop info:sender] != NSDragOperationNone;
-}
-
-- (void)concludeDragOperation:(nullable id <NSDraggingInfo>)sender
-{
-    
-}
-
-- (AvnPlatformResizeReason)getResizeReason
-{
-    return _resizeReason;
-}
-
-- (void)setResizeReason:(AvnPlatformResizeReason)reason
-{
-    _resizeReason = reason;
-}
-
-- (AvnAccessibilityElement *) accessibilityChild
-{
-    if (_accessibilityChild == nil)
-    {
-        auto peer = _parent->BaseEvents->GetAutomationPeer();
-        
-        if (peer == nil)
-            return nil;
-
-        _accessibilityChild = [AvnAccessibilityElement acquire:peer];
-    }
-    
-    return _accessibilityChild;
-}
-
-- (NSArray *)accessibilityChildren
-{
-    auto child = [self accessibilityChild];
-    return NSAccessibilityUnignoredChildrenForOnlyChild(child);
-}
-
-- (id)accessibilityHitTest:(NSPoint)point
-{
-    return [[self accessibilityChild] accessibilityHitTest:point];
-}
-
-- (id)accessibilityFocusedUIElement
-{
-    return [[self accessibilityChild] accessibilityFocusedUIElement];
-}
-
-@end
-
-
-@implementation AvnWindow
-{
-    ComPtr<WindowBaseImpl> _parent;
-    bool _canBecomeKeyAndMain;
-    bool _closed;
-    bool _isEnabled;
-    bool _isExtended;
-    AvnMenu* _menu;
-    double _lastScaling;
-    IAvnAutomationPeer* _automationPeer;
-    NSMutableArray* _automationChildren;
-}
-
--(void) setIsExtended:(bool)value;
-{
-    _isExtended = value;
-}
-
--(bool) isDialog
-{
-    return _parent->IsDialog();
-}
-
--(double) getScaling
-{
-    return _lastScaling;
-}
-
--(double) getExtendedTitleBarHeight
-{
-    if(_isExtended)
-    {
-        for (id subview in self.contentView.superview.subviews)
-        {
-            if ([subview isKindOfClass:NSClassFromString(@"NSTitlebarContainerView")])
-            {
-                NSView *titlebarView = [subview subviews][0];
-
-                return (double)titlebarView.frame.size.height;
-            }
-        }
-
-        return -1;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-+(void)closeAll
-{
-    [[NSApplication sharedApplication] terminate:self];
-}
-
-- (void)performClose:(id)sender
-{
-    if([[self delegate] respondsToSelector:@selector(windowShouldClose:)])
-    {
-        if(![[self delegate] windowShouldClose:self]) return;
-    }
-    else if([self respondsToSelector:@selector(windowShouldClose:)])
-    {
-        if(![self windowShouldClose:self]) return;
-    }
-
-    [self close];
-}
-
-- (void)pollModalSession:(nonnull NSModalSession)session
-{
-    auto response = [NSApp runModalSession:session];
-    
-    if(response == NSModalResponseContinue)
-    {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [self pollModalSession:session];
-        });
-    }
-    else if (!_closed)
-    {
-        [self orderOut:self];
-        [NSApp endModalSession:session];
-    }
-}
-
--(void) showWindowMenuWithAppMenu
-{
-    if(_menu != nullptr)
-    {
-        auto appMenuItem = ::GetAppMenuItem();
-        
-        if(appMenuItem != nullptr)
-        {
-            auto appMenu = [appMenuItem menu];
-            
-            [appMenu removeItem:appMenuItem];
-            
-            [_menu insertItem:appMenuItem atIndex:0];
-            
-            [_menu setHasGlobalMenuItem:true];
-        }
-        
-        [NSApp setMenu:_menu];
-    }
-    else
-    {
-        [self showAppMenuOnly];
-    }
-}
-
--(void) showAppMenuOnly
-{
-    auto appMenuItem = ::GetAppMenuItem();
-    
-    if(appMenuItem != nullptr)
-    {
-        auto appMenu = ::GetAppMenu();
-        
-        auto nativeAppMenu = dynamic_cast<AvnAppMenu*>(appMenu);
-        
-        [[appMenuItem menu] removeItem:appMenuItem];
-        
-        if(_menu != nullptr)
-        {
-            [_menu setHasGlobalMenuItem:false];
-        }
-        
-        [nativeAppMenu->GetNative() addItem:appMenuItem];
-        
-        [NSApp setMenu:nativeAppMenu->GetNative()];
-    }
-    else
-    {
-        [NSApp setMenu:nullptr];
-    }
-}
-
--(void) applyMenu:(AvnMenu *)menu
-{
-    if(menu == nullptr)
-    {
-        menu = [AvnMenu new];
-    }
-    
-    _menu = menu;
-}
-
--(void) setCanBecomeKeyAndMain
-{
-    _canBecomeKeyAndMain = true;
-}
-
--(AvnWindow*)  initWithParent: (WindowBaseImpl*) parent
-{
-    self = [super init];
-    [self setReleasedWhenClosed:false];
-    _parent = parent;
-    [self setDelegate:self];
-    _closed = false;
-    _isEnabled = true;
-    
-    _lastScaling = [self backingScaleFactor];
-    [self setOpaque:NO];
-    [self setBackgroundColor: [NSColor clearColor]];
-    _isExtended = false;
-    return self;
-}
-
-- (BOOL)windowShouldClose:(NSWindow *)sender
-{
-    auto window = dynamic_cast<WindowImpl*>(_parent.getRaw());
-    
-    if(window != nullptr)
-    {
-        return !window->WindowEvents->Closing();
-    }
-    
-    return true;
-}
-
-- (void)windowDidChangeBackingProperties:(NSNotification *)notification
-{
-    _lastScaling = [self backingScaleFactor];
-}
-
-- (void)windowWillClose:(NSNotification *)notification
-{
-    _closed = true;
-    if(_parent)
-    {
-        ComPtr<WindowBaseImpl> parent = _parent;
-        _parent = NULL;
-        [self restoreParentWindow];
-        parent->BaseEvents->Closed();
-        [parent->View onClosed];
-    }
-}
-
--(BOOL)canBecomeKeyWindow
-{
-    if (_canBecomeKeyAndMain)
-    {
-        // If the window has a child window being shown as a dialog then don't allow it to become the key window.
-        for(NSWindow* uch in [self childWindows])
-        {
-            auto ch = objc_cast<AvnWindow>(uch);
-            if(ch == nil)
-                continue;
-            if (ch.isDialog)
-                return false;
-        }
-        
-        return true;
-    }
-    
-    return false;
-}
-
--(BOOL)canBecomeMainWindow
-{
-    return _canBecomeKeyAndMain;
-}
-
--(bool)shouldTryToHandleEvents
-{
-    return _isEnabled;
-}
-
--(void) setEnabled:(bool)enable
-{
-    _isEnabled = enable;
-}
-
--(void)becomeKeyWindow
-{
-    [self showWindowMenuWithAppMenu];
-    
-    if(_parent != nullptr)
-    {
-        _parent->BaseEvents->Activated();
-    }
-
-    [super becomeKeyWindow];
-}
-
--(void) restoreParentWindow;
-{
-    auto parent = objc_cast<AvnWindow>([self parentWindow]);
-    if(parent != nil)
-    {
-        [parent removeChildWindow:self];
-    }
-}
-
-- (void)windowDidMiniaturize:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->WindowStateChanged();
-    }
-}
-
-- (void)windowDidDeminiaturize:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->WindowStateChanged();
-    }
-}
-
-- (void)windowDidResize:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->WindowStateChanged();
-    }
-}
-
-- (void)windowWillExitFullScreen:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->StartStateTransition();
-    }
-}
-
-- (void)windowDidExitFullScreen:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->EndStateTransition();
-        
-        if(parent->Decorations() != SystemDecorationsFull && parent->WindowState() == Maximized)
-        {
-            NSRect screenRect = [[self screen] visibleFrame];
-            [self setFrame:screenRect display:YES];
-        }
-        
-        if(parent->WindowState() == Minimized)
-        {
-            [self miniaturize:nullptr];
-        }
-        
-        parent->WindowStateChanged();
-    }
-}
-
-- (void)windowWillEnterFullScreen:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->StartStateTransition();
-    }
-}
-
-- (void)windowDidEnterFullScreen:(NSNotification *)notification
-{
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
-    
-    if(parent != nullptr)
-    {
-        parent->EndStateTransition();
-        parent->WindowStateChanged();
-    }
-}
-
-- (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)newFrame
-{
-    return true;
-}
-
--(void)resignKeyWindow
-{
-    if(_parent)
-        _parent->BaseEvents->Deactivated();
-    
-    [self showAppMenuOnly];
-    
-    [super resignKeyWindow];
-}
-
-- (void)windowDidMove:(NSNotification *)notification
-{
-    AvnPoint position;
-    
-    if(_parent != nullptr)
-    {
-        _parent->GetPosition(&position);
-        _parent->BaseEvents->PositionChanged(position);
-    }
-}
-
-- (AvnPoint) translateLocalPoint:(AvnPoint)pt
-{
-    pt.Y = [self frame].size.height - pt.Y;
-    return pt;
-}
-
-- (void)sendEvent:(NSEvent *)event
-{
-    [super sendEvent:event];
-    
-    /// This is to detect non-client clicks. This can only be done on Windows... not popups, hence the dynamic_cast.
-    if(_parent != nullptr && dynamic_cast<WindowImpl*>(_parent.getRaw()) != nullptr)
-    {
-        switch(event.type)
-        {
-            case NSEventTypeLeftMouseDown:
-            {
-                AvnView* view = _parent->View;
-                NSPoint windowPoint = [event locationInWindow];
-                NSPoint viewPoint = [view convertPoint:windowPoint fromView:nil];
-                
-                if (!NSPointInRect(viewPoint, view.bounds))
-                {
-                    auto avnPoint = [AvnView toAvnPoint:windowPoint];
-                    auto point = [self translateLocalPoint:avnPoint];
-                    AvnVector delta;
-                   
-                    _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, [event timestamp] * 1000, AvnInputModifiersNone, point, delta);
-                }
-            }
-            break;
-                
-            case NSEventTypeMouseEntered:
-            {
-                _parent->UpdateCursor();
-            }
-            break;
-                
-            case NSEventTypeMouseExited:
-            {
-                [[NSCursor arrowCursor] set];
-            }
-            break;
-                
-            default:
-                break;
-        }
-    }
-}
-
-@end
-
-class PopupImpl : public virtual WindowBaseImpl, public IAvnPopup
-{
-private:
-    BEGIN_INTERFACE_MAP()
-    INHERIT_INTERFACE_MAP(WindowBaseImpl)
-    INTERFACE_MAP_ENTRY(IAvnPopup, IID_IAvnPopup)
-    END_INTERFACE_MAP()
-    virtual ~PopupImpl(){}
-    ComPtr<IAvnWindowEvents> WindowEvents;
-    PopupImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
-    {
-        WindowEvents = events;
-        [Window setLevel:NSPopUpMenuWindowLevel];
-    }
-protected:
-    virtual NSWindowStyleMask GetStyle() override
-    {
-        return NSWindowStyleMaskBorderless;
-    }
-    
-    virtual HRESULT Resize(double x, double y, AvnPlatformResizeReason reason) override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            if (Window != nullptr)
-            {
-                [Window setContentSize:NSSize{x, y}];
-            
-                [Window setFrameTopLeftPoint:ToNSPoint(ConvertPointY(lastPositionSet))];
-            }
-            
-            return S_OK;
-        }
-    }
-public:
-    virtual bool ShouldTakeFocusOnShow() override
-    {
-        return false;
-    }
-};
-
-extern IAvnPopup* CreateAvnPopup(IAvnWindowEvents*events, IAvnGlContext* gl)
-{
-    @autoreleasepool
-    {
-        IAvnPopup* ptr = dynamic_cast<IAvnPopup*>(new PopupImpl(events, gl));
-        return ptr;
-    }
-}
-
-extern IAvnWindow* CreateAvnWindow(IAvnWindowEvents*events, IAvnGlContext* gl)
-{
-    @autoreleasepool
-    {
-        IAvnWindow* ptr = (IAvnWindow*)new WindowImpl(events, gl);
-        return ptr;
-    }
-}
diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
index 72d90abbf3..9fcb9d6b7f 100644
--- a/nukebuild/Build.cs
+++ b/nukebuild/Build.cs
@@ -214,17 +214,11 @@ partial class Build : NukeBuild
         .DependsOn(Compile)
         .Executes(() =>
         {
-            RunCoreTest("Avalonia.Animation.UnitTests");
             RunCoreTest("Avalonia.Base.UnitTests");
             RunCoreTest("Avalonia.Controls.UnitTests");
             RunCoreTest("Avalonia.Controls.DataGrid.UnitTests");
-            RunCoreTest("Avalonia.Input.UnitTests");
-            RunCoreTest("Avalonia.Interactivity.UnitTests");
-            RunCoreTest("Avalonia.Layout.UnitTests");
             RunCoreTest("Avalonia.Markup.UnitTests");
             RunCoreTest("Avalonia.Markup.Xaml.UnitTests");
-            RunCoreTest("Avalonia.Styling.UnitTests");
-            RunCoreTest("Avalonia.Visuals.UnitTests");
             RunCoreTest("Avalonia.Skia.UnitTests");
             RunCoreTest("Avalonia.ReactiveUI.UnitTests");
         });
diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
index 52b60b7d0f..b2c58e2292 100644
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@@ -8,11 +8,10 @@
     <IsPackable>False</IsPackable>
     <NoWarn>CS0649;CS0169</NoWarn>
   </PropertyGroup>
-
+ <Import Project="..\build\JetBrains.dotMemoryUnit.props" />
   <ItemGroup>
     <PackageReference Include="Nuke.Common" Version="5.0.0" />
     <PackageReference Include="xunit.runner.console" Version="2.3.1" />
-    <PackageReference Include="JetBrains.dotMemoryUnit" Version="3.0.20171219.105559" />
     <PackageReference Include="vswhere" Version="2.6.7" Condition=" '$(OS)' == 'Windows_NT' " />
     <PackageReference Include="ILRepack.NETStandard" Version="2.0.4" />
     <PackageReference Include="MicroCom.CodeGenerator" Version="0.10.4" />
diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 4b28527465..4d0ed866a3 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -8,7 +8,9 @@
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj" >
         <PrivateAssets>all</PrivateAssets>
-      </ProjectReference>  
+        <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+        <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
+      </ProjectReference>
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/readme.md b/readme.md
index 7e32dbc321..1009e86c29 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,7 @@
 [![Telegram](https://raw.githubusercontent.com/Patrolavia/telegram-badge/master/chat.svg)](https://t.me/Avalonia)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AvaloniaUI/Avalonia?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) [![Discord](https://img.shields.io/badge/discord-join%20chat-46BC99)]( https://aka.ms/dotnet-discord) [![Build Status](https://dev.azure.com/AvaloniaUI/AvaloniaUI/_apis/build/status/AvaloniaUI.Avalonia)](https://dev.azure.com/AvaloniaUI/AvaloniaUI/_build/latest?definitionId=4) [![Backers on Open Collective](https://opencollective.com/Avalonia/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/Avalonia/sponsors/badge.svg)](#sponsors) ![License](https://img.shields.io/github/license/avaloniaui/avalonia.svg)
 <br />
-[![NuGet](https://img.shields.io/nuget/v/Avalonia.svg)](https://www.nuget.org/packages/Avalonia) [![downloads](https://img.shields.io/nuget/dt/avalonia)](https://www.nuget.org/packages/Avalonia) [![MyGet](https://img.shields.io/myget/avalonia-ci/vpre/Avalonia.svg?label=myget)](https://www.myget.org/gallery/avalonia-ci) ![Size](https://img.shields.io/github/repo-size/avaloniaui/avalonia.svg) 
+[![NuGet](https://img.shields.io/nuget/v/Avalonia.svg)](https://www.nuget.org/packages/Avalonia) [![downloads](https://img.shields.io/nuget/dt/avalonia)](https://www.nuget.org/packages/Avalonia)  ![Size](https://img.shields.io/github/repo-size/avaloniaui/avalonia.svg) 
 
 ## 📖 About 
 
@@ -70,11 +70,15 @@ For more information see the [.NET Foundation Code of Conduct](https://dotnetfou
 
 Avalonia is licenced under the [MIT licence](licence.md).
 
-## Support Avalonia
+## Donate
 
-**BTC**: bc1q05wx78qemgy9x6ytl5ljk2xrt00yqargyjm8gx
+Donating to the project is a fantastic way to thank our valued contributors for their hard work. Your donations are shared among our community and awarded for significant contributions.  
+
+If you need support see Commercial Support section below.
+
+Donate with BTC or use [Open Collective](https://opencollective.com/avalonia).
 
-This will be shared with the community and awarded for significant contributions.
+**BTC**: bc1q05wx78qemgy9x6ytl5ljk2xrt00yqargyjm8gx
 
 ### Backers
 
@@ -98,6 +102,11 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 <a href="https://opencollective.com/Avalonia/sponsor/9/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/9/avatar.svg"></a>
 <a href="https://baseheadinc.com/" target="_blank"><img height="50" src="https://baseheadinc.com/wp-content/uploads/2020/09/BH-Logo-for-Site-Header-New.png"></a>
 
+## Commercial Support 
+
+We have a range of [support plans available](https://avaloniaui.net/support.html) for those looking to partner with the creators of Avalonia, enabling access to the best support at every step of the development process.
+
+*Please note that donations are not considered payment for commercial support agreements. Please contact us to discuss your needs first. [team@avaloniaui.net](mailto://team@avaloniaui.net)*
 ## .NET Foundation
 
 This project is supported by the [.NET Foundation](https://dotnetfoundation.org).
diff --git a/samples/BindingDemo/BindingDemo.csproj b/samples/BindingDemo/BindingDemo.csproj
index 2c6ff74e5e..bd6054327f 100644
--- a/samples/BindingDemo/BindingDemo.csproj
+++ b/samples/BindingDemo/BindingDemo.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
   </ItemGroup>
diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
index 516acfe4b9..e52430f50b 100644
--- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
+++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
@@ -9,36 +9,35 @@
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
+    <RuntimeIdentifiers>android-arm64;android-x64</RuntimeIdentifiers>
   </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Assets\AboutAssets.txt" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="..\..\build\Assets\Icon.png">
       <Link>Resources\drawable\Icon.png</Link>
     </AndroidResource>
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
-    <DebugSymbols>True</DebugSymbols>
-    <RunAOTCompilation>False</RunAOTCompilation>
-    <EnableLLVM>True</EnableLLVM>
+  <PropertyGroup Condition="'$(RunAOTCompilation)'=='' and '$(Configuration)'=='Release' and '$(TF_BUILD)'==''">
+    <RunAOTCompilation>True</RunAOTCompilation>
   </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
-    <RunAOTCompilation>False</RunAOTCompilation>
+  
+  <PropertyGroup Condition="'$(RunAOTCompilation)'=='True'">
+    <EnableLLVM>True</EnableLLVM>
+    <AndroidAotAdditionalArguments>no-write-symbols,nodebug</AndroidAotAdditionalArguments>
+    <AndroidAotMode>Hybrid</AndroidAotMode>
+    <AndroidGenerateJniMarshalMethods>True</AndroidGenerateJniMarshalMethods>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
+  <PropertyGroup Condition="'$(AndroidEnableProfiler)'=='True'">
+    <IsEmulator Condition="'$(IsEmulator)' == ''">True</IsEmulator>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.1.3" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel" Version="2.3.1.3" />
+    <AndroidEnvironment Condition="'$(IsEmulator)'=='True'" Include="environment.emulator.txt" />
+    <AndroidEnvironment Condition="'$(IsEmulator)'!='True'" Include="environment.device.txt" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Android\Avalonia.Android\Avalonia.Android.csproj" />
     <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
diff --git a/samples/ControlCatalog.Android/EmbedSample.Android.cs b/samples/ControlCatalog.Android/EmbedSample.Android.cs
new file mode 100644
index 0000000000..250121fc53
--- /dev/null
+++ b/samples/ControlCatalog.Android/EmbedSample.Android.cs
@@ -0,0 +1,35 @@
+using System;
+using Avalonia.Platform;
+using Avalonia.Android;
+using ControlCatalog.Pages;
+
+namespace ControlCatalog.Android;
+
+public class EmbedSampleAndroid : INativeDemoControl
+{
+    public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault)
+    {
+        var parentContext = (parent as AndroidViewControlHandle)?.View.Context
+            ?? global::Android.App.Application.Context;
+
+        if (isSecond)
+        {
+            var webView = new global::Android.Webkit.WebView(parentContext);
+            webView.LoadUrl("https://www.android.com/");
+
+            return new AndroidViewControlHandle(webView);
+        }
+        else
+        {
+            var button = new global::Android.Widget.Button(parentContext) { Text = "Hello world" };
+            var clickCount = 0;
+            button.Click += (sender, args) =>
+            {
+                clickCount++;
+                button.Text = $"Click count {clickCount}";
+            };
+
+            return new AndroidViewControlHandle(button);
+        }
+    }
+}
diff --git a/samples/ControlCatalog.Android/MainActivity.cs b/samples/ControlCatalog.Android/MainActivity.cs
index 44290d9816..33ca511340 100644
--- a/samples/ControlCatalog.Android/MainActivity.cs
+++ b/samples/ControlCatalog.Android/MainActivity.cs
@@ -10,7 +10,11 @@ namespace ControlCatalog.Android
     {
         protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
         {
-            return base.CustomizeAppBuilder(builder);
+            return base.CustomizeAppBuilder(builder)
+                .AfterSetup(_ =>
+                {
+                    Pages.EmbedSample.Implementation = new EmbedSampleAndroid();
+                });
         }
     }
 }
diff --git a/samples/ControlCatalog.Android/Properties/AndroidManifest.xml b/samples/ControlCatalog.Android/Properties/AndroidManifest.xml
index aa570ec504..6f551d2b01 100644
--- a/samples/ControlCatalog.Android/Properties/AndroidManifest.xml
+++ b/samples/ControlCatalog.Android/Properties/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
-	<application android:label="ControlCatalog.Android" android:icon="@drawable/Icon"></application>
+  <application android:label="ControlCatalog.Android" android:icon="@drawable/Icon"></application>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
diff --git a/samples/ControlCatalog.Android/environment.device.txt b/samples/ControlCatalog.Android/environment.device.txt
new file mode 100644
index 0000000000..107d68ca1b
--- /dev/null
+++ b/samples/ControlCatalog.Android/environment.device.txt
@@ -0,0 +1 @@
+DOTNET_DiagnosticPorts=127.0.0.1:9000,suspend
diff --git a/samples/ControlCatalog.Android/environment.emulator.txt b/samples/ControlCatalog.Android/environment.emulator.txt
new file mode 100644
index 0000000000..299a0ec30b
--- /dev/null
+++ b/samples/ControlCatalog.Android/environment.emulator.txt
@@ -0,0 +1 @@
+DOTNET_DiagnosticPorts=10.0.2.2:9001,suspend
diff --git a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
index d1b657722c..0667644643 100644
--- a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
+++ b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
@@ -4,14 +4,25 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(RunAotCompilation)' == 'true'">
+  <PropertyGroup Condition="'$(RunNativeAotCompilation)' == 'true'">
     <IlcTrimMetadata>true</IlcTrimMetadata>
     <RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json</RestoreAdditionalProjectSources>
     <NativeAotCompilerVersion>7.0.0-*</NativeAotCompilerVersion>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\src\Avalonia.X11\NativeDialogs\Gtk.cs" Link="NativeControls\Gtk\Gtk.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="NativeControls\Gtk\nodes.mp4">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Headless.Vnc\Avalonia.Headless.Vnc.csproj" />
@@ -20,19 +31,21 @@
     <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
     <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
+    <!-- For native controls test -->
+    <PackageReference Include="MonoMac.NetStandard" Version="0.0.4" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(RunAotCompilation)' == 'true'">
+  <ItemGroup Condition="'$(RunNativeAotCompilation)' == 'true'">
     <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(NativeAotCompilerVersion)" />
     <!-- Cross-compilation for Windows x64-arm64 and Linux x64-arm64 -->
     <PackageReference Condition="'$(RuntimeIdentifier)'=='win-arm64'" Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="$(NativeAotCompilerVersion)" />
     <PackageReference Condition="'$(RuntimeIdentifier)'=='linux-arm64'" Include="runtime.linux-x64.Microsoft.DotNet.ILCompiler" Version="$(NativeAotCompilerVersion)" />
-    <RdXmlFile Include="rd.xml" />
   </ItemGroup>
 
   <PropertyGroup>
     <!-- For Microsoft.CodeAnalysis -->
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <Import Project="..\..\build\SampleApp.props" />
diff --git a/samples/ControlCatalog.NetCore/NativeControls/Gtk/EmbedSample.Gtk.cs b/samples/ControlCatalog.NetCore/NativeControls/Gtk/EmbedSample.Gtk.cs
new file mode 100644
index 0000000000..521d3674eb
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/NativeControls/Gtk/EmbedSample.Gtk.cs
@@ -0,0 +1,35 @@
+using System.IO;
+using System.Diagnostics;
+using Avalonia.Platform;
+using Avalonia.Controls.Platform;
+using System;
+using ControlCatalog.Pages;
+
+namespace ControlCatalog.NetCore;
+
+public class EmbedSampleGtk : INativeDemoControl
+{
+    private Process _mplayer;
+
+    public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault)
+    {
+        if (isSecond)
+        {
+            var chooser = GtkHelper.CreateGtkFileChooser(parent.Handle);
+            if (chooser != null)
+                return chooser;
+        }
+
+        var control = createDefault();
+        var nodes = Path.GetFullPath(Path.Combine(typeof(EmbedSample).Assembly.GetModules()[0].FullyQualifiedName,
+            "..",
+            "nodes.mp4"));
+        _mplayer = Process.Start(new ProcessStartInfo("mplayer",
+            $"-vo x11 -zoom -loop 0 -wid {control.Handle.ToInt64()} \"{nodes}\"")
+        {
+            UseShellExecute = false,
+
+        });
+        return control;
+    }
+}
diff --git a/samples/ControlCatalog.NetCore/NativeControls/Gtk/GtkHelper.cs b/samples/ControlCatalog.NetCore/NativeControls/Gtk/GtkHelper.cs
new file mode 100644
index 0000000000..456f77a44d
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/NativeControls/Gtk/GtkHelper.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Controls.Platform;
+using Avalonia.Platform.Interop;
+using Avalonia.X11.NativeDialogs;
+using static Avalonia.X11.NativeDialogs.Gtk;
+using static Avalonia.X11.NativeDialogs.Glib;
+
+namespace ControlCatalog.NetCore;
+
+internal 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 INativeControlHostDestroyableControlHandle 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/nodes-license.md b/samples/ControlCatalog.NetCore/NativeControls/Gtk/nodes-license.md
similarity index 100%
rename from samples/interop/NativeEmbedSample/nodes-license.md
rename to samples/ControlCatalog.NetCore/NativeControls/Gtk/nodes-license.md
diff --git a/samples/interop/NativeEmbedSample/nodes.mp4 b/samples/ControlCatalog.NetCore/NativeControls/Gtk/nodes.mp4
similarity index 100%
rename from samples/interop/NativeEmbedSample/nodes.mp4
rename to samples/ControlCatalog.NetCore/NativeControls/Gtk/nodes.mp4
diff --git a/samples/ControlCatalog.NetCore/NativeControls/Mac/EmbedSample.Mac.cs b/samples/ControlCatalog.NetCore/NativeControls/Mac/EmbedSample.Mac.cs
new file mode 100644
index 0000000000..7967c9c073
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/NativeControls/Mac/EmbedSample.Mac.cs
@@ -0,0 +1,29 @@
+using System;
+
+using Avalonia.Platform;
+using Avalonia.Threading;
+
+using ControlCatalog.Pages;
+
+using MonoMac.Foundation;
+using MonoMac.WebKit;
+
+namespace ControlCatalog.NetCore;
+
+public class EmbedSampleMac : INativeDemoControl
+{
+    public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault)
+    {
+        // Note: We are using MonoMac for example purposes
+        // It shouldn't be used in production apps
+        MacHelper.EnsureInitialized();
+
+        var webView = new WebView();
+        Dispatcher.UIThread.Post(() =>
+        {
+            webView.MainFrame.LoadRequest(new NSUrlRequest(new NSUrl(
+                isSecond ? "https://bing.com" : "https://google.com/")));
+        });
+        return new MacOSViewHandle(webView);
+    }
+}
diff --git a/samples/ControlCatalog.NetCore/NativeControls/Mac/MacHelper.cs b/samples/ControlCatalog.NetCore/NativeControls/Mac/MacHelper.cs
new file mode 100644
index 0000000000..5b3bc9abf1
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/NativeControls/Mac/MacHelper.cs
@@ -0,0 +1,38 @@
+using System;
+
+using Avalonia.Controls.Platform;
+using MonoMac.AppKit;
+
+namespace ControlCatalog.NetCore;
+
+internal class MacHelper
+{
+    private static bool _isInitialized;
+
+    public static void EnsureInitialized()
+    {
+        if (_isInitialized)
+            return;
+        _isInitialized = true;
+        NSApplication.Init();
+    }
+}
+
+internal class MacOSViewHandle : INativeControlHostDestroyableControlHandle
+{
+    private NSView _view;
+
+    public MacOSViewHandle(NSView view)
+    {
+        _view = view;
+    }
+
+    public IntPtr Handle => _view?.Handle ?? IntPtr.Zero;
+    public string HandleDescriptor => "NSView";
+
+    public void Destroy()
+    {
+        _view.Dispose();
+        _view = null;
+    }
+}
diff --git a/samples/ControlCatalog.NetCore/NativeControls/Win/EmbedSample.Win.cs b/samples/ControlCatalog.NetCore/NativeControls/Win/EmbedSample.Win.cs
new file mode 100644
index 0000000000..77982db0ca
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/NativeControls/Win/EmbedSample.Win.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Text;
+
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+
+using ControlCatalog.Pages;
+
+namespace ControlCatalog.NetCore;
+
+public class EmbedSampleWin : INativeDemoControl
+{
+    private const string RichText =
+        @"{\rtf1\ansi\ansicpg1251\deff0\nouicompat\deflang1049{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
+{\colortbl ;\red255\green0\blue0;\red0\green77\blue187;\red0\green176\blue80;\red155\green0\blue211;\red247\green150\blue70;\red75\green172\blue198;}
+{\*\generator Riched20 6.3.9600}\viewkind4\uc1 
+\pard\sa200\sl276\slmult1\f0\fs22\lang9 <PREFIX>I \i am\i0  a \cf1\b Rich Text \cf0\b0\fs24 control\cf2\fs28 !\cf3\fs32 !\cf4\fs36 !\cf1\fs40 !\cf5\fs44 !\cf6\fs48 !\cf0\fs44\par
+}";
+
+    public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault)
+    {
+        WinApi.LoadLibrary("Msftedit.dll");
+        var handle = WinApi.CreateWindowEx(0, "RICHEDIT50W",
+            @"Rich Edit",
+            0x800000 | 0x10000000 | 0x40000000 | 0x800000 | 0x10000 | 0x0004, 0, 0, 1, 1, parent.Handle,
+            IntPtr.Zero, WinApi.GetModuleHandle(null), IntPtr.Zero);
+        var st = new WinApi.SETTEXTEX { Codepage = 65001, Flags = 0x00000008 };
+        var text = RichText.Replace("<PREFIX>", isSecond ? "\\qr " : "");
+        var bytes = Encoding.UTF8.GetBytes(text);
+        WinApi.SendMessage(handle, 0x0400 + 97, ref st, bytes);
+        return new Win32WindowControlHandle(handle, "HWND");
+    }
+}
+
+internal class Win32WindowControlHandle : PlatformHandle, INativeControlHostDestroyableControlHandle
+{
+    public Win32WindowControlHandle(IntPtr handle, string descriptor) : base(handle, descriptor)
+    {
+    }
+
+    public void Destroy()
+    {
+        _ = WinApi.DestroyWindow(Handle);
+    }
+}
diff --git a/samples/ControlCatalog.NetCore/NativeControls/Win/WinApi.cs b/samples/ControlCatalog.NetCore/NativeControls/Win/WinApi.cs
new file mode 100644
index 0000000000..47d368f7a4
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/NativeControls/Win/WinApi.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace ControlCatalog.NetCore;
+
+internal unsafe class WinApi
+{
+    public enum CommonControls : uint
+    {
+        ICC_LISTVIEW_CLASSES = 0x00000001, // listview, header
+        ICC_TREEVIEW_CLASSES = 0x00000002, // treeview, tooltips
+        ICC_BAR_CLASSES = 0x00000004, // toolbar, statusbar, trackbar, tooltips
+        ICC_TAB_CLASSES = 0x00000008, // tab, tooltips
+        ICC_UPDOWN_CLASS = 0x00000010, // updown
+        ICC_PROGRESS_CLASS = 0x00000020, // progress
+        ICC_HOTKEY_CLASS = 0x00000040, // hotkey
+        ICC_ANIMATE_CLASS = 0x00000080, // animate
+        ICC_WIN95_CLASSES = 0x000000FF,
+        ICC_DATE_CLASSES = 0x00000100, // month picker, date picker, time picker, updown
+        ICC_USEREX_CLASSES = 0x00000200, // comboex
+        ICC_COOL_CLASSES = 0x00000400, // rebar (coolbar) control
+        ICC_INTERNET_CLASSES = 0x00000800,
+        ICC_PAGESCROLLER_CLASS = 0x00001000, // page scroller
+        ICC_NATIVEFNTCTL_CLASS = 0x00002000, // native font control
+        ICC_STANDARD_CLASSES = 0x00004000,
+        ICC_LINK_CLASS = 0x00008000
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct INITCOMMONCONTROLSEX
+    {
+        public int dwSize;
+        public uint dwICC;
+    }
+
+    [DllImport("Comctl32.dll")]
+    public static extern void InitCommonControlsEx(ref INITCOMMONCONTROLSEX init);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    public static extern bool DestroyWindow(IntPtr hwnd);
+
+    [DllImport("kernel32.dll")]
+    public static extern IntPtr LoadLibrary(string lib);
+
+
+    [DllImport("kernel32.dll")]
+    public static extern IntPtr GetModuleHandle(string lpModuleName);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    public static extern IntPtr CreateWindowEx(
+        int dwExStyle,
+        string lpClassName,
+        string lpWindowName,
+        uint dwStyle,
+        int x,
+        int y,
+        int nWidth,
+        int nHeight,
+        IntPtr hWndParent,
+        IntPtr hMenu,
+        IntPtr hInstance,
+        IntPtr lpParam);
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct SETTEXTEX
+    {
+        public uint Flags;
+        public uint Codepage;
+    }
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "SendMessageW")]
+    public static extern IntPtr SendMessage(IntPtr hWnd, int Msg, ref SETTEXTEX wParam, byte[] lParam);
+}
diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs
index 4b81935452..fd080cfc5b 100644
--- a/samples/ControlCatalog.NetCore/Program.cs
+++ b/samples/ControlCatalog.NetCore/Program.cs
@@ -7,11 +7,12 @@ using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Dialogs;
 using Avalonia.Headless;
 using Avalonia.LogicalTree;
 using Avalonia.Threading;
 
+using ControlCatalog.Pages;
+
 namespace ControlCatalog.NetCore
 {
     static class Program
@@ -117,13 +118,17 @@ namespace ControlCatalog.NetCore
                     EnableMultitouch = true
                 })
                 .UseSkia()
-                .UseManagedSystemDialogs()
                 .AfterSetup(builder =>
                 {
                     builder.Instance!.AttachDevTools(new Avalonia.Diagnostics.DevToolsOptions()
                     {
                         StartupScreenIndex = 1,
                     });
+
+                    EmbedSample.Implementation = OperatingSystem.IsWindows() ? (INativeDemoControl)new EmbedSampleWin()
+                        : OperatingSystem.IsMacOS() ? new EmbedSampleMac()
+                        : OperatingSystem.IsLinux() ? new EmbedSampleGtk()
+                        : null;
                 })
                 .LogToTrace();
 
diff --git a/samples/ControlCatalog.NetCore/app.manifest b/samples/ControlCatalog.NetCore/app.manifest
new file mode 100644
index 0000000000..db90057191
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/app.manifest
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="ControlCatalog.app"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+
+    </application>
+  </compatibility>
+</assembly>
diff --git a/samples/ControlCatalog.NetCore/rd.xml b/samples/ControlCatalog.NetCore/rd.xml
deleted file mode 100644
index 27db7f34ca..0000000000
--- a/samples/ControlCatalog.NetCore/rd.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Directives>
-  <Application>
-    <Assembly Name="ControlCatalog" Dynamic="Required All"></Assembly>
-    <Assembly Name="Avalonia.Themes.Default" Dynamic="Required All"></Assembly>
-    <Assembly Name="Avalonia.Themes.Fluent" Dynamic="Required All"></Assembly>
-  </Application>
-</Directives>
\ No newline at end of file
diff --git a/samples/ControlCatalog.Web/App.razor.cs b/samples/ControlCatalog.Web/App.razor.cs
index a150824ac3..c0b7ddbe1e 100644
--- a/samples/ControlCatalog.Web/App.razor.cs
+++ b/samples/ControlCatalog.Web/App.razor.cs
@@ -7,6 +7,10 @@ public partial class App
     protected override void OnParametersSet()
     {
         WebAppBuilder.Configure<ControlCatalog.App>()
+            .AfterSetup(_ =>
+            {
+                ControlCatalog.Pages.EmbedSample.Implementation = new EmbedSampleWeb();
+            })
             .SetupWithSingleViewLifetime();
 
         base.OnParametersSet();
diff --git a/samples/ControlCatalog.Web/ControlCatalog.Web.csproj b/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
index 520bbdf32b..b2c9ec72eb 100644
--- a/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
+++ b/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
     <Nullable>enable</Nullable>
-    <WasmBuildNative>True</WasmBuildNative>
+    <!--Temporal hack that fixes compilation in VS-->
+    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+    <EmccTotalMemory>16777216</EmccTotalMemory>
+    <BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
+    <BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
   </PropertyGroup>
 
-  <ItemGroup>
-    <BlazorLinkerDescriptor Include="LinkerConfig.xml" />
-  </ItemGroup>
-
   <!-- In debug, make builds faster by reducing optimizations -->
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <WasmNativeStrip>false</WasmNativeStrip>
@@ -23,19 +22,36 @@
     <EmccCompileOptimizationFlag>-O3</EmccCompileOptimizationFlag>
     <EmccLinkOptimizationFlag>-O3</EmccLinkOptimizationFlag>
     <RunAOTCompilation>false</RunAOTCompilation>
+    <DebuggerSupport>false</DebuggerSupport>
+    <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
+    <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
+    <EventSourceSupport>false</EventSourceSupport>
+    <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
+    <InvariantGlobalization>true</InvariantGlobalization>
+    <MetadataUpdaterSupport>false</MetadataUpdaterSupport>
+    <UseNativeHttpHandler>true</UseNativeHttpHandler>
+    <UseSystemResourceKeys>true</UseSystemResourceKeys>
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>link</TrimMode>
+    <TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0"/>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all"/>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
   </ItemGroup>
 
-  <Import Project="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.targets" />
-  <Import Project="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.CompilationTuning.props" />
-
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.csproj"/>
-    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj"/>
+    <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
+    <ProjectReference Include="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.csproj" />
+    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
   </ItemGroup>
 
+  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
+  <Import Project="..\..\build\BuildTargets.targets" />
+
+  <Import Project="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.targets" />
+  <Import Project="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.CompilationTuning.props" />
+
 </Project>
+
diff --git a/samples/ControlCatalog.Web/EmbedSample.Browser.cs b/samples/ControlCatalog.Web/EmbedSample.Browser.cs
new file mode 100644
index 0000000000..5fe14409de
--- /dev/null
+++ b/samples/ControlCatalog.Web/EmbedSample.Browser.cs
@@ -0,0 +1,34 @@
+using System;
+
+using Avalonia;
+using Avalonia.Platform;
+using Avalonia.Web.Blazor;
+
+using ControlCatalog.Pages;
+
+using Microsoft.JSInterop;
+
+namespace ControlCatalog.Web;
+
+public class EmbedSampleWeb : INativeDemoControl
+{
+    public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault)
+    {
+        var runtime = AvaloniaLocator.Current.GetRequiredService<IJSInProcessRuntime>();
+
+        if (isSecond)
+        {
+            var iframe = runtime.Invoke<IJSInProcessObjectReference>("document.createElement", "iframe");
+            iframe.InvokeVoid("setAttribute", "src", "https://www.youtube.com/embed/kZCIporjJ70");
+
+            return new JSObjectControlHandle(iframe);
+        }
+        else
+        {
+            // window.createAppButton source is defined in "app.js" file.
+            var button = runtime.Invoke<IJSInProcessObjectReference>("window.createAppButton");
+
+            return new JSObjectControlHandle(button);
+        }
+    }
+}
diff --git a/samples/ControlCatalog.Web/LinkerConfig.xml b/samples/ControlCatalog.Web/LinkerConfig.xml
deleted file mode 100644
index 5839a0fe03..0000000000
--- a/samples/ControlCatalog.Web/LinkerConfig.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  This file specifies which parts of the BCL or Blazor packages must not be
-  stripped by the IL Linker even if they aren't referenced by user code.
--->
-<linker>
-  <assembly fullname="mscorlib">
-    <!--
-      Preserve the methods in WasmRuntime because its methods are called by 
-      JavaScript client-side code to implement timers.
-      Fixes: https://github.com/dotnet/blazor/issues/239
-    -->
-    <type fullname="System.Threading.WasmRuntime"/>
-  </assembly>
-
-  <assembly fullname="System.Core">
-    <!--
-      System.Linq.Expressions* is required by Json.NET and any 
-      expression.Compile caller. The assembly isn't stripped.
-    -->
-    <type fullname="System.Linq.Expressions*"/>
-  </assembly>
-  <!--
-    In this example, the app's entry point assembly is listed. The assembly
-    isn't stripped by the IL Linker.
-  -->
-  <assembly fullname="ControlCatalog" preserve="All" />
-</linker>
diff --git a/samples/ControlCatalog.Web/Shared/MainLayout.razor.css b/samples/ControlCatalog.Web/Shared/MainLayout.razor.css
deleted file mode 100644
index 43c355a47a..0000000000
--- a/samples/ControlCatalog.Web/Shared/MainLayout.razor.css
+++ /dev/null
@@ -1,70 +0,0 @@
-.page {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-}
-
-.main {
-    flex: 1;
-}
-
-.sidebar {
-    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
-}
-
-.top-row {
-    background-color: #f7f7f7;
-    border-bottom: 1px solid #d6d5d5;
-    justify-content: flex-end;
-    height: 3.5rem;
-    display: flex;
-    align-items: center;
-}
-
-    .top-row ::deep a, .top-row .btn-link {
-        white-space: nowrap;
-        margin-left: 1.5rem;
-    }
-
-    .top-row a:first-child {
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-
-@media (max-width: 640.98px) {
-    .top-row:not(.auth) {
-        display: none;
-    }
-
-    .top-row.auth {
-        justify-content: space-between;
-    }
-
-    .top-row a, .top-row .btn-link {
-        margin-left: 0;
-    }
-}
-
-@media (min-width: 641px) {
-    .page {
-        flex-direction: row;
-    }
-
-    .sidebar {
-        width: 250px;
-        height: 100vh;
-        position: sticky;
-        top: 0;
-    }
-
-    .top-row {
-        position: sticky;
-        top: 0;
-        z-index: 1;
-    }
-
-    .main > div {
-        padding-left: 2rem !important;
-        padding-right: 1.5rem !important;
-    }
-}
diff --git a/samples/ControlCatalog.Web/wwwroot/css/app.css b/samples/ControlCatalog.Web/wwwroot/css/app.css
index d2a8dc525c..49ca14e162 100644
--- a/samples/ControlCatalog.Web/wwwroot/css/app.css
+++ b/samples/ControlCatalog.Web/wwwroot/css/app.css
@@ -44,47 +44,13 @@ a, .btn-link {
     z-index: 1000;
 }
 
-    #blazor-error-ui .dismiss {
-        cursor: pointer;
-        position: absolute;
-        right: 0.75rem;
-        top: 0.5rem;
-    }
-
-.canvas-container {
-    opacity:1;
-    background-color:#ccc;
-    position:fixed;
-    width:100%;
-    height:100%;
-    top:0px;
-    left:0px;
-    z-index:500;
-}
-
-canvas
-{
-    opacity:1;
-    background-color:#ccc;
-    position:fixed;
-    width:100%;
-    height:100%;
-    top:0px;
-    left:0px;
-    z-index:500;
+#blazor-error-ui .dismiss {
+    cursor: pointer;
+    position: absolute;
+    right: 0.75rem;
+    top: 0.5rem;
 }
 
 #app, .page {
     height: 100%;
 }
-
-.overlay{
-    opacity:0.0;
-    background-color:#ccc;
-    position:fixed;
-    width:100vw;
-    height:100vh;
-    top:0px;
-    left:0px;
-    z-index:1000;
-}
diff --git a/samples/ControlCatalog.Web/wwwroot/js/app.js b/samples/ControlCatalog.Web/wwwroot/js/app.js
index 5f282702bb..29697661a6 100644
--- a/samples/ControlCatalog.Web/wwwroot/js/app.js
+++ b/samples/ControlCatalog.Web/wwwroot/js/app.js
@@ -1 +1,10 @@
-
\ No newline at end of file
+window.createAppButton = function () {
+    var button = document.createElement('button');
+    button.innerText = 'Hello world';
+    var clickCount = 0;
+    button.onclick = () => {
+        clickCount++;
+        button.innerText = 'Click count ' + clickCount;
+    };
+    return button;
+}
diff --git a/samples/ControlCatalog.iOS.Legacy/AppDelegate.cs b/samples/ControlCatalog.iOS.Legacy/AppDelegate.cs
deleted file mode 100644
index a67de98259..0000000000
--- a/samples/ControlCatalog.iOS.Legacy/AppDelegate.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Avalonia.iOS;
-using Foundation;
-using UIKit;
-
-namespace ControlCatalog.iOS.Legacy
-{
-    // The UIApplicationDelegate for the application. This class is responsible for launching the 
-    // User Interface of the application, as well as listening (and optionally responding) to 
-    // application events from iOS.
-    [Register("AppDelegate")]
-    public partial class AppDelegate : AvaloniaAppDelegate<App>
-    {
-        
-    }
-}
diff --git a/samples/ControlCatalog.iOS.Legacy/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/ControlCatalog.iOS.Legacy/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 98f4d035c8..0000000000
--- a/samples/ControlCatalog.iOS.Legacy/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-  "images": [
-    {
-      "scale": "2x",
-      "size": "20x20",
-      "idiom": "iphone",
-      "filename": "Icon40.png"
-    },
-    {
-      "scale": "3x",
-      "size": "20x20",
-      "idiom": "iphone",
-      "filename": "Icon60.png"
-    },
-    {
-      "scale": "2x",
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "Icon58.png"
-    },
-    {
-      "scale": "3x",
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "Icon87.png"
-    },
-    {
-      "scale": "2x",
-      "size": "40x40",
-      "idiom": "iphone",
-      "filename": "Icon80.png"
-    },
-    {
-      "scale": "3x",
-      "size": "40x40",
-      "idiom": "iphone",
-      "filename": "Icon120.png"
-    },
-    {
-      "scale": "2x",
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "Icon120.png"
-    },
-    {
-      "scale": "3x",
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "Icon180.png"
-    },
-    {
-      "scale": "1x",
-      "size": "20x20",
-      "idiom": "ipad",
-      "filename": "Icon20.png"
-    },
-    {
-      "scale": "2x",
-      "size": "20x20",
-      "idiom": "ipad",
-      "filename": "Icon40.png"
-    },
-    {
-      "scale": "1x",
-      "size": "29x29",
-      "idiom": "ipad",
-      "filename": "Icon29.png"
-    },
-    {
-      "scale": "2x",
-      "size": "29x29",
-      "idiom": "ipad",
-      "filename": "Icon58.png"
-    },
-    {
-      "scale": "1x",
-      "size": "40x40",
-      "idiom": "ipad",
-      "filename": "Icon40.png"
-    },
-    {
-      "scale": "2x",
-      "size": "40x40",
-      "idiom": "ipad",
-      "filename": "Icon80.png"
-    },
-    {
-      "scale": "1x",
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "Icon76.png"
-    },
-    {
-      "scale": "2x",
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "Icon152.png"
-    },
-    {
-      "scale": "2x",
-      "size": "83.5x83.5",
-      "idiom": "ipad",
-      "filename": "Icon167.png"
-    },
-    {
-      "scale": "1x",
-      "size": "1024x1024",
-      "idiom": "ios-marketing",
-      "filename": "Icon1024.png"
-    }
-  ],
-  "properties": {},
-  "info": {
-    "version": 1,
-    "author": "xcode"
-  }
-}
\ No newline at end of file
diff --git a/samples/ControlCatalog.iOS.Legacy/ControlCatalog.iOS.Legacy.csproj b/samples/ControlCatalog.iOS.Legacy/ControlCatalog.iOS.Legacy.csproj
deleted file mode 100644
index 045114ff5a..0000000000
--- a/samples/ControlCatalog.iOS.Legacy/ControlCatalog.iOS.Legacy.csproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<Project Sdk="Xamarin.Legacy.Sdk">
-    <PropertyGroup>
-        <TargetFramework>xamarin.ios10</TargetFramework>
-        <SupportedOSPlatformVersion>15.0</SupportedOSPlatformVersion>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-        <ProjectGuid>{3AF75F00-B497-4517-9491-922173DE216E}</ProjectGuid>
-        <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-        <OutputType>Exe</OutputType>
-        <RootNamespace>ControlCatalog.iOS.Legacy</RootNamespace>
-        <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-        <AssemblyName>ControlCatalog.iOS.Legacy</AssemblyName>
-        <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
-        <ProvisioningType>manual</ProvisioningType>
-        <MtouchInterpreter>-all</MtouchInterpreter>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-        <DefineConstants>DEBUG</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-        <ConsolePause>false</ConsolePause>
-        <MtouchArch>x86_64</MtouchArch>
-        <MtouchLink>None</MtouchLink>
-        <MtouchDebug>true</MtouchDebug>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
-        <DebugType>none</DebugType>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-        <MtouchLink>None</MtouchLink>
-        <MtouchArch>x86_64</MtouchArch>
-        <ConsolePause>false</ConsolePause>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\iPhone\Debug</OutputPath>
-        <DefineConstants>DEBUG</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-        <ConsolePause>false</ConsolePause>
-        <MtouchArch>ARM64</MtouchArch>
-        <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-        <MtouchDebug>true</MtouchDebug>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
-        <DebugType>none</DebugType>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\iPhone\Release</OutputPath>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-        <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-        <MtouchArch>ARM64</MtouchArch>
-        <ConsolePause>false</ConsolePause>
-    </PropertyGroup>
-    <ItemGroup>
-        <None Include="Info.plist" />
-        <Content Include="Entitlements.plist" />
-    </ItemGroup>
-    <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Xml" />
-        <Reference Include="System.Core" />
-        <Reference Include="Xamarin.iOS" />
-    </ItemGroup>
-    <ItemGroup>
-        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
-            <Visible>false</Visible>
-        </ImageAsset>
-    </ItemGroup>
-    <ItemGroup>
-        <Folder Include="Resources\" />
-    </ItemGroup>
-    <ItemGroup>
-      <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj">
-        <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
-        <Name>Avalonia.Controls</Name>
-      </ProjectReference>
-      <ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj">
-        <Project>{4488ad85-1495-4809-9aa4-ddfe0a48527e}</Project>
-        <Name>Avalonia.iOS</Name>
-      </ProjectReference>
-      <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj">
-        <Project>{d0a739b9-3c68-4ba6-a328-41606954b6bd}</Project>
-        <Name>ControlCatalog</Name>
-      </ProjectReference>
-    </ItemGroup>
-<!--  <Import Project="..\..\build\LegacyProject.targets" />-->
-<!--  <Import Project="..\..\build\SkiaSharp.props" />-->
-<!--  <Import Project="..\..\build\HarfBuzzSharp.props" />-->
-</Project>
diff --git a/samples/ControlCatalog.iOS.Legacy/Entitlements.plist b/samples/ControlCatalog.iOS.Legacy/Entitlements.plist
deleted file mode 100644
index 36a8706706..0000000000
--- a/samples/ControlCatalog.iOS.Legacy/Entitlements.plist
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-    </dict>
-</plist>
diff --git a/samples/ControlCatalog.iOS.Legacy/Info.plist b/samples/ControlCatalog.iOS.Legacy/Info.plist
deleted file mode 100644
index 430ffb3aca..0000000000
--- a/samples/ControlCatalog.iOS.Legacy/Info.plist
+++ /dev/null
@@ -1,47 +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>ControlCatalog</string>
-    <key>CFBundleIdentifier</key>
-    <string>com.companyname.ControlCatalog.iOS</string>
-    <key>CFBundleShortVersionString</key>
-    <string>1.0</string>
-    <key>CFBundleVersion</key>
-    <string>1.0</string>
-    <key>LSRequiresIPhoneOS</key>
-    <true/>
-    <key>MinimumOSVersion</key>
-        <string>15.0</string>
-    <key>UIDeviceFamily</key>
-    <array>
-        <integer>1</integer><integer>2</integer>
-    </array>
-    <key>UILaunchStoryboardName</key>
-    <string>LaunchScreen</string>
-    <key>UIRequiredDeviceCapabilities</key>
-    <array>
-        <string>armv7</string>
-    </array>
-    <key>UISupportedInterfaceOrientations</key>
-    <array>
-        <string>UIInterfaceOrientationPortrait</string>
-        <string>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>XSAppIconAssets</key>
-    <string>Assets.xcassets/AppIcon.appiconset</string>
-    <key>UIStatusBarHidden</key>
-    <true/>
-    <key>UIViewControllerBasedStatusBarAppearance</key>
-    <false/>
-</dict>
-</plist>
diff --git a/samples/ControlCatalog.iOS.Legacy/Main.cs b/samples/ControlCatalog.iOS.Legacy/Main.cs
deleted file mode 100644
index 08b3831d73..0000000000
--- a/samples/ControlCatalog.iOS.Legacy/Main.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using UIKit;
-
-namespace ControlCatalog.iOS.Legacy
-{
-    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");
-        }
-    }
-}
diff --git a/samples/ControlCatalog.iOS.Legacy/Resources/LaunchScreen.xib b/samples/ControlCatalog.iOS.Legacy/Resources/LaunchScreen.xib
deleted file mode 100644
index 3a3df8b38e..0000000000
--- a/samples/ControlCatalog.iOS.Legacy/Resources/LaunchScreen.xib
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207" />
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1" />
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" />
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder" />
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480" />
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2022 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
-                    minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21" />
-                    <fontDescription key="fontDescription" type="system" pointSize="17" />
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
-                    <nil key="highlightedColor" />
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ControlCatalog.iOS.Legacy" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
-                    minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43" />
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36" />
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
-                    <nil key="highlightedColor" />
-                </label>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" />
-            <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC" />
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk" />
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l" />
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0" />
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9" />
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g" />
-            </constraints>
-            <nil key="simulatedStatusBarMetrics" />
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics" />
-            <point key="canvasLocation" x="548" y="455" />
-        </view>
-    </objects>
-</document>
diff --git a/samples/ControlCatalog.iOS/AppDelegate.cs b/samples/ControlCatalog.iOS/AppDelegate.cs
index f1c2241003..f8caffed14 100644
--- a/samples/ControlCatalog.iOS/AppDelegate.cs
+++ b/samples/ControlCatalog.iOS/AppDelegate.cs
@@ -13,6 +13,13 @@ namespace ControlCatalog
     [Register("AppDelegate")]
     public partial class AppDelegate : AvaloniaAppDelegate<App>
     {
-        
+        protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
+        {
+            return base.CustomizeAppBuilder(builder)
+                .AfterSetup(_ =>
+                {
+                    Pages.EmbedSample.Implementation = new EmbedSampleIOS();
+                });
+        }
     }
 }
diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
index 12d1d5645e..513ac44f83 100644
--- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
+++ b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
@@ -7,10 +7,10 @@
     <!-- temporal workaround for our GL interface backend -->
     <UseInterpreter>True</UseInterpreter>
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
-<!--    <RuntimeIdentifier>ios-arm64</RuntimeIdentifier>-->
+    <!--    <RuntimeIdentifier>ios-arm64</RuntimeIdentifier>-->
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj" />
     <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/ControlCatalog.iOS/EmbedSample.iOS.cs b/samples/ControlCatalog.iOS/EmbedSample.iOS.cs
new file mode 100644
index 0000000000..ad86d2b578
--- /dev/null
+++ b/samples/ControlCatalog.iOS/EmbedSample.iOS.cs
@@ -0,0 +1,38 @@
+using System;
+using Avalonia.Platform;
+using CoreGraphics;
+using Foundation;
+using UIKit;
+using WebKit;
+using Avalonia.iOS;
+using ControlCatalog.Pages;
+
+namespace ControlCatalog;
+
+public class EmbedSampleIOS : INativeDemoControl
+{
+    public IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault)
+    {
+        if (isSecond)
+        {
+            var webView = new WKWebView(CGRect.Empty, new WKWebViewConfiguration());
+            webView.LoadRequest(new NSUrlRequest(new NSUrl("https://www.apple.com/")));
+
+            return new UIViewControlHandle(webView);
+        }
+        else
+        {
+            var button = new UIButton();
+            var clickCount = 0;
+            button.SetTitle("Hello world", UIControlState.Normal);
+            button.BackgroundColor = UIColor.Blue;
+            button.AddTarget((_, _) =>
+            {
+                clickCount++;
+                button.SetTitle($"Click count {clickCount}", UIControlState.Normal);
+            }, UIControlEvent.TouchDown);
+
+            return new UIViewControlHandle(button);
+        }
+    }
+}
diff --git a/samples/ControlCatalog.iOS/Info.plist b/samples/ControlCatalog.iOS/Info.plist
index d4b91b381e..6ffe3ba662 100644
--- a/samples/ControlCatalog.iOS/Info.plist
+++ b/samples/ControlCatalog.iOS/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDisplayName</key>
 	<string>ControlCatalog.iOS</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.companyname.ControlCatalog.iOS</string>
+	<string>Avalonia.ControlCatalog</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
@@ -39,9 +39,9 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-    <key>UIStatusBarHidden</key>
-    <true/>
-    <key>UIViewControllerBasedStatusBarAppearance</key>
-    <false/>
+	<key>UIStatusBarHidden</key>
+	<true/>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>
diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index 866fb8632a..7ebb87094a 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -18,6 +18,16 @@ namespace ControlCatalog
             DataContext = new ApplicationViewModel();
         }
 
+        public static readonly StyleInclude ColorPickerFluent = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+        {
+            Source = new Uri("avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml")
+        };
+
+        public static readonly StyleInclude ColorPickerDefault = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+        {
+            Source = new Uri("avares://Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml")
+        };
+
         public static readonly StyleInclude DataGridFluent = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
         {
             Source = new Uri("avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml")
@@ -69,7 +79,8 @@ namespace ControlCatalog
         public override void Initialize()
         {
             Styles.Insert(0, Fluent);
-            Styles.Insert(1, DataGridFluent);
+            Styles.Insert(1, ColorPickerFluent);
+            Styles.Insert(2, DataGridFluent);
             AvaloniaXamlLoader.Load(this);
         }
 
diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index c0e24357ca..903c849834 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>    
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Nullable>enable</Nullable>    
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">
@@ -13,6 +14,9 @@
     <AvaloniaResource Include="Assets\*" />
     <AvaloniaResource Include="Assets\Fonts\*" />
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="Pages\NativeEmbedPage.xaml" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Assets\Fonts\SourceSansPro-Bold.ttf" />
     <EmbeddedResource Include="Assets\Fonts\SourceSansPro-BoldItalic.ttf" />
@@ -23,10 +27,25 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
     <ProjectReference Include="..\SampleControls\ControlSamples.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AvaloniaResource Update="Pages\NativeEmbedPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Pages\NativeEmbedPage.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
   <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
diff --git a/samples/ControlCatalog/Converter/MathSubtractConverter.cs b/samples/ControlCatalog/Converter/MathSubtractConverter.cs
new file mode 100644
index 0000000000..6f3c99abe8
--- /dev/null
+++ b/samples/ControlCatalog/Converter/MathSubtractConverter.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace ControlCatalog.Converter;
+
+public class MathSubtractConverter : IValueConverter
+{
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is double dv && parameter is double dp)
+        {
+            return dv - dp;
+        }
+        return double.NaN;
+    }
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
diff --git a/samples/ControlCatalog/DecoratedWindow.xaml.cs b/samples/ControlCatalog/DecoratedWindow.xaml.cs
index a1383b9107..ed30b7f491 100644
--- a/samples/ControlCatalog/DecoratedWindow.xaml.cs
+++ b/samples/ControlCatalog/DecoratedWindow.xaml.cs
@@ -15,7 +15,7 @@ namespace ControlCatalog
 
         void SetupSide(string name, StandardCursorType cursor, WindowEdge edge)
         {
-            var ctl = this.FindControl<Control>(name);
+            var ctl = this.Get<Control>(name);
             ctl.Cursor = new Cursor(cursor);
             ctl.PointerPressed += (i, e) =>
             {
@@ -26,7 +26,7 @@ namespace ControlCatalog
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
-            this.FindControl<Control>("TitleBar").PointerPressed += (i, e) =>
+            this.Get<Control>("TitleBar").PointerPressed += (i, e) =>
             {
                 PlatformImpl?.BeginMoveDrag(e);
             };
@@ -38,12 +38,12 @@ namespace ControlCatalog
             SetupSide("TopRight", StandardCursorType.TopRightCorner, WindowEdge.NorthEast);
             SetupSide("BottomLeft", StandardCursorType.BottomLeftCorner, WindowEdge.SouthWest);
             SetupSide("BottomRight", StandardCursorType.BottomRightCorner, WindowEdge.SouthEast);
-            this.FindControl<Button>("MinimizeButton").Click += delegate { this.WindowState = WindowState.Minimized; };
-            this.FindControl<Button>("MaximizeButton").Click += delegate
+            this.Get<Button>("MinimizeButton").Click += delegate { this.WindowState = WindowState.Minimized; };
+            this.Get<Button>("MaximizeButton").Click += delegate
             {
                 WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
             };
-            this.FindControl<Button>("CloseButton").Click += delegate
+            this.Get<Button>("CloseButton").Click += delegate
             {
                 Close();
             };
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index facce2aa82..d8dc3bad2d 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -2,8 +2,8 @@
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:ControlSamples;assembly=ControlSamples"
-             xmlns:pages="clr-namespace:ControlCatalog.Pages"
-             xmlns:models="clr-namespace:ControlCatalog.Models">
+             xmlns:models="clr-namespace:ControlCatalog.Models"
+             xmlns:pages="clr-namespace:ControlCatalog.Pages">
   <Grid>
     <Grid.Styles>
       <Style Selector="TextBlock.h2">
@@ -43,6 +43,9 @@
       <TabItem Header="Clipboard">
         <pages:ClipboardPage />
       </TabItem>
+      <TabItem Header="ColorPicker">
+        <pages:ColorPickerPage />
+      </TabItem>
       <TabItem Header="ComboBox">
         <pages:ComboBoxPage />
       </TabItem>
@@ -145,12 +148,18 @@
       <TabItem Header="ToolTip">
         <pages:ToolTipPage />
       </TabItem>
+      <TabItem Header="TransitioningContentControl">
+        <pages:TransitioningContentControlPage />
+      </TabItem>
       <TabItem Header="TreeView">
         <pages:TreeViewPage />
       </TabItem>
       <TabItem Header="Viewbox">
         <pages:ViewboxPage />
       </TabItem>
+      <TabItem Header="Native Embed">
+        <pages:NativeEmbedPage />
+      </TabItem>
       <TabItem Header="Window Customizations">
         <pages:WindowCustomizationsPage />
       </TabItem>
@@ -187,6 +196,14 @@
                 <WindowTransparencyLevel>Mica</WindowTransparencyLevel>
               </ComboBox.Items>
             </ComboBox>
+            <ComboBox x:Name="FlowDirection"
+                      HorizontalAlignment="Stretch"
+                      SelectedIndex="0">
+              <ComboBox.Items>
+                <FlowDirection>LeftToRight</FlowDirection>
+                <FlowDirection>RightToLeft</FlowDirection>
+              </ComboBox.Items>
+            </ComboBox>
             <ComboBox HorizontalAlignment="Stretch"
                       Items="{Binding WindowStates}"
                       SelectedItem="{Binding WindowState}" />
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index 79cf07c8d9..d675324d9f 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -18,9 +18,9 @@ namespace ControlCatalog
         {
             AvaloniaXamlLoader.Load(this);
 
-            var sideBar = this.FindControl<TabControl>("Sidebar");
+            var sideBar = this.Get<TabControl>("Sidebar");
 
-            if (AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetRuntimeInfo().IsDesktop)
+            if (AvaloniaLocator.Current?.GetService<IRuntimePlatform>()?.GetRuntimeInfo().IsDesktop == true)
             {
                 IList tabItems = ((IList)sideBar.Items);
                 tabItems.Add(new TabItem()
@@ -36,7 +36,7 @@ namespace ControlCatalog
 
             }
 
-            var themes = this.Find<ComboBox>("Themes");
+            var themes = this.Get<ComboBox>("Themes");
             themes.SelectionChanged += (sender, e) =>
             {
                 if (themes.SelectedItem is CatalogTheme theme)
@@ -49,7 +49,8 @@ namespace ControlCatalog
                             App.Fluent.Mode = FluentThemeMode.Light;
                         }
                         Application.Current.Styles[0] = App.Fluent;
-                        Application.Current.Styles[1] = App.DataGridFluent;
+                        Application.Current.Styles[1] = App.ColorPickerFluent;
+                        Application.Current.Styles[2] = App.DataGridFluent;
                     }
                     else if (theme == CatalogTheme.FluentDark)
                     {
@@ -59,24 +60,36 @@ namespace ControlCatalog
                             App.Fluent.Mode = FluentThemeMode.Dark;
                         }
                         Application.Current.Styles[0] = App.Fluent;
-                        Application.Current.Styles[1] = App.DataGridFluent;
+                        Application.Current.Styles[1] = App.ColorPickerFluent;
+                        Application.Current.Styles[2] = App.DataGridFluent;
                     }
                     else if (theme == CatalogTheme.DefaultLight)
                     {
                         App.Default.Mode = Avalonia.Themes.Default.SimpleThemeMode.Light;
                         Application.Current.Styles[0] = App.DefaultLight;
-                        Application.Current.Styles[1] = App.DataGridDefault;
+                        Application.Current.Styles[1] = App.ColorPickerDefault;
+                        Application.Current.Styles[2] = App.DataGridDefault;
                     }
                     else if (theme == CatalogTheme.DefaultDark)
                     {
                         App.Default.Mode = Avalonia.Themes.Default.SimpleThemeMode.Dark;
                         Application.Current.Styles[0] = App.DefaultDark;
-                        Application.Current.Styles[1] = App.DataGridDefault;
+                        Application.Current.Styles[1] = App.ColorPickerDefault;
+                        Application.Current.Styles[2] = App.DataGridDefault;
                     }
                 }
             };
 
-            var decorations = this.Find<ComboBox>("Decorations");
+            var flowDirections = this.Get<ComboBox>("FlowDirection");
+            flowDirections.SelectionChanged += (sender, e) =>
+            {
+                if (flowDirections.SelectedItem is FlowDirection flowDirection)
+                {
+                    this.FlowDirection = flowDirection;
+                }
+            };
+
+            var decorations = this.Get<ComboBox>("Decorations");
             decorations.SelectionChanged += (sender, e) =>
             {
                 if (VisualRoot is Window window
@@ -86,8 +99,8 @@ namespace ControlCatalog
                 }
             };
 
-            var transparencyLevels = this.Find<ComboBox>("TransparencyLevels");
-            IDisposable backgroundSetter = null, paneBackgroundSetter = null;
+            var transparencyLevels = this.Get<ComboBox>("TransparencyLevels");
+            IDisposable? backgroundSetter = null, paneBackgroundSetter = null;
             transparencyLevels.SelectionChanged += (sender, e) =>
             {
                 backgroundSetter?.Dispose();
@@ -105,7 +118,7 @@ namespace ControlCatalog
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
-            var decorations = this.Find<ComboBox>("Decorations");
+            var decorations = this.Get<ComboBox>("Decorations");
             if (VisualRoot is Window window)
                 decorations.SelectedIndex = (int)window.SystemDecorations;
         }
diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index 20591103b7..c61296ac8f 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -12,7 +12,7 @@ namespace ControlCatalog
     public class MainWindow : Window
     {
         private WindowNotificationManager _notificationArea;
-        private NativeMenu _recentMenu;
+        private NativeMenu? _recentMenu;
 
         public MainWindow()
         {
@@ -28,9 +28,7 @@ namespace ControlCatalog
             };
 
             DataContext = new MainWindowViewModel(_notificationArea);
-            _recentMenu = ((NativeMenu.GetMenu(this).Items[0] as NativeMenuItem).Menu.Items[2] as NativeMenuItem).Menu;
-
-            ExtendClientAreaChromeHints = Avalonia.Platform.ExtendClientAreaChromeHints.OSXThickTitleBar;
+            _recentMenu = ((NativeMenu.GetMenu(this)?.Items[0] as NativeMenuItem)?.Menu?.Items[2] as NativeMenuItem)?.Menu;
         }
 
         public static string MenuQuitHeader => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "Quit Avalonia" : "E_xit";
@@ -41,7 +39,7 @@ namespace ControlCatalog
 
         public void OnOpenClicked(object sender, EventArgs args)
         {
-            _recentMenu.Items.Insert(0, new NativeMenuItem("Item " + (_recentMenu.Items.Count + 1)));
+            _recentMenu?.Items.Insert(0, new NativeMenuItem("Item " + (_recentMenu.Items.Count + 1)));
         }
 
         public void OnCloseClicked(object sender, EventArgs args)
diff --git a/samples/ControlCatalog/Models/Countries.cs b/samples/ControlCatalog/Models/Countries.cs
index e138f97491..20b6a85137 100644
--- a/samples/ControlCatalog/Models/Countries.cs
+++ b/samples/ControlCatalog/Models/Countries.cs
@@ -237,7 +237,7 @@ namespace ControlCatalog.Models
             yield return new Country("Zimbabwe", "SUB-SAHARAN AFRICA", 12236805, 390580, 31.3, 0, 0, 67.69, 1900, 90.7, 26.8, 28.01, 21.84);
         }
 
-        static IReadOnlyList<Country> _all;
+        static IReadOnlyList<Country>? _all;
 
         public static IReadOnlyList<Country> All
         {
@@ -253,4 +253,4 @@ namespace ControlCatalog.Models
 
         }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/ControlCatalog/Models/GDPValueConverter.cs b/samples/ControlCatalog/Models/GDPValueConverter.cs
index 1ca3e9c8e4..cad1574e7a 100644
--- a/samples/ControlCatalog/Models/GDPValueConverter.cs
+++ b/samples/ControlCatalog/Models/GDPValueConverter.cs
@@ -14,7 +14,7 @@ namespace ControlCatalog.Models
 {
     public class GDPValueConverter : IValueConverter
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
             if (value is int gdp)
             {
@@ -29,7 +29,7 @@ namespace ControlCatalog.Models
             return value;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
             throw new NotImplementedException();
         }
diff --git a/samples/ControlCatalog/Models/Person.cs b/samples/ControlCatalog/Models/Person.cs
index cd70fa3959..2dfa02c7ed 100644
--- a/samples/ControlCatalog/Models/Person.cs
+++ b/samples/ControlCatalog/Models/Person.cs
@@ -13,8 +13,8 @@ namespace ControlCatalog.Models
 {
     public class Person : INotifyDataErrorInfo, INotifyPropertyChanged
     {
-        string _firstName;
-        string _lastName;
+        string _firstName = string.Empty;
+        string _lastName = string.Empty;
         bool _isBanned;
         private int _age;
 
@@ -76,7 +76,7 @@ namespace ControlCatalog.Models
 
         Dictionary<string, List<string>> _errorLookup = new Dictionary<string, List<string>>();
 
-        void SetError(string propertyName, string error)
+        void SetError(string propertyName, string? error)
         {
             if (string.IsNullOrEmpty(error))
             {
@@ -88,11 +88,11 @@ namespace ControlCatalog.Models
                 if (_errorLookup.TryGetValue(propertyName, out List<string> errorList))
                 {
                     errorList.Clear();
-                    errorList.Add(error);
+                    errorList.Add(error!);
                 }
                 else
                 {
-                    var errors = new List<string> { error };
+                    var errors = new List<string> { error! };
                     _errorLookup.Add(propertyName, errors);
                 }
 
@@ -102,8 +102,8 @@ namespace ControlCatalog.Models
 
         public bool HasErrors => _errorLookup.Count > 0;
 
-        public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event EventHandler<DataErrorsChangedEventArgs>? ErrorsChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         void OnErrorsChanged(string propertyName)
         {
@@ -114,7 +114,7 @@ namespace ControlCatalog.Models
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        public IEnumerable GetErrors(string propertyName)
+        public IEnumerable? GetErrors(string propertyName)
         {
             if (_errorLookup.TryGetValue(propertyName, out List<string> errorList))
                 return errorList;
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
index 574cc79a7d..7a0957b02d 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
@@ -126,13 +126,13 @@ namespace ControlCatalog.Pages
             binding.Bindings.Add(new Binding("Name"));
             binding.Bindings.Add(new Binding("Abbreviation"));
 
-            var multibindingBox = this.FindControl<AutoCompleteBox>("MultiBindingBox");
+            var multibindingBox = this.Get<AutoCompleteBox>("MultiBindingBox");
             multibindingBox.ValueMemberBinding = binding;
 
-            var asyncBox = this.FindControl<AutoCompleteBox>("AsyncBox");
+            var asyncBox = this.Get<AutoCompleteBox>("AsyncBox");
             asyncBox.AsyncPopulator = PopulateAsync;
 
-            var customAutocompleteBox = this.FindControl<AutoCompleteBox>("CustomAutocompleteBox");
+            var customAutocompleteBox = this.Get<AutoCompleteBox>("CustomAutocompleteBox");
             customAutocompleteBox.Items = Sentences.SelectMany(x => x);
             customAutocompleteBox.TextFilter = LastWordContains;
             customAutocompleteBox.TextSelector = AppendWord;
@@ -144,11 +144,12 @@ namespace ControlCatalog.Pages
                     .OfType<AutoCompleteBox>();
         }
 
-        private bool StringContains(string str, string query)
+        private bool StringContains(string str, string? query)
         {
+            if (query == null) return false;
             return str.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0;
         }
-        private async Task<IEnumerable<object>> PopulateAsync(string searchText, CancellationToken cancellationToken)
+        private async Task<IEnumerable<object>> PopulateAsync(string? searchText, CancellationToken cancellationToken)
         {
             await Task.Delay(TimeSpan.FromSeconds(1.5), cancellationToken);
 
@@ -157,14 +158,14 @@ namespace ControlCatalog.Pages
                       .ToList();
         }
 
-        private bool LastWordContains(string searchText, string item)
+        private bool LastWordContains(string? searchText, string? item)
         {
-            var words = searchText.Split(' ');
+            var words = searchText?.Split(' ') ?? Array.Empty<string>();
             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)
+                for (var j = 0; word is { } && j < options.Length; ++j)
                 {
                     var option = options[j];
                     if (option == null)
@@ -183,14 +184,18 @@ namespace ControlCatalog.Pages
 
             return options.Any(x => x != null && x.Value == item);
         }
-        private string AppendWord(string text, string item)
+        private string AppendWord(string? text, string? item)
         {
-            string[] parts = text.Split(' ');
-            if (parts.Length == 0)
-                return item;
+            if (item is { })
+            {
+                string[] parts = text?.Split(' ') ?? Array.Empty<string>();
+                if (parts.Length == 0)
+                    return item;
 
-            parts[parts.Length - 1] = item;
-            return string.Join(" ", parts);
+                parts[parts.Length - 1] = item;
+                return string.Join(" ", parts);
+            }
+            return string.Empty;
         }
 
         private void InitializeComponent()
diff --git a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
index c5042baccb..5c584b8781 100644
--- a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
@@ -23,7 +23,7 @@ namespace ControlCatalog.Pages
             var spinner = (ButtonSpinner)sender;
             var txtBox = (TextBlock)spinner.Content;
 
-            int value = Array.IndexOf(_mountains, txtBox.Text);
+            int value = Array.IndexOf(_mountains, txtBox?.Text);
             if (e.Direction == SpinDirection.Increase)
                 value++;
             else
diff --git a/samples/ControlCatalog/Pages/ButtonsPage.xaml b/samples/ControlCatalog/Pages/ButtonsPage.xaml
index 7de0872eae..059b4d9788 100644
--- a/samples/ControlCatalog/Pages/ButtonsPage.xaml
+++ b/samples/ControlCatalog/Pages/ButtonsPage.xaml
@@ -147,6 +147,35 @@
       </StackPanel>
     </Border>
 
+    <!-- DropDownButton -->
+    <Border Classes="header-border">
+      <StackPanel Orientation="Vertical"
+                  Spacing="4">
+        <TextBlock Text="DropDownButton"
+                   Classes="header" />
+        <TextBlock TextWrapping="Wrap">A button with an added drop-down chevron to visually indicate it has a flyout with additional actions.</TextBlock>
+      </StackPanel>
+    </Border>
+
+    <Border Classes="thin"
+            Padding="15">
+      <StackPanel Orientation="Vertical"
+                  Spacing="8">
+        <DropDownButton Flyout="{StaticResource SharedMenuFlyout}">
+          <TextBlock Text="Drop Down Button" />
+        </DropDownButton>
+        <DropDownButton Padding="0,0,8,0">
+          <Border Background="Teal"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  Height="32"
+                  Width="32" />
+        </DropDownButton>
+        <DropDownButton IsEnabled="False">Disabled</DropDownButton>
+        <DropDownButton />
+      </StackPanel>
+    </Border>
+
     <!-- SplitButton -->
     <Border Classes="header-border">
       <StackPanel Orientation="Vertical"
@@ -169,7 +198,8 @@
           <TextBlock Text="Disabled" />
         </SplitButton>
         <SplitButton Flyout="{StaticResource SharedMenuFlyout}"
-                     Content="Re-themed">
+                     Content="Re-themed"
+                     Foreground="White">
           <SplitButton.Styles>
             <Style>
               <Style.Resources>
diff --git a/samples/ControlCatalog/Pages/ButtonsPage.xaml.cs b/samples/ControlCatalog/Pages/ButtonsPage.xaml.cs
index 5594bab176..3e748dd6f6 100644
--- a/samples/ControlCatalog/Pages/ButtonsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ButtonsPage.xaml.cs
@@ -11,7 +11,7 @@ namespace ControlCatalog.Pages
         {
             InitializeComponent();
 
-            this.FindControl<RepeatButton>("RepeatButton").Click += OnRepeatButtonClick;
+            this.Get<RepeatButton>("RepeatButton").Click += OnRepeatButtonClick;
         }
 
         private void InitializeComponent()
@@ -22,7 +22,7 @@ namespace ControlCatalog.Pages
         public void OnRepeatButtonClick(object sender, object args)
         {
             repeatButtonClickCount++;
-            var textBlock = this.FindControl<TextBlock>("RepeatButtonTextBlock");
+            var textBlock = this.Get<TextBlock>("RepeatButtonTextBlock");
             textBlock.Text = $"Repeat Button: {repeatButtonClickCount}";
         }
     }
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
index 2fe16ba8e3..aef96802f4 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
@@ -10,8 +10,7 @@
                 Margin="0,16,0,0"
                 HorizontalAlignment="Center"
                 Spacing="16">
-      <StackPanel Orientation="Vertical"
-                  Width="200">
+      <StackPanel Orientation="Vertical">
         <TextBlock Text="SelectedDateFormat: Short"/>
         <CalendarDatePicker Name="DatePicker1"
                     SelectedDateFormat="Short"
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs
index 95bdeb363a..2cd6e547f6 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs
@@ -10,11 +10,11 @@ namespace ControlCatalog.Pages
         {
             InitializeComponent();
             
-            var dp1 = this.FindControl<CalendarDatePicker>("DatePicker1");
-            var dp2 = this.FindControl<CalendarDatePicker>("DatePicker2");
-            var dp3 = this.FindControl<CalendarDatePicker>("DatePicker3");
-            var dp4 = this.FindControl<CalendarDatePicker>("DatePicker4");
-            var dp5 = this.FindControl<CalendarDatePicker>("DatePicker5");
+            var dp1 = this.Get<CalendarDatePicker>("DatePicker1");
+            var dp2 = this.Get<CalendarDatePicker>("DatePicker2");
+            var dp3 = this.Get<CalendarDatePicker>("DatePicker3");
+            var dp4 = this.Get<CalendarDatePicker>("DatePicker4");
+            var dp5 = this.Get<CalendarDatePicker>("DatePicker5");
 
             dp1.SelectedDate = DateTime.Today;
             dp2.SelectedDate = DateTime.Today.AddDays(10);
@@ -23,7 +23,7 @@ namespace ControlCatalog.Pages
 
             dp4.TemplateApplied += (s, e) =>
             {
-                dp4.BlackoutDates.AddDatesInPast();
+                dp4.BlackoutDates?.AddDatesInPast();
             };
             
         }
diff --git a/samples/ControlCatalog/Pages/CalendarPage.xaml.cs b/samples/ControlCatalog/Pages/CalendarPage.xaml.cs
index e3e9a3444e..e0f4268016 100644
--- a/samples/ControlCatalog/Pages/CalendarPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CalendarPage.xaml.cs
@@ -11,11 +11,11 @@ namespace ControlCatalog.Pages
             this.InitializeComponent();
 
             var today = DateTime.Today; 
-            var cal1 = this.FindControl<Calendar>("DisplayDatesCalendar");
+            var cal1 = this.Get<Calendar>("DisplayDatesCalendar");
             cal1.DisplayDateStart = today.AddDays(-25);
             cal1.DisplayDateEnd = today.AddDays(25);
 
-            var cal2 = this.FindControl<Calendar>("BlackoutDatesCalendar");
+            var cal2 = this.Get<Calendar>("BlackoutDatesCalendar");
             cal2.BlackoutDates.AddDatesInPast();
             cal2.BlackoutDates.Add(new CalendarDateRange(today.AddDays(6)));
         }
diff --git a/samples/ControlCatalog/Pages/CanvasPage.xaml b/samples/ControlCatalog/Pages/CanvasPage.xaml
index 0c0d897f04..416164f391 100644
--- a/samples/ControlCatalog/Pages/CanvasPage.xaml
+++ b/samples/ControlCatalog/Pages/CanvasPage.xaml
@@ -4,7 +4,7 @@
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A panel which lays out its children by explicit coordinates</TextBlock>
     <Canvas Background="Yellow" Width="300" Height="400">
-      <Rectangle Fill="Blue" Width="63" Height="41" Canvas.Left="40" Canvas.Top="31">
+      <Rectangle Fill="Blue" Width="63" Height="41" Canvas.Left="40" Canvas.Top="31" RadiusX="10" RadiusY="10">
         <Rectangle.OpacityMask>
           <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
             <LinearGradientBrush.GradientStops>
@@ -12,8 +12,9 @@
               <GradientStop Offset="1" Color="Transparent"/>
             </LinearGradientBrush.GradientStops>
           </LinearGradientBrush>
-        </Rectangle.OpacityMask>     
+        </Rectangle.OpacityMask>
       </Rectangle>
+      <Rectangle Fill="hsva(240, 83%, 73%, 90%)" Stroke="hsl(5, 85%, 85%)" StrokeThickness="2" Width="40" Height="20" Canvas.Left="150" Canvas.Top="10" RadiusX="10" RadiusY="5" />
       <Ellipse Fill="Green" Width="58" Height="58" Canvas.Left="88" Canvas.Top="100"/>
       <Path Fill="Orange" Data="M 0,0 c 0,0 50,0 50,-50 c 0,0 50,0 50,50 h -50 v 50 l -50,-50 Z" Canvas.Left="30" Canvas.Top="250"/>
       <Path Fill="OrangeRed" Canvas.Left="180" Canvas.Top="250">
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml b/samples/ControlCatalog/Pages/CarouselPage.xaml
index 4a53c9026f..1c2d768966 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml
@@ -29,6 +29,7 @@
         <ComboBoxItem>None</ComboBoxItem>
         <ComboBoxItem>Slide</ComboBoxItem>
         <ComboBoxItem>Crossfade</ComboBoxItem>
+        <ComboBoxItem>3D Rotation</ComboBoxItem>
       </ComboBox>
     </StackPanel>
 
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
index 66180d4ccb..5b74e3e19e 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
@@ -16,6 +16,11 @@ namespace ControlCatalog.Pages
         public CarouselPage()
         {
             this.InitializeComponent();
+            _carousel = this.Get<Carousel>("carousel");
+            _left = this.Get<Button>("left");
+            _right = this.Get<Button>("right");
+            _transition = this.Get<ComboBox>("transition");
+            _orientation = this.Get<ComboBox>("orientation");
             _left.Click += (s, e) => _carousel.Previous();
             _right.Click += (s, e) => _carousel.Next();
             _transition.SelectionChanged += TransitionChanged;
@@ -25,11 +30,7 @@ namespace ControlCatalog.Pages
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
-            _carousel = this.FindControl<Carousel>("carousel");
-            _left = this.FindControl<Button>("left");
-            _right = this.FindControl<Button>("right");
-            _transition = this.FindControl<ComboBox>("transition");
-            _orientation = this.FindControl<ComboBox>("orientation");
+
         }
 
         private void TransitionChanged(object sender, SelectionChangedEventArgs e)
@@ -45,6 +46,9 @@ namespace ControlCatalog.Pages
                 case 2:
                     _carousel.PageTransition = new CrossFade(TimeSpan.FromSeconds(0.25));
                     break;
+                case 3:
+                    _carousel.PageTransition = new Rotate3DTransition(TimeSpan.FromSeconds(0.5), _orientation.SelectedIndex == 0 ? PageSlide.SlideAxis.Horizontal : PageSlide.SlideAxis.Vertical);
+                    break;
             }
         }
     }
diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
new file mode 100644
index 0000000000..c0c83d6a35
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
@@ -0,0 +1,79 @@
+<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:primitives="clr-namespace:Avalonia.Controls.Primitives;assembly=Avalonia.Controls"
+             xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
+             mc:Ignorable="d"
+             d:DesignWidth="800"
+             d:DesignHeight="450"
+             x:Class="ControlCatalog.Pages.ColorPickerPage">
+
+  <UserControl.Resources>
+    <pc:ThirdComponentConverter x:Key="ThirdComponent" />
+  </UserControl.Resources>
+
+  <Grid ColumnDefinitions="Auto,10,Auto">
+    <Grid Grid.Column="0"
+          Grid.Row="0"
+          RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
+      <ColorSpectrum x:Name="ColorSpectrum1"
+                     Grid.Row="0"
+                     Color="Red"
+                     CornerRadius="10"
+                     Height="256"
+                     Width="256" />
+      <ColorSlider Grid.Row="1"
+                   Margin="0,10,0,0"
+                   ColorComponent="Component1"
+                   ColorModel="Hsva"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+      <ColorSlider Grid.Row="2"
+                   ColorComponent="Component2"
+                   ColorModel="Hsva"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+      <ColorSlider Grid.Row="3"
+                   ColorComponent="Component3"
+                   ColorModel="Hsva"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+      <ColorSlider Grid.Row="4"
+                   ColorComponent="Alpha"
+                   ColorModel="Hsva"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+      <ColorPreviewer Grid.Row="5"
+                      ShowAccentColors="True"
+                      HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+    </Grid>
+    <Grid Grid.Column="2"
+          Grid.Row="0"
+          ColumnDefinitions="Auto,Auto,Auto"
+          RowDefinitions="Auto,Auto">
+      <ColorSlider Grid.Column="0"
+                   Grid.Row="0"
+                   IsAlphaMaxForced="True"
+                   IsSaturationValueMaxForced="False"
+                   ColorComponent="{Binding Components, ElementName=ColorSpectrum2, Converter={StaticResource ThirdComponent}}"
+                   ColorModel="Hsva"
+                   Orientation="Vertical"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum2}" />
+      <ColorSpectrum x:Name="ColorSpectrum2"
+                     Grid.Column="1"
+                     Grid.Row="0"
+                     Color="Green"
+                     Shape="Ring"
+                     Height="256"
+                     Width="256" />
+      <ColorSlider Grid.Column="2"
+                   Grid.Row="0"
+                   ColorComponent="Alpha"
+                   ColorModel="Hsva"
+                   Orientation="Vertical"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum2}" />
+      <ColorPreviewer Grid.Column="0"
+                      Grid.ColumnSpan="3"
+                      Grid.Row="1"
+                      ShowAccentColors="True"
+                      HsvColor="{Binding HsvColor, ElementName=ColorSpectrum2}" />
+    </Grid>
+  </Grid>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs b/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
new file mode 100644
index 0000000000..6e017e381f
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public partial class ColorPickerPage : UserControl
+    {
+        public ColorPickerPage()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/ComboBoxPage.xaml b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
index 64e80a8e11..9f2fbb88f3 100644
--- a/samples/ControlCatalog/Pages/ComboBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
@@ -86,6 +86,16 @@
                         <sys:Exception />
                     </DataValidationErrors.Error>
                 </ComboBox>
+
+                <ComboBox PlaceholderText="Scaled" Width="166" RenderTransformOrigin="0,0">
+                    <ComboBox.RenderTransform>
+                      <ScaleTransform ScaleX="1.5" ScaleY="1.5"/>
+                    </ComboBox.RenderTransform>
+                    <ComboBoxItem>Inline Items</ComboBoxItem>
+                    <ComboBoxItem>Inline Item 2</ComboBoxItem>
+                    <ComboBoxItem>Inline Item 3</ComboBoxItem>
+                    <ComboBoxItem>Inline Item 4</ComboBoxItem>
+                </ComboBox>
             </WrapPanel>
 
             <CheckBox IsChecked="{Binding WrapSelection}">WrapSelection</CheckBox>
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
index 10f9ee1de8..4d72fc5311 100644
--- a/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
@@ -18,29 +18,29 @@ namespace ControlCatalog.Pages
 
             DataContext = new ContextPageViewModel();
 
-            _textBox = this.FindControl<TextBox>("TextBox");
+            _textBox = this.Get<TextBox>("TextBox");
 
-            var cutButton = this.FindControl<Button>("CutButton");
+            var cutButton = this.Get<Button>("CutButton");
             cutButton.Click += CloseFlyout;
 
-            var copyButton = this.FindControl<Button>("CopyButton");
+            var copyButton = this.Get<Button>("CopyButton");
             copyButton.Click += CloseFlyout;
 
-            var pasteButton = this.FindControl<Button>("PasteButton");
+            var pasteButton = this.Get<Button>("PasteButton");
             pasteButton.Click += CloseFlyout;
 
-            var clearButton = this.FindControl<Button>("ClearButton");
+            var clearButton = this.Get<Button>("ClearButton");
             clearButton.Click += CloseFlyout;
 
-            var customContextRequestedBorder = this.FindControl<Border>("CustomContextRequestedBorder");
+            var customContextRequestedBorder = this.Get<Border>("CustomContextRequestedBorder");
             customContextRequestedBorder.AddHandler(ContextRequestedEvent, CustomContextRequested, RoutingStrategies.Tunnel);
 
-            var cancellableContextBorder = this.FindControl<Border>("CancellableContextBorder");
+            var cancellableContextBorder = this.Get<Border>("CancellableContextBorder");
             cancellableContextBorder.ContextFlyout!.Closing += ContextFlyoutPage_Closing;
             cancellableContextBorder.ContextFlyout!.Opening += ContextFlyoutPage_Opening;
         }
 
-        private ContextPageViewModel _model;
+        private ContextPageViewModel? _model;
         protected override void OnDataContextChanged(EventArgs e)
         {
             if (_model != null)
@@ -55,7 +55,7 @@ namespace ControlCatalog.Pages
         private void ContextFlyoutPage_Closing(object sender, CancelEventArgs e)
         {
             var cancelCloseCheckBox = this.FindControl<CheckBox>("CancelCloseCheckBox");
-            e.Cancel = cancelCloseCheckBox.IsChecked ?? false;
+            e.Cancel = cancelCloseCheckBox?.IsChecked ?? false;
         }
 
         private void ContextFlyoutPage_Opening(object sender, EventArgs e)
@@ -63,13 +63,13 @@ namespace ControlCatalog.Pages
             if (e is CancelEventArgs cancelArgs)
             {
                 var cancelCloseCheckBox = this.FindControl<CheckBox>("CancelOpenCheckBox");
-                cancelArgs.Cancel = cancelCloseCheckBox.IsChecked ?? false;
+                cancelArgs.Cancel = cancelCloseCheckBox?.IsChecked ?? false;
             }
         }
 
         private void CloseFlyout(object sender, RoutedEventArgs e)
         {
-            _textBox.ContextFlyout.Hide();
+            _textBox.ContextFlyout?.Hide();
         }
 
         public void CustomContextRequested(object sender, ContextRequestedEventArgs e)
diff --git a/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs b/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs
index da016e9a75..4581642024 100644
--- a/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs
@@ -15,15 +15,15 @@ namespace ControlCatalog.Pages
             this.InitializeComponent();
             DataContext = new ContextPageViewModel();
 
-            var customContextRequestedBorder = this.FindControl<Border>("CustomContextRequestedBorder");
+            var customContextRequestedBorder = this.Get<Border>("CustomContextRequestedBorder");
             customContextRequestedBorder.AddHandler(ContextRequestedEvent, CustomContextRequested, RoutingStrategies.Tunnel);
 
-            var cancellableContextBorder = this.FindControl<Border>("CancellableContextBorder");
+            var cancellableContextBorder = this.Get<Border>("CancellableContextBorder");
             cancellableContextBorder.ContextMenu!.ContextMenuClosing += ContextFlyoutPage_Closing;
             cancellableContextBorder.ContextMenu!.ContextMenuOpening += ContextFlyoutPage_Opening;
         }
 
-        private ContextPageViewModel _model;
+        private ContextPageViewModel? _model;
         protected override void OnDataContextChanged(EventArgs e)
         {
             if (_model != null)
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml b/samples/ControlCatalog/Pages/DataGridPage.xaml
index f7e3cf2441..31b4039d33 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml
@@ -13,9 +13,22 @@
   </UserControl.Resources>
   <UserControl.Styles>
     <Style Selector="DataGridCell.gdp">
-      <Setter Property="FontWeight" Value="Bold" />
       <Setter Property="Background" Value="{Binding Path=GDP, Mode=OneWay, Converter={StaticResource GDPConverter}}" />
     </Style>
+    <Style Selector="DataGridColumnHeader:nth-last-child(1)">
+      <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+    <Style Selector="DataGridCell:nth-last-child(1)">
+      <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+    <Style Selector="DataGrid#dataGridGrouping DataGridRow:nth-child(5n+3)">
+      <Setter Property="Foreground" Value="Red" />
+      <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+    <Style Selector="DataGrid#dataGridGrouping DataGridRow:nth-last-child(5n+1)">
+      <Setter Property="Foreground" Value="Blue" />
+      <Setter Property="FontWeight" Value="Bold" />
+    </Style>
   </UserControl.Styles>
   <Grid RowDefinitions="Auto,Auto,*">
     <StackPanel Orientation="Vertical" Spacing="4" Grid.Row="0">
@@ -31,7 +44,9 @@
         <DockPanel>
           <CheckBox x:Name="ShowGDP"  IsChecked="True"  Content="Toggle GDP Column Visibility"
                     DockPanel.Dock="Top"/>
-          <DataGrid Name="dataGrid1" Margin="12" CanUserResizeColumns="True" CanUserReorderColumns="True" CanUserSortColumns="True" HeadersVisibility="All">
+          <DataGrid Name="dataGrid1" Margin="12" CanUserResizeColumns="True" CanUserReorderColumns="True" CanUserSortColumns="True" HeadersVisibility="All"
+                    RowBackground="#1000"
+                    AlternatingRowBackground="#1fff">
             <DataGrid.Columns>
               <!-- Using HeaderTemplate -->
               <DataGridTextColumn Header="Country" HeaderTemplate="{StaticResource Demo.DataTemplates.CountryHeader}" Binding="{Binding Name}" Width="6*" />
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml.cs b/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
index c010d38eac..219b7aeac4 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
@@ -21,7 +21,7 @@ namespace ControlCatalog.Pages
             var dataGridSortDescription = DataGridSortDescription.FromPath(nameof(Country.Region), ListSortDirection.Ascending, new ReversedStringComparer());
             var collectionView1 = new DataGridCollectionView(Countries.All);
             collectionView1.SortDescriptions.Add(dataGridSortDescription);
-            var dg1 = this.FindControl<DataGrid>("dataGrid1");
+            var dg1 = this.Get<DataGrid>("dataGrid1");
             dg1.IsReadOnly = true;
             dg1.LoadingRow += Dg1_LoadingRow;
             dg1.Sorting += (s, a) =>
@@ -37,7 +37,7 @@ namespace ControlCatalog.Pages
             };
             dg1.Items = collectionView1;
 
-            var dg2 = this.FindControl<DataGrid>("dataGridGrouping");
+            var dg2 = this.Get<DataGrid>("dataGridGrouping");
             dg2.IsReadOnly = true;
 
             var collectionView2 = new DataGridCollectionView(Countries.All);
@@ -45,7 +45,7 @@ namespace ControlCatalog.Pages
 
             dg2.Items = collectionView2;
 
-            var dg3 = this.FindControl<DataGrid>("dataGridEdit");
+            var dg3 = this.Get<DataGrid>("dataGridEdit");
             dg3.IsReadOnly = false;
 
             var items = new List<Person>
@@ -58,7 +58,7 @@ namespace ControlCatalog.Pages
 
             dg3.Items = collectionView3;
 
-            var addButton = this.FindControl<Button>("btnAdd");
+            var addButton = this.Get<Button>("btnAdd");
             addButton.Click += (a, b) => collectionView3.AddNew();
         }
 
diff --git a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs
index 6c7ae3437e..11f504f4db 100644
--- a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs
@@ -9,12 +9,12 @@ namespace ControlCatalog.Pages
         public DateTimePickerPage()
         {
             this.InitializeComponent();
-            this.FindControl<TextBlock>("DatePickerDesc").Text = "Use a DatePicker to let users set a date in your app, " +
+            this.Get<TextBlock>("DatePickerDesc").Text = "Use a DatePicker to let users set a date in your app, " +
                 "for example to schedule an appointment. The DatePicker displays three controls for month, day, and year. " +
                 "These controls are easy to use with touch or mouse, and they can be styled and configured in several different ways. " +
                 "Order of month, day, and year is dynamically set based on user date settings";
 
-            this.FindControl<TextBlock>("TimePickerDesc").Text = "Use a TimePicker to let users set a time in your app, for example " +
+            this.Get<TextBlock>("TimePickerDesc").Text = "Use a TimePicker to let users set a time in your app, for example " +
                 "to set a reminder. The TimePicker displays three controls for hour, minute, and AM / PM(if necessary).These controls " +
                 "are easy to use with touch or mouse, and they can be styled and configured in several different ways. " +
                 "12 - hour or 24 - hour clock and visiblility of AM / PM is dynamically set based on user time settings, or can be overridden.";
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml b/samples/ControlCatalog/Pages/DialogsPage.xaml
index 6ac9dcfe22..8a835867b3 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml
@@ -20,7 +20,7 @@
                  Text="Window dialogs" />
       <Button Name="DecoratedWindow">Decorated _window</Button>
       <Button Name="DecoratedWindowDialog">Decorated w_indow (dialog)</Button>
-      <Button Name="Dialog">_Dialog</Button>
+      <Button Name="Dialog" ToolTip.Tip="Shows a dialog">_Dialog</Button>
       <Button Name="DialogNoTaskbar">Dialog (_No taskbar icon)</Button>
       <Button Name="OwnedWindow">Own_ed window</Button>
       <Button Name="OwnedWindowNoTaskbar">Owned window (No tas_kbar icon)</Button>
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
index e96b7aff08..efa30c2741 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -8,7 +8,6 @@ using Avalonia.Dialogs;
 using Avalonia.Layout;
 using Avalonia.Markup.Xaml;
 #pragma warning disable 4014
-
 namespace ControlCatalog.Pages
 {
     public class DialogsPage : UserControl
@@ -17,14 +16,14 @@ namespace ControlCatalog.Pages
         {
             this.InitializeComponent();
 
-            var results = this.FindControl<ItemsPresenter>("PickerLastResults");
-            var resultsVisible = this.FindControl<TextBlock>("PickerLastResultsVisible");
+            var results = this.Get<ItemsPresenter>("PickerLastResults");
+            var resultsVisible = this.Get<TextBlock>("PickerLastResultsVisible");
 
-            string lastSelectedDirectory = null;
+            string? lastSelectedDirectory = null;
 
-            List<FileDialogFilter> GetFilters()
+            List<FileDialogFilter>? GetFilters()
             {
-                if (this.FindControl<CheckBox>("UseFilters").IsChecked != true)
+                if (this.Get<CheckBox>("UseFilters").IsChecked != true)
                     return null;
                 return  new List<FileDialogFilter>
                 {
@@ -40,20 +39,24 @@ namespace ControlCatalog.Pages
                 };
             }
 
-            this.FindControl<Button>("OpenFile").Click += async delegate
+            this.Get<Button>("OpenFile").Click += async delegate
             {
+                // Almost guaranteed to exist
+                var fullPath = Assembly.GetEntryAssembly()?.GetModules().FirstOrDefault()?.FullyQualifiedName;
+                var initialFileName = fullPath == null ? null : System.IO.Path.GetFileName(fullPath);
+                var initialDirectory = fullPath == null ? null : System.IO.Path.GetDirectoryName(fullPath);
+
                 var result = await new OpenFileDialog()
                 {
                     Title = "Open file",
                     Filters = GetFilters(),
-                    Directory = lastSelectedDirectory,
-                    // Almost guaranteed to exist
-                    InitialFileName = Assembly.GetEntryAssembly()?.GetModules().FirstOrDefault()?.FullyQualifiedName
+                    Directory = initialDirectory,
+                    InitialFileName = initialFileName
                 }.ShowAsync(GetWindow());
                 results.Items = result;
                 resultsVisible.IsVisible = result?.Any() == true;
             };
-            this.FindControl<Button>("OpenMultipleFiles").Click += async delegate
+            this.Get<Button>("OpenMultipleFiles").Click += async delegate
             {
                 var result = await new OpenFileDialog()
                 {
@@ -65,7 +68,7 @@ namespace ControlCatalog.Pages
                 results.Items = result;
                 resultsVisible.IsVisible = result?.Any() == true;
             };
-            this.FindControl<Button>("SaveFile").Click += async delegate
+            this.Get<Button>("SaveFile").Click += async delegate
             {
                 var result = await new SaveFileDialog()
                 {
@@ -77,18 +80,23 @@ namespace ControlCatalog.Pages
                 results.Items = new[] { result };
                 resultsVisible.IsVisible = result != null;
             };
-            this.FindControl<Button>("SelectFolder").Click += async delegate
+            this.Get<Button>("SelectFolder").Click += async delegate
             {
                 var result = await new OpenFolderDialog()
                 {
                     Title = "Select folder",
                     Directory = lastSelectedDirectory,
                 }.ShowAsync(GetWindow());
-                lastSelectedDirectory = result;
+
+                if (!string.IsNullOrEmpty(result))
+                {
+                    lastSelectedDirectory = result;
+                }
+
                 results.Items = new [] { result };
                 resultsVisible.IsVisible = result != null;
             };
-            this.FindControl<Button>("OpenBoth").Click += async delegate
+            this.Get<Button>("OpenBoth").Click += async delegate
             {
                 var result = await new OpenFileDialog()
                 {
@@ -102,35 +110,35 @@ namespace ControlCatalog.Pages
                 results.Items = result;
                 resultsVisible.IsVisible = result?.Any() == true;
             };
-            this.FindControl<Button>("DecoratedWindow").Click += delegate
+            this.Get<Button>("DecoratedWindow").Click += delegate
             {
                 new DecoratedWindow().Show();
             };
-            this.FindControl<Button>("DecoratedWindowDialog").Click += delegate
+            this.Get<Button>("DecoratedWindowDialog").Click += delegate
             {
                 new DecoratedWindow().ShowDialog(GetWindow());
             };
-            this.FindControl<Button>("Dialog").Click += delegate
+            this.Get<Button>("Dialog").Click += delegate
             {
                 var window = CreateSampleWindow();
                 window.Height = 200;
                 window.ShowDialog(GetWindow());
             };
-            this.FindControl<Button>("DialogNoTaskbar").Click += delegate
+            this.Get<Button>("DialogNoTaskbar").Click += delegate
             {
                 var window = CreateSampleWindow();
                 window.Height = 200;
                 window.ShowInTaskbar = false;
                 window.ShowDialog(GetWindow());
             };
-            this.FindControl<Button>("OwnedWindow").Click += delegate
+            this.Get<Button>("OwnedWindow").Click += delegate
             {
                 var window = CreateSampleWindow();
 
                 window.Show(GetWindow());
             };
 
-            this.FindControl<Button>("OwnedWindowNoTaskbar").Click += delegate
+            this.Get<Button>("OwnedWindowNoTaskbar").Click += delegate
             {
                 var window = CreateSampleWindow();
 
@@ -143,6 +151,7 @@ namespace ControlCatalog.Pages
         private Window CreateSampleWindow()
         {
             Button button;
+            Button dialogButton;
             
             var window = new Window
             {
@@ -157,7 +166,14 @@ namespace ControlCatalog.Pages
                         (button = new Button
                         {
                             HorizontalAlignment = HorizontalAlignment.Center,
-                            Content = "Click to close"
+                            Content = "Click to close",
+                            IsDefault = true
+                        }),
+                        (dialogButton = new Button
+                        {
+                            HorizontalAlignment = HorizontalAlignment.Center,
+                            Content = "Dialog",
+                            IsDefault = false
                         })
                     }
                 },
@@ -165,11 +181,17 @@ namespace ControlCatalog.Pages
             };
 
             button.Click += (_, __) => window.Close();
+            dialogButton.Click += (_, __) =>
+            {
+                var dialog = CreateSampleWindow();
+                dialog.Height = 200;
+                dialog.ShowDialog(window);
+            };
 
             return window;
         }
 
-        Window GetWindow() => (Window)this.VisualRoot;
+        Window GetWindow() => this.VisualRoot as Window  ?? throw new NullReferenceException("Invalid Owner");
 
         private void InitializeComponent()
         {
diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
index 5373fc55b4..f1f448d86e 100644
--- a/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
@@ -14,7 +14,7 @@ namespace ControlCatalog.Pages
         public DragAndDropPage()
         {
             this.InitializeComponent();
-            _DropState = this.Find<TextBlock>("DropState");
+            _DropState = this.Get<TextBlock>("DropState");
 
             int textCount = 0;
             SetupDnd("Text", d => d.Set(DataFormats.Text,
@@ -26,8 +26,8 @@ namespace ControlCatalog.Pages
 
         void SetupDnd(string suffix, Action<DataObject> factory, DragDropEffects effects)
         {
-            var dragMe = this.Find<Border>("DragMe" + suffix);
-            var dragState = this.Find<TextBlock>("DragState"+suffix);
+            var dragMe = this.Get<Border>("DragMe" + suffix);
+            var dragState = this.Get<TextBlock>("DragState"+suffix);
 
             async void DoDrag(object sender, Avalonia.Input.PointerPressedEventArgs e)
             {
diff --git a/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs b/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
index 0803d178b9..ec1b212a8b 100644
--- a/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
@@ -35,7 +35,7 @@ namespace ControlCatalog.Pages
 
         private void SetXamlTexts()
         {
-            var bfxt = this.FindControl<TextBlock>("ButtonFlyoutXamlText");
+            var bfxt = this.Get<TextBlock>("ButtonFlyoutXamlText");
             bfxt.Text = "<Button Content=\"Click me!\">\n" +
                         "    <Button.Flyout>\n" +
                         "        <Flyout>\n" +
@@ -45,7 +45,7 @@ namespace ControlCatalog.Pages
                         "        </Flyout>\n" +
                         "    </Button.Flyout>\n</Button>";
 
-            var mfxt = this.FindControl<TextBlock>("MenuFlyoutXamlText");
+            var mfxt = this.Get<TextBlock>("MenuFlyoutXamlText");
             mfxt.Text = "<Button Content=\"Click me!\">\n" +
                     "    <Button.Flyout>\n" +
                     "        <MenuFlyout>\n" +
@@ -54,7 +54,7 @@ namespace ControlCatalog.Pages
                     "        </MenuFlyout>\n" +
                     "    </Button.Flyout>\n</Button>";
 
-            var afxt = this.FindControl<TextBlock>("AttachedFlyoutXamlText");
+            var afxt = this.Get<TextBlock>("AttachedFlyoutXamlText");
             afxt.Text = "<Panel Name=\"AttachedFlyoutPanel\">\n" +
                 "    <FlyoutBase.AttachedFlyout>\n" +
                 "        <Flyout>\n" +
@@ -66,7 +66,7 @@ namespace ControlCatalog.Pages
                 "\n\n In DoubleTapped handler:\n" +
                 "FlyoutBase.ShowAttachedFlyout(AttachedFlyoutPanel);";
 
-            var sfxt = this.FindControl<TextBlock>("SharedFlyoutXamlText");
+            var sfxt = this.Get<TextBlock>("SharedFlyoutXamlText");
             sfxt.Text = "Declare a flyout in Resources:\n" +
                 "<Window.Resources>\n" +
                 "    <Flyout x:Key=\"SharedFlyout\">\n" +
diff --git a/samples/ControlCatalog/Pages/ImagePage.xaml.cs b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
index d8f4d6d5a2..45043aa5af 100644
--- a/samples/ControlCatalog/Pages/ImagePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
@@ -17,9 +17,9 @@ namespace ControlCatalog.Pages
         public ImagePage()
         {
             InitializeComponent();
-            _bitmapImage = this.FindControl<Image>("bitmapImage");
-            _drawingImage = this.FindControl<Image>("drawingImage");
-            _croppedImage = this.FindControl<Image>("croppedImage");
+            _bitmapImage = this.Get<Image>("bitmapImage");
+            _drawingImage = this.Get<Image>("drawingImage");
+            _croppedImage = this.Get<Image>("croppedImage");
         }
 
         private void InitializeComponent()
@@ -50,8 +50,11 @@ namespace ControlCatalog.Pages
             if (_croppedImage != null)
             {
                 var comboxBox = (ComboBox)sender;
-                var croppedBitmap = _croppedImage.Source as CroppedBitmap;
-                croppedBitmap.SourceRect = GetCropRect(comboxBox.SelectedIndex);
+                if (_croppedImage.Source is CroppedBitmap croppedBitmap)
+                {
+                    croppedBitmap.SourceRect = GetCropRect(comboxBox.SelectedIndex);
+                }
+                
             }
         }
 
diff --git a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml
index 8305d72d1f..1d42b92096 100644
--- a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml
+++ b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml
@@ -53,10 +53,12 @@
         <ComboBoxItem>UniformGrid - Horizontal</ComboBoxItem>
       </ComboBox>
       <Button Command="{Binding AddItem}">Add Item</Button>
+      <Button Command="{Binding RemoveItem}">Remove Item</Button>
       <Button Command="{Binding RandomizeHeights}">Randomize Heights</Button>
       <Button Command="{Binding ResetItems}">Reset items</Button>
       <Button x:Name="scrollToLast">Scroll to Last</Button>
       <Button x:Name="scrollToRandom">Scroll to Random</Button>
+      <Button x:Name="scrollToSelected">Scroll to Selected</Button>
     </StackPanel>
     <Border BorderThickness="1" BorderBrush="{DynamicResource SystemControlHighlightBaseMediumLowBrush}" Margin="0 0 0 16">
       <ScrollViewer Name="scroller"
diff --git a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs
index 6f0f8fcde0..70c7b1acb0 100644
--- a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs
@@ -15,21 +15,25 @@ namespace ControlCatalog.Pages
         private readonly ItemsRepeaterPageViewModel _viewModel;
         private ItemsRepeater _repeater;
         private ScrollViewer _scroller;
+        private int _selectedIndex;
         private Button _scrollToLast;
         private Button _scrollToRandom;
+        private Button _scrollToSelected;
         private Random _random = new Random(0);
 
         public ItemsRepeaterPage()
         {
             this.InitializeComponent();
-            _repeater = this.FindControl<ItemsRepeater>("repeater");
-            _scroller = this.FindControl<ScrollViewer>("scroller");
-            _scrollToLast = this.FindControl<Button>("scrollToLast");
-            _scrollToRandom = this.FindControl<Button>("scrollToRandom");
+            _repeater = this.Get<ItemsRepeater>("repeater");
+            _scroller = this.Get<ScrollViewer>("scroller");
+            _scrollToLast = this.Get<Button>("scrollToLast");
+            _scrollToRandom = this.Get<Button>("scrollToRandom");
+            _scrollToSelected = this.Get<Button>("scrollToSelected");
             _repeater.PointerPressed += RepeaterClick;
             _repeater.KeyDown += RepeaterOnKeyDown;
             _scrollToLast.Click += scrollToLast_Click;
             _scrollToRandom.Click += scrollToRandom_Click;
+            _scrollToSelected.Click += scrollToSelected_Click;
             DataContext = _viewModel = new ItemsRepeaterPageViewModel();
         }
 
@@ -40,8 +44,10 @@ namespace ControlCatalog.Pages
 
         public void OnSelectTemplateKey(object sender, SelectTemplateEventArgs e)
         {
-            var item = (ItemsRepeaterPageViewModel.Item)e.DataContext;
-            e.TemplateKey = (item.Index % 2 == 0) ? "even" : "odd";
+            if (e.DataContext is ItemsRepeaterPageViewModel.Item item)
+            {
+                e.TemplateKey = (item.Index % 2 == 0) ? "even" : "odd";
+            }
         }
 
         private void LayoutChanged(object sender, SelectionChangedEventArgs e)
@@ -111,7 +117,7 @@ namespace ControlCatalog.Pages
         private void ScrollTo(int index)
         {
             System.Diagnostics.Debug.WriteLine("Scroll to " + index);
-            var layoutManager = ((TopLevel)VisualRoot).LayoutManager;
+            var layoutManager = ((TopLevel)VisualRoot!).LayoutManager;
             var element = _repeater.GetOrCreateElement(index);
             layoutManager.ExecuteLayoutPass();
             element.BringIntoView();
@@ -119,8 +125,11 @@ namespace ControlCatalog.Pages
 
         private void RepeaterClick(object sender, PointerPressedEventArgs e)
         {
-            var item = (e.Source as TextBlock)?.DataContext as ItemsRepeaterPageViewModel.Item;
-            _viewModel.SelectedItem = item;
+            if ((e.Source as TextBlock)?.DataContext is ItemsRepeaterPageViewModel.Item item)
+            {
+                _viewModel.SelectedItem = item;
+                _selectedIndex = _viewModel.Items.IndexOf(item);
+            }
         }
 
         private void RepeaterOnKeyDown(object sender, KeyEventArgs e)
@@ -140,5 +149,10 @@ namespace ControlCatalog.Pages
         {
             ScrollTo(_random.Next(_viewModel.Items.Count - 1));
         }
+
+        private void scrollToSelected_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            ScrollTo(_selectedIndex);
+        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/LabelsPage.axaml.cs b/samples/ControlCatalog/Pages/LabelsPage.axaml.cs
index a14978fd2c..f05e5fd033 100644
--- a/samples/ControlCatalog/Pages/LabelsPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/LabelsPage.axaml.cs
@@ -7,7 +7,7 @@ namespace ControlCatalog.Pages
 {
     public class LabelsPage : UserControl
     {
-        private Person _person;
+        private Person? _person;
 
         public LabelsPage()
         {
diff --git a/samples/ControlCatalog/Pages/MenuPage.xaml.cs b/samples/ControlCatalog/Pages/MenuPage.xaml.cs
index 5999510b6c..52c122f2bc 100644
--- a/samples/ControlCatalog/Pages/MenuPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/MenuPage.xaml.cs
@@ -22,7 +22,7 @@ namespace ControlCatalog.Pages
             AvaloniaXamlLoader.Load(this);
         }
         
-        private MenuPageViewModel _model;
+        private MenuPageViewModel? _model;
         protected override void OnDataContextChanged(EventArgs e)
         {
             if (_model != null)
diff --git a/samples/ControlCatalog/Pages/NativeEmbedPage.xaml b/samples/ControlCatalog/Pages/NativeEmbedPage.xaml
new file mode 100644
index 0000000000..89e636112c
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NativeEmbedPage.xaml
@@ -0,0 +1,68 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:local="using:ControlCatalog.Pages"
+             d:DesignHeight="800"
+             d:DesignWidth="400"
+             x:Class="ControlCatalog.Pages.NativeEmbedPage">
+  <DockPanel>
+    <Menu DockPanel.Dock="Top">
+      <MenuItem Header="Test">
+        <MenuItem Header="SubMenu">
+          <MenuItem Header="Item 1"/>
+          <MenuItem Header="Item 2"/>
+          <MenuItem Header="Item 3"/>
+        </MenuItem>
+        <MenuItem Header="Item 1"/>
+        <MenuItem Header="Item 2"/>
+        <MenuItem Header="Item 3"/>
+      </MenuItem>
+    </Menu>
+    <DockPanel DockPanel.Dock="Top">
+      <Button DockPanel.Dock="Right" Click="ShowPopupDelay">Show popup (delay)</Button>
+      <Button DockPanel.Dock="Right" Click="ShowPopup">Show popup</Button>
+      <Border DockPanel.Dock="Right" Background="#c0c0c0">
+        <ToolTip.Tip>
+          <ToolTip>
+            <TextBlock>Text</TextBlock>
+          </ToolTip>
+        </ToolTip.Tip>
+        <TextBlock VerticalAlignment="Center">Tooltip</TextBlock>
+      </Border>
+      <TextBox Text="Lorem ipsum dolor sit amet"/>
+
+    </DockPanel>
+    <Grid ColumnDefinitions="*,5,*"
+          RowDefinitions="*,5,*">
+      <Grid.Styles>
+        <Style Selector="DockPanel#FirstPanel:not(.mobile), DockPanel#SecondPanel:not(.mobile)">
+          <Setter Property="Grid.RowSpan" Value="3" />
+        </Style>
+        <Style Selector="DockPanel#SecondPanel:not(.mobile)">
+          <Setter Property="Grid.Column" Value="2" />
+        </Style>
+
+        <Style Selector="DockPanel#FirstPanel.mobile, DockPanel#SecondPanel.mobile">
+          <Setter Property="Grid.ColumnSpan" Value="3" />
+        </Style>
+        <Style Selector="DockPanel#SecondPanel.mobile">
+          <Setter Property="Grid.Row" Value="2" />
+        </Style>
+      </Grid.Styles>
+
+      <DockPanel x:Name="FirstPanel">
+        <CheckBox x:Name="firstVisible" DockPanel.Dock="Top"
+                  IsChecked="True" Content="Visible" />
+        <local:EmbedSample IsVisible="{Binding #firstVisible.IsChecked}"/>
+      </DockPanel>
+      <GridSplitter Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" Width="5" HorizontalAlignment="Stretch" />
+      <GridSplitter Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="1" Height="5" VerticalAlignment="Stretch" />
+      <DockPanel x:Name="SecondPanel">
+        <CheckBox x:Name="secondVisible" DockPanel.Dock="Top"
+                  IsChecked="True" Content="Visible" />
+        <local:EmbedSample IsSecond="True" IsVisible="{Binding #secondVisible.IsChecked}"/>
+      </DockPanel>
+    </Grid>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/NativeEmbedPage.xaml.cs b/samples/ControlCatalog/Pages/NativeEmbedPage.xaml.cs
new file mode 100644
index 0000000000..83554c007d
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NativeEmbedPage.xaml.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+using Avalonia.Platform;
+using Avalonia.Interactivity;
+using Avalonia.Controls;
+using Avalonia.Controls.Platform;
+using Avalonia.Markup.Xaml;
+using Avalonia;
+
+namespace ControlCatalog.Pages
+{
+    public class NativeEmbedPage : UserControl
+    {
+        public NativeEmbedPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public async void ShowPopupDelay(object sender, RoutedEventArgs args)
+        {
+            await Task.Delay(3000);
+            ShowPopup(sender, args);
+        }
+
+        public void ShowPopup(object sender, RoutedEventArgs args)
+        {
+            new ContextMenu()
+            {
+                Items = new List<MenuItem>
+            {
+                new MenuItem() { Header = "Test" }, new MenuItem() { Header = "Test" }
+            }
+            }.Open((Control)sender);
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == BoundsProperty)
+            {
+                var isMobile = change.GetNewValue<Rect>().Width < 1200;
+                this.Find<DockPanel>("FirstPanel")!.Classes.Set("mobile", isMobile);
+                this.Find<DockPanel>("SecondPanel")!.Classes.Set("mobile", isMobile);
+            }
+        }
+    }
+
+    public class EmbedSample : NativeControlHost
+    {
+        public static INativeDemoControl? Implementation { get; set; }
+
+        static EmbedSample()
+        {
+
+        }
+
+        public bool IsSecond { get; set; }
+
+        protected override IPlatformHandle CreateNativeControlCore(IPlatformHandle parent)
+        {
+            return Implementation?.CreateControl(IsSecond, parent, () => base.CreateNativeControlCore(parent))
+                ?? base.CreateNativeControlCore(parent);
+        }
+
+        protected override void DestroyNativeControlCore(IPlatformHandle control)
+        {
+            base.DestroyNativeControlCore(control);
+        }
+    }
+
+    public interface INativeDemoControl
+    {
+        /// <param name="isSecond">Used to specify which control should be displayed as a demo</param>
+        /// <param name="parent"></param>
+        /// <param name="createDefault"></param>
+        IPlatformHandle CreateControl(bool isSecond, IPlatformHandle parent, Func<IPlatformHandle> createDefault);
+    }
+}
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
index 9ddc6b6228..e32632dac2 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
@@ -65,7 +65,7 @@
                        Margin="2" HorizontalAlignment="Center"/>
 
         <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Value:</TextBlock>
-        <NumericUpDown Grid.Row="3" Grid.Column="1" Value="{Binding #upDown.Value}" VerticalAlignment="Center"
+        <NumericUpDown Grid.Row="3" Grid.Column="1" Value="{Binding DecimalValue}" VerticalAlignment="Center"
                        Margin="2" HorizontalAlignment="Center"/>
 
 
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
index 5856194430..a21d41bc01 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
@@ -28,16 +28,16 @@ namespace ControlCatalog.Pages
 
     public class NumbersPageViewModel : ViewModelBase
     {
-        private IList<FormatObject> _formats;
+        private IList<FormatObject>? _formats;
         private FormatObject _selectedFormat;
-        private IList<Location> _spinnerLocations;
+        private IList<Location>? _spinnerLocations;
 
         private double _doubleValue;
         private decimal _decimalValue;
 
         public NumbersPageViewModel()
         {
-            SelectedFormat = Formats.FirstOrDefault();
+            _selectedFormat = Formats.FirstOrDefault();
         }
 
         public double DoubleValue
@@ -103,7 +103,7 @@ namespace ControlCatalog.Pages
 
     public class FormatObject
     {
-        public string Value { get; set; }
-        public string Name { get; set; }
+        public string? Value { get; set; }
+        public string? Name { get; set; }
     }
 }
diff --git a/samples/ControlCatalog/Pages/PointersPage.cs b/samples/ControlCatalog/Pages/PointersPage.cs
index 2901013cea..0377993d2c 100644
--- a/samples/ControlCatalog/Pages/PointersPage.cs
+++ b/samples/ControlCatalog/Pages/PointersPage.cs
@@ -7,6 +7,7 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Documents;
 using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Media;
@@ -131,7 +132,7 @@ public class PointersPage : Decorator
     {
         public PointerIntermediatePointsTab()
         {
-            this[TextBlock.ForegroundProperty] = Brushes.Black;
+            this[TextElement.ForegroundProperty] = Brushes.Black;
             var slider = new Slider
             {
                 Margin = new Thickness(5),
diff --git a/samples/ControlCatalog/Pages/ScreenPage.cs b/samples/ControlCatalog/Pages/ScreenPage.cs
index caad8b0854..dde622d585 100644
--- a/samples/ControlCatalog/Pages/ScreenPage.cs
+++ b/samples/ControlCatalog/Pages/ScreenPage.cs
@@ -13,10 +13,12 @@ namespace ControlCatalog.Pages
     {
         private double _leftMost;
 
+        protected override bool BypassFlowDirectionPolicies => true;
+
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
-            Window w = (Window)VisualRoot;
+            Window w = (Window)VisualRoot!;
             w.PositionChanged += (sender, args) => InvalidateVisual();
         }
 
diff --git a/samples/ControlCatalog/Pages/TabControlPage.xaml.cs b/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
index f49b13091b..bd0214c72e 100644
--- a/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
@@ -52,7 +52,7 @@ namespace ControlCatalog.Pages
 
         private IBitmap LoadBitmap(string uri)
         {
-            var assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
+            var assets = AvaloniaLocator.Current!.GetService<IAssetLoader>()!;
             return new Bitmap(assets.Open(new Uri(uri)));
         }
 
@@ -60,7 +60,7 @@ namespace ControlCatalog.Pages
         {
             private Dock _tabPlacement;
 
-            public TabItemViewModel[] Tabs { get; set; }
+            public TabItemViewModel[]? Tabs { get; set; }
 
             public Dock TabPlacement
             {
@@ -71,10 +71,10 @@ namespace ControlCatalog.Pages
 
         private class TabItemViewModel
         {
-            public string Header { get; set; }
-            public string Text { get; set; }
-            public IBitmap Image { get; set; }
-            public bool IsEnabled { get; set; } = true;           
+            public string? Header { get; set; }
+            public string? Text { get; set; }
+            public IBitmap? Image { get; set; }
+            public bool IsEnabled { get; set; } = true;
         }
     }
 }
diff --git a/samples/ControlCatalog/Pages/TabStripPage.xaml.cs b/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
index f0630cf534..6d7135a90f 100644
--- a/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
@@ -38,7 +38,7 @@ namespace ControlCatalog.Pages
 
         private class TabStripItemViewModel
         {
-            public string Header { get; set; }
+            public string? Header { get; set; }
             public bool IsEnabled { get; set; } = true;
         }
     }
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index f15ac8ffd6..e3d0c5e4e2 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -18,7 +18,7 @@
           </TextBox.ContextFlyout>
         </TextBox>
         <TextBox Width="200" Watermark="ReadOnly" IsReadOnly="True" Text="This is read only"/>
-        <TextBox Width="200" Watermark="Numeric with watermark" x:Name="numericWatermark"/>
+        <TextBox Width="200" Watermark="Numeric with watermark" TextInputOptions.ContentType="Number" />
         <TextBox Width="200"
                  Watermark="Floating Watermark"
                  UseFloatingWatermark="True"
@@ -34,6 +34,7 @@
         <TextBox Width="200"
                  Watermark="Password Box"
                  Classes="revealPasswordButton"
+                 TextInputOptions.ContentType="Password"
                  UseFloatingWatermark="True"
                  PasswordChar="*"
                  Text="Password" />
@@ -65,6 +66,12 @@
                  FontFamily="Comic Sans MS"
                  InputMethod.IsInputMethodEnabled="False"
                  Foreground="Red"/>
+        <TextBox AcceptsReturn="True" 
+                 TextWrapping="Wrap" 
+                 Width="200" 
+                 Height="125"
+                 LineHeight="32"
+                 Text="Multiline TextBox with TextWrapping and increased LineHeight.&#xD;&#xD;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." />
       </StackPanel>
       <StackPanel Orientation="Vertical" Spacing="8" Margin="8">
         <Label Classes="h2" Target="{Binding #firstResMFont}">res_m fonts</Label>
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs b/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs
index 9eeefebb02..cd5f790312 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs
@@ -13,12 +13,6 @@ namespace ControlCatalog.Pages
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
-
-            this.Get<TextBox>("numericWatermark")
-                .TextInputOptionsQuery += (s, a) =>
-                {
-                    a.ContentType = Avalonia.Input.TextInput.TextInputContentType.Number;
-                };
         }
     }
 }
diff --git a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
new file mode 100644
index 0000000000..a410577d27
--- /dev/null
+++ b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
@@ -0,0 +1,82 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:ControlCatalog.ViewModels"
+             xmlns:converter="clr-namespace:ControlCatalog.Converter"
+             xmlns:system="using:System"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:TransitioningContentControlPageViewModel"
+             x:CompileBindings="True"
+             x:Class="ControlCatalog.Pages.TransitioningContentControlPage">
+
+    <UserControl.DataContext>
+        <vm:TransitioningContentControlPageViewModel />
+    </UserControl.DataContext>
+
+    <UserControl.Styles>
+        <Style Selector="HeaderedContentControl">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="HeaderCol" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter Content="{TemplateBinding Header}" 
+                                              Grid.Column="0" 
+                                              VerticalAlignment="Center" />
+                            <ContentPresenter Content="{TemplateBinding Content}" 
+                                              Grid.Column="1" 
+                                              VerticalAlignment="Center" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Styles>
+  
+  <UserControl.Resources>
+    <converter:MathSubtractConverter x:Key="MathSubtractConverter" />
+    <system:Double x:Key="TopMargin">8</system:Double>
+  </UserControl.Resources>
+  
+    <DockPanel LastChildFill="True" 
+               Height="{Binding Path=Bounds.Height, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Grid}, Converter={StaticResource MathSubtractConverter},ConverterParameter={StaticResource TopMargin}}">
+
+        <TextBlock DockPanel.Dock="Top" Classes="h2">The TransitioningContentControl control allows you to show a page transition whenever the Content changes.</TextBlock>
+
+        <ExperimentalAcrylicBorder DockPanel.Dock="Bottom" Margin="10" CornerRadius="5" >
+            <ExperimentalAcrylicBorder.Material>
+                <ExperimentalAcrylicMaterial BackgroundSource="Digger" TintColor="White" />
+            </ExperimentalAcrylicBorder.Material>
+            
+            <StackPanel Margin="5" Spacing="5" Grid.IsSharedSizeScope="True">
+                <HeaderedContentControl Header="Select a transition">
+                     <ComboBox Items="{Binding PageTransitions}" SelectedItem="{Binding SelectedTransition}" />
+                </HeaderedContentControl>
+                <HeaderedContentControl Header="Duration">
+                     <NumericUpDown Value="{Binding Duration}" Increment="250" Minimum="100" />
+                </HeaderedContentControl>
+                <HeaderedContentControl Header="Clip to Bounds">
+                    <ToggleSwitch IsChecked="{Binding ClipToBounds}" />
+                </HeaderedContentControl>
+            </StackPanel>
+        </ExperimentalAcrylicBorder>
+
+        <Button DockPanel.Dock="Left" Command="{Binding PrevImage}" Content="&lt;" />
+        <Button DockPanel.Dock="Right" Command="{Binding NextImage}" Content=">" />
+        
+        <Border ClipToBounds="{Binding ClipToBounds}" Margin="5">
+            <TransitioningContentControl Content="{Binding SelectedImage}"
+                                         PageTransition="{Binding SelectedTransition.Transition}" >
+                <TransitioningContentControl.ContentTemplate>
+                    <DataTemplate DataType="Bitmap">
+                        <Image Source="{Binding}"  />
+                    </DataTemplate>
+                </TransitioningContentControl.ContentTemplate>
+            </TransitioningContentControl>
+        </Border>
+    </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs
new file mode 100644
index 0000000000..2851a6c890
--- /dev/null
+++ b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public partial class TransitioningContentControlPage : UserControl
+    {
+        public TransitioningContentControlPage()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/ViewModels/ApplicationViewModel.cs b/samples/ControlCatalog/ViewModels/ApplicationViewModel.cs
index 7eea7b0657..868c72df5c 100644
--- a/samples/ControlCatalog/ViewModels/ApplicationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/ApplicationViewModel.cs
@@ -10,7 +10,7 @@ namespace ControlCatalog.ViewModels
         {
             ExitCommand = MiniCommand.Create(() =>
             {
-                if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
+                if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
                 {
                     lifetime.Shutdown();
                 }
diff --git a/samples/ControlCatalog/ViewModels/ContextPageViewModel.cs b/samples/ControlCatalog/ViewModels/ContextPageViewModel.cs
index b46ffeb007..0987849be7 100644
--- a/samples/ControlCatalog/ViewModels/ContextPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/ContextPageViewModel.cs
@@ -9,7 +9,7 @@ namespace ControlCatalog.ViewModels
 {
     public class ContextPageViewModel
     {
-        public Control View { get; set; }
+        public Control? View { get; set; }
         public ContextPageViewModel()
         {
             OpenCommand = MiniCommand.CreateFromTask(Open);
diff --git a/samples/ControlCatalog/ViewModels/CursorPageViewModel.cs b/samples/ControlCatalog/ViewModels/CursorPageViewModel.cs
index f1cc0637dc..d73ab810eb 100644
--- a/samples/ControlCatalog/ViewModels/CursorPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/CursorPageViewModel.cs
@@ -18,7 +18,7 @@ namespace ControlCatalog.ViewModels
                 .Select(x => new StandardCursorModel(x))
                 .ToList();
 
-            var loader = AvaloniaLocator.Current.GetService<IAssetLoader>();
+            var loader = AvaloniaLocator.Current!.GetService<IAssetLoader>()!;
             var s = loader.Open(new Uri("avares://ControlCatalog/Assets/avalonia-32.png"));
             var bitmap = new Bitmap(s);
             CustomCursor = new Cursor(bitmap, new PixelPoint(16, 16));
diff --git a/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs b/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs
index ee1fa6ae77..3973c73662 100644
--- a/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs
@@ -14,7 +14,7 @@ namespace ControlCatalog.ViewModels
 
         public ItemsRepeaterPageViewModel()
         {
-            Items = CreateItems();
+            _items = CreateItems();
         }
 
         public ObservableCollection<Item> Items
@@ -23,12 +23,25 @@ namespace ControlCatalog.ViewModels
             set => this.RaiseAndSetIfChanged(ref _items, value);
         }
 
-        public Item SelectedItem { get; set; }
+        public Item? SelectedItem { get; set; }
 
         public void AddItem()
         {
             var index = SelectedItem != null ? Items.IndexOf(SelectedItem) : -1;
-            Items.Insert(index + 1, new Item(index + 1) { Text = $"New Item {_newItemIndex++}" });
+            Items.Insert(index + 1, new Item(index + 1, $"New Item {_newItemIndex++}"));
+        }
+
+        public void RemoveItem()
+        {
+            if (SelectedItem is not null)
+            {
+                Items.Remove(SelectedItem);
+                SelectedItem = null;
+            }
+            else if (Items.Count > 0)
+            {
+                Items.RemoveAt(Items.Count - 1);
+            }
         }
 
         public void RandomizeHeights()
@@ -53,19 +66,20 @@ namespace ControlCatalog.ViewModels
             _newGenerationIndex++;
 
             return new ObservableCollection<Item>(
-                Enumerable.Range(1, 100000).Select(i => new Item(i)
-                {
-                    Text = $"Item {i.ToString()} {suffix}"
-                }));
+                Enumerable.Range(1, 100000).Select(i => new Item(i, $"Item {i.ToString()} {suffix}")));
         }
 
         public class Item : ViewModelBase
         {
             private double _height = double.NaN;
 
-            public Item(int index) => Index = index;
+            public Item(int index, string text)
+            {
+                Index = index;
+                Text = text;
+            }
             public int Index { get; }
-            public string Text { get; set; }
+            public string Text { get; }
             
             public double Height 
             {
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 2b0c30f311..c2c2462246 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -16,11 +16,11 @@ namespace ControlCatalog.ViewModels
 
         private bool _isMenuItemChecked = true;
         private WindowState _windowState;
-        private WindowState[] _windowStates;
+        private WindowState[] _windowStates = Array.Empty<WindowState>();
         private int _transparencyLevel;
-        private ExtendClientAreaChromeHints _chromeHints;
+        private ExtendClientAreaChromeHints _chromeHints = ExtendClientAreaChromeHints.PreferSystemChrome;
         private bool _extendClientAreaEnabled;
-        private bool _systemTitleBarEnabled;        
+        private bool _systemTitleBarEnabled;
         private bool _preferSystemChromeEnabled;
         private double _titleBarHeight;
 
@@ -47,14 +47,15 @@ namespace ControlCatalog.ViewModels
             {
                 var dialog = new AboutAvaloniaDialog();
 
-                var mainWindow = (App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow;
-
-                await dialog.ShowDialog(mainWindow);
+                if ((App.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow is { } mainWindow)
+                {
+                    await dialog.ShowDialog(mainWindow);
+                }
             });
 
             ExitCommand = MiniCommand.Create(() =>
             {
-                (App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime).Shutdown();
+                (App.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.Shutdown();
             });
 
             ToggleMenuItemCheckedCommand = MiniCommand.Create(() =>
diff --git a/samples/ControlCatalog/ViewModels/MenuItemViewModel.cs b/samples/ControlCatalog/ViewModels/MenuItemViewModel.cs
index 1e4a764efc..190bb4c8a3 100644
--- a/samples/ControlCatalog/ViewModels/MenuItemViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MenuItemViewModel.cs
@@ -5,9 +5,9 @@ namespace ControlCatalog.ViewModels
 {
     public class MenuItemViewModel
     {
-        public string Header { get; set; }
-        public ICommand Command { get; set; }
-        public object CommandParameter { get; set; }
-        public IList<MenuItemViewModel> Items { get; set; }
+        public string? Header { get; set; }
+        public ICommand? Command { get; set; }
+        public object? CommandParameter { get; set; }
+        public IList<MenuItemViewModel>? Items { get; set; }
     }
 }
diff --git a/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs b/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs
index ecbd59c5d7..bc9da3a881 100644
--- a/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs
@@ -10,7 +10,7 @@ namespace ControlCatalog.ViewModels
 {
     public class MenuPageViewModel
     {
-        public Control View { get; set; }
+        public Control? View { get; set; }
         public MenuPageViewModel()
         {
             OpenCommand = MiniCommand.CreateFromTask(Open);
diff --git a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
index 2052481015..b714c319a6 100644
--- a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
@@ -19,8 +19,8 @@ namespace ControlCatalog.ViewModels
             });
         }
 
-        public string Title { get; set; }
-        public string Message { get; set; }
+        public string? Title { get; set; }
+        public string? Message { get; set; }
 
         public MiniCommand YesCommand { get; }
 
diff --git a/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs b/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs
new file mode 100644
index 0000000000..bcbc87f64f
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs
@@ -0,0 +1,309 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Animation;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Styling;
+using Avalonia.VisualTree;
+using MiniMvvm;
+
+namespace ControlCatalog.ViewModels
+{
+    public class TransitioningContentControlPageViewModel : ViewModelBase
+    {
+        public TransitioningContentControlPageViewModel()
+        {
+            var assetLoader = AvaloniaLocator.Current?.GetService<IAssetLoader>()!;
+
+            var images = new string[] 
+            { 
+                "delicate-arch-896885_640.jpg", 
+                "hirsch-899118_640.jpg", 
+                "maple-leaf-888807_640.jpg" 
+            };
+
+            foreach (var image in images)
+            {
+                var path = $"avares://ControlCatalog/Assets/{image}";
+                Images.Add(new Bitmap(assetLoader.Open(new Uri(path))));
+            }
+
+            SetupTransitions();
+
+            _SelectedTransition = PageTransitions[1];
+            _SelectedImage = Images[0];
+        }
+
+        public List<PageTransition> PageTransitions { get; } = new List<PageTransition>();
+
+        public List<Bitmap> Images { get; } = new List<Bitmap>();
+
+
+        private Bitmap _SelectedImage;
+
+        /// <summary>
+        /// Gets or Sets the selected image
+        /// </summary>
+        public Bitmap SelectedImage
+        {
+            get { return _SelectedImage; }
+            set { this.RaiseAndSetIfChanged(ref _SelectedImage, value); }
+        }
+
+
+        private PageTransition _SelectedTransition;
+
+        /// <summary>
+        /// Gets or sets the transition to play
+        /// </summary>
+        public PageTransition SelectedTransition
+        {
+            get { return _SelectedTransition; }
+            set { this.RaiseAndSetIfChanged(ref _SelectedTransition, value); }
+        }
+
+
+
+        private bool _ClipToBounds;
+
+        /// <summary>
+        /// Gets or sets if the content should be clipped to bounds
+        /// </summary>
+        public bool ClipToBounds
+        {
+            get { return _ClipToBounds; }
+            set { this.RaiseAndSetIfChanged(ref _ClipToBounds, value); }
+        }
+
+
+        private int _Duration = 500;
+
+        /// <summary>
+        /// Gets or Sets the duration
+        /// </summary>
+        public int Duration 
+        {
+            get { return _Duration; }
+            set 
+            { 
+                this.RaiseAndSetIfChanged(ref _Duration , value);
+                SetupTransitions();
+            }
+        }
+
+        private void SetupTransitions()
+        {
+            if (PageTransitions.Count == 0)
+            {
+                PageTransitions.AddRange(new[] 
+                {
+                    new PageTransition("None"),
+                    new PageTransition("CrossFade"),
+                    new PageTransition("Slide horizontally"),
+                    new PageTransition("Slide vertically"),
+                    new PageTransition("Composite"),
+                    new PageTransition("Custom")
+                });
+            }
+
+            PageTransitions[1].Transition = new CrossFade(TimeSpan.FromMilliseconds(Duration));
+            PageTransitions[2].Transition = new PageSlide(TimeSpan.FromMilliseconds(Duration), PageSlide.SlideAxis.Horizontal);
+            PageTransitions[3].Transition = new PageSlide(TimeSpan.FromMilliseconds(Duration), PageSlide.SlideAxis.Vertical);
+
+            var compositeTransition = new CompositePageTransition();
+            compositeTransition.PageTransitions.Add(PageTransitions[1].Transition);
+            compositeTransition.PageTransitions.Add(PageTransitions[2].Transition);
+            compositeTransition.PageTransitions.Add(PageTransitions[3].Transition);
+            PageTransitions[4].Transition = compositeTransition;
+
+            PageTransitions[5].Transition = new CustomTransition(TimeSpan.FromMilliseconds(Duration));
+        }
+
+        public void NextImage()
+        {
+            var index = Images.IndexOf(SelectedImage) + 1;
+            
+            if (index >= Images.Count)
+            {
+                index = 0;
+            }
+
+            SelectedImage = Images[index];
+        }
+
+        public void PrevImage()
+        {
+            var index = Images.IndexOf(SelectedImage) - 1;
+
+            if (index < 0)
+            {
+                index = Images.Count-1;
+            }
+
+            SelectedImage = Images[index];
+        }
+    }
+
+    public class PageTransition : ViewModelBase
+    {
+        public PageTransition(string displayTitle)
+        {
+            DisplayTitle = displayTitle;
+        }
+
+        public string DisplayTitle { get; }
+
+
+        private IPageTransition? _Transition;
+
+        /// <summary>
+        /// Gets or sets the transition
+        /// </summary>
+        public IPageTransition? Transition
+        {
+            get { return _Transition; }
+            set { this.RaiseAndSetIfChanged(ref _Transition, value); }
+        }
+
+        public override string ToString()
+        {
+            return DisplayTitle;
+        }
+
+    }
+
+    public class CustomTransition : IPageTransition
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CustomTransition"/> class.
+        /// </summary>
+        public CustomTransition()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CustomTransition"/> class.
+        /// </summary>
+        /// <param name="duration">The duration of the animation.</param>
+        public CustomTransition(TimeSpan duration)
+        {
+            Duration = duration;
+        }
+
+        /// <summary>
+        /// Gets the duration of the animation.
+        /// </summary>
+        public TimeSpan Duration { get; set; }
+
+        public async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
+
+            var tasks = new List<Task>();
+            var parent = GetVisualParent(from, to);
+            var scaleProperty = ScaleTransform.ScaleYProperty;
+
+            if (from != null)
+            {
+                var animation = new Animation
+                {
+                    FillMode = FillMode.Forward,
+                    Children =
+                    {
+                        new KeyFrame
+                        {
+                            Setters = { new Setter { Property = scaleProperty, Value = 1d } },
+                            Cue = new Cue(0d)
+                        },
+                        new KeyFrame
+                        {
+                            Setters =
+                            {
+                                new Setter
+                                {
+                                    Property = scaleProperty,
+                                    Value = 0d
+                                }
+                            },
+                            Cue = new Cue(1d)
+                        }
+                    },
+                    Duration = Duration
+                };
+                tasks.Add(animation.RunAsync(from, null, cancellationToken));
+            }
+
+            if (to != null)
+            {
+                to.IsVisible = true;
+                var animation = new Animation
+                {
+                    FillMode = FillMode.Forward,
+                    Children =
+                    {
+                        new KeyFrame
+                        {
+                            Setters =
+                            {
+                                new Setter
+                                {
+                                    Property = scaleProperty,
+                                    Value = 0d
+                                }
+                            },
+                            Cue = new Cue(0d)
+                        },
+                        new KeyFrame
+                        {
+                            Setters = { new Setter { Property = scaleProperty, Value = 1d } },
+                            Cue = new Cue(1d)
+                        }
+                    },
+                    Duration = Duration
+                };
+                tasks.Add(animation.RunAsync(to, null, cancellationToken));
+            }
+
+            await Task.WhenAll(tasks);
+
+            if (from != null && !cancellationToken.IsCancellationRequested)
+            {
+                from.IsVisible = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets the common visual parent of the two control.
+        /// </summary>
+        /// <param name="from">The from control.</param>
+        /// <param name="to">The to control.</param>
+        /// <returns>The common parent.</returns>
+        /// <exception cref="ArgumentException">
+        /// The two controls do not share a common parent.
+        /// </exception>
+        /// <remarks>
+        /// Any one of the parameters may be null, but not both.
+        /// </remarks>
+        private static IVisual GetVisualParent(IVisual? from, IVisual? to)
+        {
+            var p1 = (from ?? to)!.VisualParent;
+            var p2 = (to ?? from)!.VisualParent;
+
+            if (p1 != null && p2 != null && p1 != p2)
+            {
+                throw new ArgumentException("Controls for PageSlide must have same parent.");
+            }
+
+            return p1 ?? throw new InvalidOperationException("Cannot determine visual parent.");
+        }
+    }
+}
diff --git a/samples/ControlCatalog/ViewModels/TreeViewPageViewModel.cs b/samples/ControlCatalog/ViewModels/TreeViewPageViewModel.cs
index c03379330f..80d4844f7a 100644
--- a/samples/ControlCatalog/ViewModels/TreeViewPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/TreeViewPageViewModel.cs
@@ -92,7 +92,7 @@ namespace ControlCatalog.ViewModels
 
         public class Node
         {
-            private ObservableCollection<Node> _children;
+            private ObservableCollection<Node>? _children;
             private int _childIndex = 10;
 
             public Node()
@@ -106,7 +106,7 @@ namespace ControlCatalog.ViewModels
                 Header = parent.Header + ' ' + index;
             }
 
-            public Node Parent { get; }
+            public Node? Parent { get; }
             public string Header { get; }
             public bool AreChildrenInitialized => _children != null;
             public ObservableCollection<Node> Children => _children ??= CreateChildren();
diff --git a/samples/IntegrationTestApp/IntegrationTestApp.csproj b/samples/IntegrationTestApp/IntegrationTestApp.csproj
index e8338adae6..4284399357 100644
--- a/samples/IntegrationTestApp/IntegrationTestApp.csproj
+++ b/samples/IntegrationTestApp/IntegrationTestApp.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
@@ -18,6 +18,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
   </ItemGroup>
   
   <Import Project="..\..\build\BuildTargets.targets" />
diff --git a/samples/IntegrationTestApp/MainWindow.axaml b/samples/IntegrationTestApp/MainWindow.axaml
index fe1487a7f2..19ac68b15b 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml
+++ b/samples/IntegrationTestApp/MainWindow.axaml
@@ -82,12 +82,16 @@
           <Menu DockPanel.Dock="Top">
             <MenuItem Name="RootMenuItem" Header="_Root">
               <MenuItem Name="Child1MenuItem" Header="_Child 1" InputGesture="Ctrl+O" Click="MenuClicked"/>
-              <MenuItem Name="Child2MenuItem" Header="_Child 1">
+              <MenuItem Name="Child2MenuItem" Header="C_hild 2">
                 <MenuItem Name="GrandchildMenuItem" Header="_Grandchild" Click="MenuClicked"/>
               </MenuItem>
             </MenuItem>
           </Menu>
-          <TextBlock Name="ClickedMenuItem">None</TextBlock>
+          <StackPanel>
+            <TextBlock Name="ClickedMenuItem">None</TextBlock>
+            <Button Name="MenuClickedMenuItemReset">Reset</Button>
+            <TextBox Name="MenuFocusTest"/>
+          </StackPanel>
         </DockPanel>
       </TabItem>
     </TabControl>
diff --git a/samples/IntegrationTestApp/MainWindow.axaml.cs b/samples/IntegrationTestApp/MainWindow.axaml.cs
index b9e631a312..9a612aa94d 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml.cs
+++ b/samples/IntegrationTestApp/MainWindow.axaml.cs
@@ -62,6 +62,8 @@ namespace IntegrationTestApp
                 this.FindControl<ComboBox>("BasicComboBox").SelectedIndex = 0;
             if (source?.Name == "ListBoxSelectionClear")
                 this.FindControl<ListBox>("BasicListBox").SelectedIndex = -1;
+            if (source?.Name == "MenuClickedMenuItemReset")
+                this.FindControl<TextBlock>("ClickedMenuItem").Text = "None";
         }
     }
 }
diff --git a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
index 9660d2a90d..4f7f06b529 100644
--- a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
+++ b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
   </ItemGroup>
 
diff --git a/samples/Previewer/Previewer.csproj b/samples/Previewer/Previewer.csproj
index c1d14cba26..98560e9ab0 100644
--- a/samples/Previewer/Previewer.csproj
+++ b/samples/Previewer/Previewer.csproj
@@ -9,6 +9,9 @@
     </Compile>
     <EmbeddedResource Include="**\*.xaml" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+  </ItemGroup>
   
   <Import Project="..\..\build\SampleApp.props" />
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
diff --git a/samples/RenderDemo/MainWindow.xaml b/samples/RenderDemo/MainWindow.xaml
index 4a8fb819ca..e6e62f86ed 100644
--- a/samples/RenderDemo/MainWindow.xaml
+++ b/samples/RenderDemo/MainWindow.xaml
@@ -60,11 +60,20 @@
     <TabItem Header="FormattedText">
       <pages:FormattedTextPage />
     </TabItem>
+    <TabItem Header="TextFormatter">
+      <pages:TextFormatterPage />
+    </TabItem>
     <TabItem Header="LineBounds">
       <pages:LineBoundsPage />
     </TabItem>
     <TabItem Header="Path Measurement">
       <pages:PathMeasurementPage />
     </TabItem>
+    <TabItem Header="Brushes">
+      <pages:BrushesPage />
+    </TabItem>
+    <TabItem Header="3D Transformation">
+      <pages:Transform3DPage />
+    </TabItem>
   </controls:HamburgerMenu>
 </Window>
diff --git a/samples/RenderDemo/Pages/BrushesPage.axaml b/samples/RenderDemo/Pages/BrushesPage.axaml
new file mode 100644
index 0000000000..9d5b6ee987
--- /dev/null
+++ b/samples/RenderDemo/Pages/BrushesPage.axaml
@@ -0,0 +1,71 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="RenderDemo.Pages.BrushesPage">
+  <Canvas Background="White" Width="480" Height="360">
+    <Rectangle Canvas.Left="20" Canvas.Top="20" Width="440" Height="50">
+      <Rectangle.Fill>
+        <LinearGradientBrush StartPoint="0,0" EndPoint="410,0">
+          <LinearGradientBrush.Transform>
+            <TransformGroup>
+              <ScaleTransform ScaleX="0.5" />
+              <SkewTransform />
+              <RotateTransform />
+              <TranslateTransform X="5" Y="15" />
+            </TransformGroup>
+          </LinearGradientBrush.Transform>
+          <LinearGradientBrush.GradientStops>
+            <GradientStop Color="Blue" Offset="0" />
+            <GradientStop Color="Green" Offset="0.5" />
+            <GradientStop Color="Lime" Offset="1" />
+          </LinearGradientBrush.GradientStops>
+        </LinearGradientBrush>
+      </Rectangle.Fill>
+    </Rectangle>
+    <TextBlock Canvas.Left="20" Canvas.Top="70" FontSize="30" Text="scale(0.5) on gradient" />
+    <Rectangle Canvas.Left="20" Canvas.Top="110" Width="440" Height="50">
+      <Rectangle.Fill>
+        <RadialGradientBrush Center="0.0,0.0" GradientOrigin="0.0,0.0" Radius="0.13636364">
+          <RadialGradientBrush.Transform>
+            <TransformGroup>
+              <ScaleTransform />
+              <SkewTransform AngleX="45" />
+              <RotateTransform />
+              <TranslateTransform X="240" Y="45" />
+            </TransformGroup>
+          </RadialGradientBrush.Transform>
+          <RadialGradientBrush.GradientStops>
+            <GradientStop Color="Black" Offset="0" />
+            <GradientStop Color="#FFFFA500" Offset="1" />
+          </RadialGradientBrush.GradientStops>
+        </RadialGradientBrush>
+      </Rectangle.Fill>
+    </Rectangle>
+    <TextBlock Canvas.Left="20" Canvas.Top="160" FontSize="30" Text="skewX(45) on gradient" />
+    <Rectangle Canvas.Left="20" Canvas.Top="210" Width="440" Height="50">
+      <Rectangle.Fill>
+        <VisualBrush TileMode="Tile" SourceRect="0,0,20,20" DestinationRect="0,0,20,20" Stretch="None">
+          <VisualBrush.Transform>
+            <TransformGroup>
+              <ScaleTransform ScaleX="2" ScaleY="2" />
+              <SkewTransform AngleX="45" />
+              <RotateTransform />
+              <TranslateTransform X="5" Y="5" />
+            </TransformGroup>
+          </VisualBrush.Transform>
+          <VisualBrush.Visual>
+            <Canvas Width="20" Height="20">
+              <Rectangle Canvas.Left="0" Canvas.Top="0" Width="10" Height="10" Fill="Maroon" />
+              <Rectangle Canvas.Left="10" Canvas.Top="0" Width="10" Height="10" Fill="Green" />
+              <Rectangle Canvas.Left="0" Canvas.Top="10" Width="10" Height="10" Fill="Blue" />
+              <Rectangle Canvas.Left="10" Canvas.Top="10" Width="10" Height="10" Fill="Yellow" />
+            </Canvas>
+          </VisualBrush.Visual>
+        </VisualBrush>
+      </Rectangle.Fill>
+    </Rectangle>
+    <TextBlock Canvas.Left="20" Canvas.Top="260" FontSize="30" Text="scale(2), skewX(45) on pattern" />
+  </Canvas>
+</UserControl>
diff --git a/samples/RenderDemo/Pages/BrushesPage.axaml.cs b/samples/RenderDemo/Pages/BrushesPage.axaml.cs
new file mode 100644
index 0000000000..5852b72d9e
--- /dev/null
+++ b/samples/RenderDemo/Pages/BrushesPage.axaml.cs
@@ -0,0 +1,18 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RenderDemo.Pages;
+
+public class BrushesPage : UserControl
+{
+    public BrushesPage()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
+
diff --git a/samples/RenderDemo/Pages/GlyphRunPage.xaml b/samples/RenderDemo/Pages/GlyphRunPage.xaml
index c2914e8847..7db58e5286 100644
--- a/samples/RenderDemo/Pages/GlyphRunPage.xaml
+++ b/samples/RenderDemo/Pages/GlyphRunPage.xaml
@@ -2,13 +2,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:local="clr-namespace:RenderDemo.Pages"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="RenderDemo.Pages.GlyphRunPage">
-  <Border
+  <Grid
+    ColumnDefinitions="*,*"
     Background="White">
-    <Image
-      x:Name="imageControl"
-      Stretch="None">
-    </Image>
-  </Border>
+    <local:GlyphRunControl Grid.Column="0"/>
+    <local:GlyphRunGeometryControl Grid.Column="1"/>
+  </Grid>
 </UserControl>
diff --git a/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs b/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs
index 7f85606957..674ed8e61f 100644
--- a/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs
+++ b/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs
@@ -9,14 +9,6 @@ namespace RenderDemo.Pages
 {
     public class GlyphRunPage : UserControl
     {
-        private Image _imageControl;
-        private GlyphTypeface _glyphTypeface = Typeface.Default.GlyphTypeface;
-        private readonly Random _rand = new Random();
-        private ushort[] _glyphIndices = new ushort[1];
-        private char[] _characters = new char[1];
-        private float _fontSize = 20;
-        private int _direction = 10;
-
         public GlyphRunPage()
         {
             this.InitializeComponent();
@@ -25,19 +17,43 @@ namespace RenderDemo.Pages
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
+        }
+    }
+
+    public class GlyphRunControl : Control
+    {
+        private GlyphTypeface _glyphTypeface = Typeface.Default.GlyphTypeface;
+        private readonly Random _rand = new Random();
+        private ushort[] _glyphIndices = new ushort[1];
+        private char[] _characters = new char[1];
+        private float _fontSize = 20;
+        private int _direction = 10;
 
-            _imageControl = this.FindControl<Image>("imageControl");
-            _imageControl.Source = new DrawingImage();
+        private DispatcherTimer _timer;
 
-            DispatcherTimer.Run(() =>
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            _timer = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromSeconds(1)
+            };
+
+            _timer.Tick += (s,e) =>
             {
-                UpdateGlyphRun();
+                InvalidateVisual();
+            };
+
+            _timer.Start();
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            _timer.Stop();
 
-                return true;
-            }, TimeSpan.FromSeconds(1));
+            _timer = null;
         }
 
-        private void UpdateGlyphRun()
+        public override void Render(DrawingContext context)
         {
             var c = (char)_rand.Next(65, 90);
 
@@ -57,27 +73,70 @@ namespace RenderDemo.Pages
 
             _characters[0] = c;
 
-            var scale = (double)_fontSize / _glyphTypeface.DesignEmHeight;
+            var glyphRun = new GlyphRun(_glyphTypeface, _fontSize, _characters, _glyphIndices);
 
-            var drawingGroup = new DrawingGroup();
+            context.DrawGlyphRun(Brushes.Black, glyphRun);
+        }
+    }
 
-            var glyphRunDrawing = new GlyphRunDrawing
+    public class GlyphRunGeometryControl : Control
+    {
+        private GlyphTypeface _glyphTypeface = Typeface.Default.GlyphTypeface;
+        private readonly Random _rand = new Random();
+        private ushort[] _glyphIndices = new ushort[1];
+        private char[] _characters = new char[1];
+        private float _fontSize = 20;
+        private int _direction = 10;
+
+        private DispatcherTimer _timer;
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            _timer = new DispatcherTimer
             {
-                Foreground = Brushes.Black,
-                GlyphRun = new GlyphRun(_glyphTypeface, _fontSize, _characters, _glyphIndices)
+                Interval = TimeSpan.FromSeconds(1)
             };
 
-            drawingGroup.Children.Add(glyphRunDrawing);
-
-            var geometryDrawing = new GeometryDrawing
+            _timer.Tick += (s, e) =>
             {
-                Pen = new Pen(Brushes.Black),
-                Geometry = new RectangleGeometry { Rect = new Rect(glyphRunDrawing.GlyphRun.Size) }
+                InvalidateVisual();
             };
 
-            drawingGroup.Children.Add(geometryDrawing);
+            _timer.Start();
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            _timer.Stop();
+
+            _timer = null;
+        }
+
+        public override void Render(DrawingContext context)
+        {
+            var c = (char)_rand.Next(65, 90);
+
+            if (_fontSize + _direction > 200)
+            {
+                _direction = -10;
+            }
+
+            if (_fontSize + _direction < 20)
+            {
+                _direction = 10;
+            }
+
+            _fontSize += _direction;
+
+            _glyphIndices[0] = _glyphTypeface.GetGlyph(c);
+
+            _characters[0] = c;
+
+            var glyphRun = new GlyphRun(_glyphTypeface, _fontSize, _characters, _glyphIndices);
+
+            var geometry = glyphRun.BuildGeometry();          
 
-            (_imageControl.Source as DrawingImage).Drawing = drawingGroup;
+            context.DrawGeometry(Brushes.Green, null, geometry);          
         }
     }
 }
diff --git a/samples/RenderDemo/Pages/PathMeasurementPage.cs b/samples/RenderDemo/Pages/PathMeasurementPage.cs
index 212377deae..cc5125609c 100644
--- a/samples/RenderDemo/Pages/PathMeasurementPage.cs
+++ b/samples/RenderDemo/Pages/PathMeasurementPage.cs
@@ -1,15 +1,9 @@
-using System;
-using System.Diagnostics;
-using System.Drawing.Drawing2D;
-using System.Security.Cryptography;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Media.Immutable;
-using Avalonia.Threading;
-using Avalonia.Visuals.Media.Imaging;
 
 namespace RenderDemo.Pages
 {
diff --git a/samples/RenderDemo/Pages/RenderTargetBitmapPage.cs b/samples/RenderDemo/Pages/RenderTargetBitmapPage.cs
index f263786ab7..f365b59c20 100644
--- a/samples/RenderDemo/Pages/RenderTargetBitmapPage.cs
+++ b/samples/RenderDemo/Pages/RenderTargetBitmapPage.cs
@@ -5,7 +5,6 @@ using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
-using Avalonia.Visuals.Media.Imaging;
 
 namespace RenderDemo.Pages
 {
diff --git a/samples/RenderDemo/Pages/TextFormatterPage.axaml b/samples/RenderDemo/Pages/TextFormatterPage.axaml
new file mode 100644
index 0000000000..4edf0852a2
--- /dev/null
+++ b/samples/RenderDemo/Pages/TextFormatterPage.axaml
@@ -0,0 +1,7 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="RenderDemo.Pages.TextFormatterPage">
+</UserControl>
diff --git a/samples/RenderDemo/Pages/TextFormatterPage.axaml.cs b/samples/RenderDemo/Pages/TextFormatterPage.axaml.cs
new file mode 100644
index 0000000000..92eb2e7dec
--- /dev/null
+++ b/samples/RenderDemo/Pages/TextFormatterPage.axaml.cs
@@ -0,0 +1,118 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+
+namespace RenderDemo.Pages
+{
+    public class TextFormatterPage : UserControl
+    {
+        private TextLine _textLine;
+        
+        public TextFormatterPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+        
+        public override void Render(DrawingContext context)
+        {
+            _textLine?.Draw(context, new Point());
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            var defaultRunProperties = new GenericTextRunProperties(Typeface.Default, foregroundBrush: Brushes.Black,
+                baselineAlignment: BaselineAlignment.Center);
+            var paragraphProperties = new GenericTextParagraphProperties(defaultRunProperties);
+
+            var control = new Button { Content = new TextBlock { Text = "ClickMe" } };
+            
+            Content = control;
+            
+            var textSource = new CustomTextSource(control, defaultRunProperties);
+
+            control.Measure(Size.Infinity);
+
+            _textLine =
+                TextFormatter.Current.FormatLine(textSource, 0, double.PositiveInfinity, paragraphProperties);
+            
+            return base.MeasureOverride(availableSize);
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            var currentX = 0d;
+            
+            foreach (var textRun in _textLine.TextRuns)
+            {
+                if (textRun is ControlRun controlRun)
+                {
+                    controlRun.Control.Arrange(new Rect(new Point(currentX, 0), controlRun.Size));
+                }
+
+                if (textRun is DrawableTextRun drawableTextRun)
+                {
+                    currentX += drawableTextRun.Size.Width;
+                }
+            }
+            
+            return finalSize;
+        }
+
+        private class CustomTextSource : ITextSource
+        {
+            private readonly Control _control;
+            private readonly TextRunProperties _defaultProperties;
+            private readonly string _text = "<-Hello World->";
+
+            public CustomTextSource(Control control, TextRunProperties defaultProperties)
+            {
+                _control = control;
+                _defaultProperties = defaultProperties;
+            }
+            
+            public TextRun? GetTextRun(int textSourceIndex)
+            {
+                if (textSourceIndex >= _text.Length * 2 + TextRun.DefaultTextSourceLength)
+                {
+                    return null;
+                }
+
+                if (textSourceIndex == _text.Length)
+                {
+                    return new ControlRun(_control, _defaultProperties);
+                }
+
+                return new TextCharacters(_text.AsMemory(), _defaultProperties);
+            }
+        }
+
+        private class ControlRun : DrawableTextRun
+        {
+            private readonly Control _control;
+
+            public ControlRun(Control control, TextRunProperties properties)
+            {
+                _control = control;
+                Properties = properties;
+            }
+
+            public Control Control => _control;
+            public override Size Size => _control.DesiredSize;
+            public override double Baseline => 0;
+            public override TextRunProperties? Properties { get; }
+
+            public override void Draw(DrawingContext drawingContext, Point origin)
+            {
+                // noop
+            }
+        }
+    }
+}
diff --git a/samples/RenderDemo/Pages/Transform3DPage.axaml b/samples/RenderDemo/Pages/Transform3DPage.axaml
new file mode 100644
index 0000000000..30ed35bbac
--- /dev/null
+++ b/samples/RenderDemo/Pages/Transform3DPage.axaml
@@ -0,0 +1,210 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="700"
+             x:Class="RenderDemo.Pages.Transform3DPage">
+    <UserControl.Styles>
+        <Styles>
+            <Styles.Resources>
+                <Template x:Key="TestContent">
+                    <Grid RowDefinitions="*,*" ColumnDefinitions="*,*" Margin="5">
+                        <TextBlock>I'm a text</TextBlock>
+                        <Button Grid.Row="0" Grid.Column="1" Content="A Button"></Button>
+                        <Slider Grid.Row="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="2"
+                                Value="{Binding Depth}"
+                                Minimum="100"
+                                Maximum="300" />
+                    </Grid>
+                </Template>
+            </Styles.Resources>
+        </Styles>
+        <Style Selector="Border.Test">
+            <Setter Property="Width" Value="200" />
+            <Setter Property="Height" Value="200" />
+            <Setter Property="Child" Value="{StaticResource TestContent}" />
+            <Setter Property="BorderThickness" Value="2" />
+            <Setter Property="BorderBrush" Value="Black" />
+            <Setter Property="Grid.ColumnSpan" Value="2" />
+        </Style>
+        <Style Selector="TextBlock, Label, Slider">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Margin" Value="10,0,10,0" />
+        </Style>
+        <Style Selector="Border TextBlock">
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+        <Style Selector="Border Button">
+            <Setter Property="Background" Value="White"></Setter>
+            <Setter Property="Foreground" Value="Black" />
+        </Style>
+        
+        <Style Selector="Border#B1">
+            <Style.Animations>
+                <Animation Duration="0:0:10"
+                           IterationCount="Infinite">
+                    <KeyFrame Cue="0%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="0" />
+                        <Setter Property="ZIndex" Value="4" />
+                    </KeyFrame>
+                    <KeyFrame Cue="25%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="90" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="100%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="360" />
+                        <Setter Property="ZIndex" Value="4" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="Border#B2">
+            <Style.Animations>
+                <Animation Duration="0:0:10"
+                           IterationCount="Infinite">
+                    <KeyFrame Cue="0%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="90" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="25%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="180" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="75%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="360" />
+                        <Setter Property="ZIndex" Value="4" />
+                    </KeyFrame>
+                    <KeyFrame Cue="100%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="450" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="Border#B3">
+            <Style.Animations>
+                <Animation Duration="0:0:10"
+                           IterationCount="Infinite">
+                    <KeyFrame Cue="0%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="180" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="50%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="360" />
+                        <Setter Property="ZIndex" Value="4" />
+                    </KeyFrame>
+                    <KeyFrame Cue="75%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="450" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="100%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="540" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="Border#B4">
+            <Style.Animations>
+                <Animation Duration="0:0:10"
+                           IterationCount="Infinite">
+                    <KeyFrame Cue="0%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="270" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="25%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="360" />
+                        <Setter Property="ZIndex" Value="4" />
+                    </KeyFrame>
+                    <KeyFrame Cue="50%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="450" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="100%">
+                        <Setter Property="Rotate3DTransform.AngleX" Value="630" />
+                        <Setter Property="ZIndex" Value="1" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+    </UserControl.Styles>
+
+    <Grid ColumnDefinitions="Auto,*,Auto,*" RowDefinitions="*, Auto, Auto, Auto, Auto, Auto, Auto, Auto">
+        <Grid.Clock>
+            <Clock />
+        </Grid.Clock>
+        <Border Name="B1" Background="DarkRed" Classes="Test">
+            <Border.RenderTransform>
+                <Rotate3DTransform CenterZ="-100"
+                                   Depth="{Binding Depth}" />
+            </Border.RenderTransform>
+        </Border>
+        <Border Name="B2" Grid.Row="0" Grid.Column="0" Classes="Test" Background="DarkGreen">
+            <Border.RenderTransform>
+                <Rotate3DTransform CenterZ="-100"
+                                   Depth="{Binding Depth}" />
+            </Border.RenderTransform>
+        </Border>
+        <Border Name="B3" Grid.Row="0" Grid.Column="0" Classes="Test" Background="DarkBlue">
+            <Border.RenderTransform>
+                <Rotate3DTransform CenterZ="-100"
+                                   Depth="{Binding Depth}" />
+            </Border.RenderTransform>
+        </Border>
+        <Border Name="B4" Grid.Row="0" Grid.Column="0" Classes="Test" Background="Orange">
+            <Border.RenderTransform>
+                <Rotate3DTransform CenterZ="-100"
+                                   Depth="{Binding Depth}" />
+            </Border.RenderTransform>
+        </Border>
+
+        <Label Grid.Column="0" Grid.Row="1">Depth: </Label>
+        <Slider Grid.Column="1" Grid.Row="1" Value="{Binding Depth}" Minimum="100" Maximum="300" />
+
+        <Border Grid.Row="0" Grid.Column="2" Classes="Test" ZIndex="-2">
+            <Border.Background>
+                <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
+                    <GradientStop Offset="0" Color="Red" />
+                    <GradientStop Offset="1" Color="Blue" />
+                </LinearGradientBrush>
+            </Border.Background>
+            <Border.Styles>
+                <Style Selector="Label">
+                    <Setter Property="VerticalAlignment" Value="Center" />
+                </Style>
+                <Style Selector="Slider">
+                    <Setter Property="Width" Value="100" />
+                </Style>
+            </Border.Styles>
+            <Border.RenderTransform>
+                <Rotate3DTransform Depth="{Binding Depth}"
+                                   CenterX="{Binding CenterX}"
+                                   CenterY="{Binding CenterY}"
+                                   CenterZ="{Binding CenterZ}"
+                                   AngleX="{Binding AngleX}"
+                                   AngleY="{Binding AngleY}"
+                                   AngleZ="{Binding AngleZ}" />
+            </Border.RenderTransform>
+        </Border>
+
+        <Label Grid.Row="1" Grid.Column="2">Center X: </Label>
+        <Slider Grid.Row="1" Grid.Column="3" Value="{Binding CenterX}" Minimum="-100" Maximum="100" />
+
+        <Label Grid.Row="2" Grid.Column="2">Center Y: </Label>
+        <Slider Grid.Row="2" Grid.Column="3" Value="{Binding CenterY}" Minimum="-100" Maximum="100" />
+
+        <Label Grid.Row="3" Grid.Column="2">Center Z: </Label>
+        <Slider Grid.Row="3" Grid.Column="3" Value="{Binding CenterZ}" Minimum="-100" Maximum="100" />
+
+        <Label Grid.Row="4" Grid.Column="2">Angle X: </Label>
+        <Slider Grid.Row="4" Grid.Column="3" Value="{Binding AngleX}" Minimum="-180" Maximum="180" />
+
+        <Label Grid.Row="5" Grid.Column="2">Angle Y: </Label>
+        <Slider Grid.Row="5" Grid.Column="3" Value="{Binding AngleY}" Minimum="-180" Maximum="180" />
+
+        <Label Grid.Row="6" Grid.Column="2">Angle Z: </Label>
+        <Slider Grid.Row="6" Grid.Column="3" Value="{Binding AngleZ}" Minimum="-180" Maximum="180" />
+    </Grid>
+</UserControl>
diff --git a/samples/RenderDemo/Pages/Transform3DPage.axaml.cs b/samples/RenderDemo/Pages/Transform3DPage.axaml.cs
new file mode 100644
index 0000000000..5083189c4c
--- /dev/null
+++ b/samples/RenderDemo/Pages/Transform3DPage.axaml.cs
@@ -0,0 +1,21 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using RenderDemo.ViewModels;
+
+namespace RenderDemo.Pages;
+
+public class Transform3DPage : UserControl
+{
+    public Transform3DPage()
+    {
+        InitializeComponent();
+        this.DataContext = new Transform3DPageViewModel();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
+
diff --git a/samples/RenderDemo/RenderDemo.csproj b/samples/RenderDemo/RenderDemo.csproj
index 54d5ca4b3b..3c62af1eaf 100644
--- a/samples/RenderDemo/RenderDemo.csproj
+++ b/samples/RenderDemo/RenderDemo.csproj
@@ -4,10 +4,15 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\src\Avalonia.Visuals\Rendering\SceneGraph\LineBoundsHelper.cs" Link="LineBoundsHelper.cs" />
+    <Compile Include="..\..\src\Avalonia.Base\Rendering\SceneGraph\LineBoundsHelper.cs" Link="LineBoundsHelper.cs" />
+    <Compile Update="Pages\TextFormatterPage.axaml.cs">
+      <DependentUpon>TextFormatterPage.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
     <ProjectReference Include="..\SampleControls\ControlSamples.csproj" />
diff --git a/samples/RenderDemo/ViewModels/Transform3DPageViewModel.cs b/samples/RenderDemo/ViewModels/Transform3DPageViewModel.cs
new file mode 100644
index 0000000000..c8d1d40e3a
--- /dev/null
+++ b/samples/RenderDemo/ViewModels/Transform3DPageViewModel.cs
@@ -0,0 +1,55 @@
+using System;
+using MiniMvvm;
+using Avalonia.Animation;
+
+namespace RenderDemo.ViewModels
+{
+    public class Transform3DPageViewModel : ViewModelBase
+    {
+        private double _depth = 200;
+
+        private double _centerX = 0;
+        private double _centerY = 0;
+        private double _centerZ = 0;
+        private double _angleX = 0;
+        private double _angleY = 0;
+        private double _angleZ = 0;
+        
+        public double Depth
+        {
+            get => _depth;
+            set => RaiseAndSetIfChanged(ref _depth, value);
+        }
+        
+        public double CenterX
+        {
+            get => _centerX;
+            set => RaiseAndSetIfChanged(ref _centerX, value);
+        }
+        public double CenterY
+        {
+            get => _centerY;
+            set => RaiseAndSetIfChanged(ref _centerY, value);
+        }
+        public double CenterZ
+        {
+            get => _centerZ;
+            set => RaiseAndSetIfChanged(ref _centerZ, value);
+        }
+        public double AngleX
+        {
+            get => _angleX;
+            set => RaiseAndSetIfChanged(ref _angleX, value);
+        }
+        public double AngleY
+        {
+            get => _angleY;
+            set => RaiseAndSetIfChanged(ref _angleY, value);
+        }
+        public double AngleZ
+        {
+            get => _angleZ;
+            set => RaiseAndSetIfChanged(ref _angleZ, value);
+        }
+    }
+}
diff --git a/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs b/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs
index bbfd3d87ca..ab61dcde91 100644
--- a/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs
+++ b/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs
@@ -43,14 +43,13 @@ namespace ControlSamples
             _splitView = e.NameScope.Find<SplitView>("PART_NavigationPane");
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == BoundsProperty && _splitView is not null)
             {
-                var oldBounds = change.OldValue.GetValueOrDefault<Rect>();
-                var newBounds = change.NewValue.GetValueOrDefault<Rect>();
+                var (oldBounds, newBounds) = change.GetOldAndNewValue<Rect>();
                 EnsureSplitViewMode(oldBounds, newBounds);
             }
         }
diff --git a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
index 1aa7f8ea04..1d58c465a0 100644
--- a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
+++ b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
@@ -22,7 +22,7 @@
 
   <Styles.Resources>
     <x:Double x:Key="PaneCompactWidth">40</x:Double>
-    <x:Double x:Key="PaneExpandWidth">200</x:Double>
+    <x:Double x:Key="PaneExpandWidth">220</x:Double>
     <x:Double x:Key="HeaderHeight">36</x:Double>
     <x:Double x:Key="NavigationItemHeight">36</x:Double>
     <x:Double x:Key="HamburgerMenuButtonHeight">32</x:Double>
@@ -195,9 +195,9 @@
                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                               Content="{TemplateBinding Header}"
                               ContentTemplate="{TemplateBinding HeaderTemplate}"
-                              TextBlock.FontFamily="{TemplateBinding FontFamily}"
-                              TextBlock.FontSize="{TemplateBinding FontSize}"
-                              TextBlock.FontWeight="{TemplateBinding FontWeight}" />
+                              TextElement.FontFamily="{TemplateBinding FontFamily}"
+                              TextElement.FontSize="{TemplateBinding FontSize}"
+                              TextElement.FontWeight="{TemplateBinding FontWeight}" />
           </Panel>
         </Border>
       </ControlTemplate>
@@ -216,25 +216,25 @@
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           CornerRadius="{TemplateBinding CornerRadius}"
-                          TextBlock.FontFamily="{TemplateBinding FontFamily}"
-                          TextBlock.FontSize="{TemplateBinding FontSize}"
-                          TextBlock.FontWeight="{TemplateBinding FontWeight}" />
+                          TextElement.FontFamily="{TemplateBinding FontFamily}"
+                          TextElement.FontSize="{TemplateBinding FontSize}"
+                          TextElement.FontWeight="{TemplateBinding FontWeight}" />
       </ControlTemplate>
     </Setter>
   </Style>
   <Style Selector="catalog|HamburgerMenu > TabItem /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton /template/ ContentPresenter">
     <Setter Property="Border.Background" Value="Transparent" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemBaseHighColor}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SystemBaseHighColor}" />
   </Style>
   <Style Selector="catalog|HamburgerMenu > TabItem:pointerover /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton:pointerover /template/ ContentPresenter">
     <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
     <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
   </Style>
   <Style Selector="catalog|HamburgerMenu > TabItem:pressed /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton:pressed /template/ ContentPresenter">
     <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
     <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
   </Style>
   <Style Selector=":is(Button).NavigationButton:pressed">
     <Setter Property="RenderTransform" Value="none" />
diff --git a/samples/Sandbox/Sandbox.csproj b/samples/Sandbox/Sandbox.csproj
index 8f2812e048..eab654acb6 100644
--- a/samples/Sandbox/Sandbox.csproj
+++ b/samples/Sandbox/Sandbox.csproj
@@ -8,7 +8,9 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
   </ItemGroup>
   
   <Import Project="..\..\build\SampleApp.props" />
diff --git a/samples/VirtualizationDemo/VirtualizationDemo.csproj b/samples/VirtualizationDemo/VirtualizationDemo.csproj
index 2c6ff74e5e..bd6054327f 100644
--- a/samples/VirtualizationDemo/VirtualizationDemo.csproj
+++ b/samples/VirtualizationDemo/VirtualizationDemo.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
   </ItemGroup>
diff --git a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
index cd9963a2e5..81b94b4d09 100644
--- a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
+++ b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
@@ -22,6 +22,7 @@
       </EmbeddedResource>
     </ItemGroup>
     <ItemGroup>
+        <ProjectReference Include="..\..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
         <ProjectReference Include="..\..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
         <ProjectReference Include="..\..\..\src\Windows\Avalonia.Win32\Avalonia.Win32.csproj" />
         <ProjectReference Include="..\..\MiniMvvm\MiniMvvm.csproj" />
diff --git a/samples/interop/NativeEmbedSample/App.xaml b/samples/interop/NativeEmbedSample/App.xaml
deleted file mode 100644
index e35ade4087..0000000000
--- a/samples/interop/NativeEmbedSample/App.xaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Application xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="NativeEmbedSample.App">
-  <Application.Styles>
-    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-    <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
-  </Application.Styles>
-</Application>
diff --git a/samples/interop/NativeEmbedSample/App.xaml.cs b/samples/interop/NativeEmbedSample/App.xaml.cs
deleted file mode 100644
index cb17cfc35d..0000000000
--- a/samples/interop/NativeEmbedSample/App.xaml.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
-
-namespace NativeEmbedSample
-{
-    public class App : Application
-    {
-        public override void Initialize()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        public override void OnFrameworkInitializationCompleted()
-        {
-            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
-                desktopLifetime.MainWindow = new MainWindow();
-
-            base.OnFrameworkInitializationCompleted();
-        }
-    }
-}
diff --git a/samples/interop/NativeEmbedSample/EmbedSample.cs b/samples/interop/NativeEmbedSample/EmbedSample.cs
deleted file mode 100644
index ab9df11e19..0000000000
--- a/samples/interop/NativeEmbedSample/EmbedSample.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-using Avalonia.Controls;
-using Avalonia.Platform;
-using Avalonia.Threading;
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.WebKit;
-using Encoding = SharpDX.Text.Encoding;
-
-namespace NativeEmbedSample
-{
-    public class EmbedSample : NativeControlHost
-    {
-        public bool IsSecond { get; set; }
-        private Process _mplayer;
-
-        IPlatformHandle CreateLinux(IPlatformHandle parent)
-        {
-            if (IsSecond)
-            {
-                var chooser = GtkHelper.CreateGtkFileChooser(parent.Handle);
-                if (chooser != null)
-                    return chooser;
-            }
-
-            var control = base.CreateNativeControlCore(parent);
-            var nodes = Path.GetFullPath(Path.Combine(typeof(EmbedSample).Assembly.GetModules()[0].FullyQualifiedName,
-                "..",
-                "nodes.mp4"));
-            _mplayer = Process.Start(new ProcessStartInfo("mplayer",
-                $"-vo x11 -zoom -loop 0 -wid {control.Handle.ToInt64()} \"{nodes}\"")
-            {
-                UseShellExecute = false,
-
-            });
-            return control;
-        }
-
-        void DestroyLinux(IPlatformHandle handle)
-        {
-            _mplayer?.Kill();
-            _mplayer = null;
-            base.DestroyNativeControlCore(handle);
-        }
-
-        private const string RichText =
-            @"{\rtf1\ansi\ansicpg1251\deff0\nouicompat\deflang1049{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
-{\colortbl ;\red255\green0\blue0;\red0\green77\blue187;\red0\green176\blue80;\red155\green0\blue211;\red247\green150\blue70;\red75\green172\blue198;}
-{\*\generator Riched20 6.3.9600}\viewkind4\uc1 
-\pard\sa200\sl276\slmult1\f0\fs22\lang9 <PREFIX>I \i am\i0  a \cf1\b Rich Text \cf0\b0\fs24 control\cf2\fs28 !\cf3\fs32 !\cf4\fs36 !\cf1\fs40 !\cf5\fs44 !\cf6\fs48 !\cf0\fs44\par
-}";
-
-        IPlatformHandle CreateWin32(IPlatformHandle parent)
-        {
-            WinApi.LoadLibrary("Msftedit.dll");
-            var handle = WinApi.CreateWindowEx(0, "RICHEDIT50W",
-                @"Rich Edit",
-                0x800000 | 0x10000000 | 0x40000000 | 0x800000 | 0x10000 | 0x0004, 0, 0, 1, 1, parent.Handle,
-                IntPtr.Zero, WinApi.GetModuleHandle(null), IntPtr.Zero);
-            var st = new WinApi.SETTEXTEX { Codepage = 65001, Flags = 0x00000008 };
-            var text = RichText.Replace("<PREFIX>", IsSecond ? "\\qr " : "");
-            var bytes = Encoding.UTF8.GetBytes(text);
-            WinApi.SendMessage(handle, 0x0400 + 97, ref st, bytes);
-            return new PlatformHandle(handle, "HWND");
-
-        }
-
-        void DestroyWin32(IPlatformHandle handle)
-        {
-            WinApi.DestroyWindow(handle.Handle);
-        }
-
-        IPlatformHandle CreateOSX(IPlatformHandle parent)
-        {
-            // Note: We are using MonoMac for example purposes
-            // It shouldn't be used in production apps
-            MacHelper.EnsureInitialized();
-
-            var webView = new WebView();
-            Dispatcher.UIThread.Post(() =>
-            {
-                webView.MainFrame.LoadRequest(new NSUrlRequest(new NSUrl(
-                    IsSecond ? "https://bing.com": "https://google.com/")));
-            });
-            return new MacOSViewHandle(webView);
-
-        }
-
-        void DestroyOSX(IPlatformHandle handle)
-        {
-            ((MacOSViewHandle)handle).Dispose();
-        }
-        
-        protected override IPlatformHandle CreateNativeControlCore(IPlatformHandle parent)
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                return CreateLinux(parent);
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                return CreateWin32(parent);
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                return CreateOSX(parent);
-            return base.CreateNativeControlCore(parent);
-        }
-
-        protected override void DestroyNativeControlCore(IPlatformHandle control)
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                DestroyLinux(control);
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                DestroyWin32(control);
-            else if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                DestroyOSX(control);
-            else
-                base.DestroyNativeControlCore(control);
-        }
-    }
-}
diff --git a/samples/interop/NativeEmbedSample/GtkHelper.cs b/samples/interop/NativeEmbedSample/GtkHelper.cs
deleted file mode 100644
index e389a51ef5..0000000000
--- a/samples/interop/NativeEmbedSample/GtkHelper.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Avalonia.Controls.Platform;
-using Avalonia.Platform;
-using Avalonia.Platform.Interop;
-using Avalonia.X11.NativeDialogs;
-using static Avalonia.X11.NativeDialogs.Gtk;
-using static Avalonia.X11.NativeDialogs.Glib;
-namespace NativeEmbedSample
-{
-    public class GtkHelper
-    {
-        private static  Task<bool> s_gtkTask;
-        class FileChooser : INativeControlHostDestroyableControlHandle
-        {
-            private readonly IntPtr _widget;
-
-            public FileChooser(IntPtr widget, IntPtr xid)
-            {
-                _widget = widget;
-                Handle = xid;
-            }
-
-            public IntPtr Handle { get; }
-            public string HandleDescriptor => "XID";
-            public void Destroy()
-            {
-                RunOnGlibThread(() =>
-                {
-                    gtk_widget_destroy(_widget);
-                    return 0;
-                }).Wait();
-            }
-        }
-
-        
-        
-        public static IPlatformHandle CreateGtkFileChooser(IntPtr parentXid)
-        {
-            if (s_gtkTask == null)
-                s_gtkTask = StartGtk();
-            if (!s_gtkTask.Result)
-                return null;
-            return RunOnGlibThread(() =>
-            {
-                using (var title = new Utf8Buffer("Embedded"))
-                {
-                    var widget = gtk_file_chooser_dialog_new(title, IntPtr.Zero, GtkFileChooserAction.SelectFolder,
-                        IntPtr.Zero);
-                    gtk_widget_realize(widget);
-                    var xid = gdk_x11_window_get_xid(gtk_widget_get_window(widget));
-                    gtk_window_present(widget);
-                    return new FileChooser(widget,  xid);
-                }
-            }).Result;
-        }
-    }
-}
diff --git a/samples/interop/NativeEmbedSample/MacHelper.cs b/samples/interop/NativeEmbedSample/MacHelper.cs
deleted file mode 100644
index 74a06a0a0c..0000000000
--- a/samples/interop/NativeEmbedSample/MacHelper.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using Avalonia.Platform;
-using MonoMac.AppKit;
-
-namespace NativeEmbedSample
-{
-    public class MacHelper
-    {
-        private static bool _isInitialized;
-
-        public static void EnsureInitialized()
-        {
-            if (_isInitialized)
-                return;
-            _isInitialized = true;
-            NSApplication.Init();
-        }
-    }
-
-    class MacOSViewHandle : IPlatformHandle, IDisposable
-    {
-        private NSView _view;
-
-        public MacOSViewHandle(NSView view)
-        {
-            _view = view;
-        }
-
-        public IntPtr Handle => _view?.Handle ?? IntPtr.Zero;
-        public string HandleDescriptor => "NSView";
-
-        public void Dispose()
-        {
-            _view.Dispose();
-            _view = null;
-        }
-    }
-
-}
diff --git a/samples/interop/NativeEmbedSample/MainWindow.xaml b/samples/interop/NativeEmbedSample/MainWindow.xaml
deleted file mode 100644
index f2161a1bea..0000000000
--- a/samples/interop/NativeEmbedSample/MainWindow.xaml
+++ /dev/null
@@ -1,52 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui" MinWidth="500" MinHeight="300"
-        Width="1024" Height="800"
-        Title="Native embedding sample"
-        xmlns:local="clr-namespace:NativeEmbedSample"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="NativeEmbedSample.MainWindow">
-  <DockPanel>
-    <Menu DockPanel.Dock="Top">
-      <MenuItem Header="Test">
-        <MenuItem Header="SubMenu">
-          <MenuItem Header="Item 1"/>
-          <MenuItem Header="Item 2"/>
-          <MenuItem Header="Item 3"/>  
-        </MenuItem>
-        <MenuItem Header="Item 1"/>
-        <MenuItem Header="Item 2"/>
-        <MenuItem Header="Item 3"/>  
-      </MenuItem>
-    </Menu>
-    <DockPanel DockPanel.Dock="Top">
-      <Button DockPanel.Dock="Right" Click="ShowPopupDelay">Show popup (delay)</Button>
-      <Button DockPanel.Dock="Right" Click="ShowPopup">Show popup</Button>
-      <Border DockPanel.Dock="Right" Background="#c0c0c0">
-        <ToolTip.Tip>
-          <ToolTip>
-              <TextBlock>Text</TextBlock>
-          </ToolTip>
-        </ToolTip.Tip>
-        <TextBlock>Tooltip</TextBlock>
-      </Border>
-      <TextBox Text="Lorem ipsum dolor sit amet"/>
-      
-    </DockPanel>
-    <Grid ColumnDefinitions="*,5,*">
-      <DockPanel>
-        <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
-          <CheckBox x:Name="firstVisible" IsChecked="True"/>
-          <TextBlock>Visible</TextBlock>
-        </StackPanel>
-        <local:EmbedSample IsVisible="{Binding #firstVisible.IsChecked}"/>
-      </DockPanel>
-      <GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Stretch" />
-      <DockPanel Grid.Column="2">
-        <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
-          <CheckBox x:Name="secondVisible" IsChecked="True"/>
-          <TextBlock>Visible</TextBlock>
-        </StackPanel>
-        <local:EmbedSample IsSecond="True" IsVisible="{Binding #secondVisible.IsChecked}"/>
-      </DockPanel>
-    </Grid>
-  </DockPanel>
-</Window>
diff --git a/samples/interop/NativeEmbedSample/MainWindow.xaml.cs b/samples/interop/NativeEmbedSample/MainWindow.xaml.cs
deleted file mode 100644
index 4324aa2762..0000000000
--- a/samples/interop/NativeEmbedSample/MainWindow.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-
-namespace NativeEmbedSample
-{
-    public class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            AvaloniaXamlLoader.Load(this);
-            this.AttachDevTools();
-        }
-
-        public async void ShowPopupDelay(object sender, RoutedEventArgs args)
-        {
-            await Task.Delay(3000);
-            ShowPopup(sender, args);
-        }
-
-        public void ShowPopup(object sender, RoutedEventArgs args)
-        {
-
-            new ContextMenu()
-            {
-                Items = new List<MenuItem>
-                {
-                    new MenuItem() { Header = "Test" }, new MenuItem() { Header = "Test" }
-                }
-            }.Open((Control)sender);
-        }
-    }
-}
diff --git a/samples/interop/NativeEmbedSample/NativeEmbedSample.csproj b/samples/interop/NativeEmbedSample/NativeEmbedSample.csproj
deleted file mode 100644
index c25442b52c..0000000000
--- a/samples/interop/NativeEmbedSample/NativeEmbedSample.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MonoMac.NetStandard" Version="0.0.4" />
-    <ProjectReference Include="..\..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
-    <ProjectReference Include="..\..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
-    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
-
-    <AvaloniaResource Include="**\*.xaml">
-      <SubType>Designer</SubType>
-    </AvaloniaResource>
-    <None Remove="nodes.mp4" />
-    <Content Include="nodes.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Compile Include="..\..\..\src\Avalonia.X11\NativeDialogs\Gtk.cs" />
-  </ItemGroup>
-
-  <Import Project="..\..\..\build\SampleApp.props" />
-  <Import Project="..\..\..\build\BuildTargets.targets" />
-  <Import Project="..\..\..\build\ReferenceCoreLibraries.props" />
-</Project>
diff --git a/samples/interop/NativeEmbedSample/Program.cs b/samples/interop/NativeEmbedSample/Program.cs
deleted file mode 100644
index baa7837667..0000000000
--- a/samples/interop/NativeEmbedSample/Program.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Avalonia;
-
-namespace NativeEmbedSample
-{
-    class Program
-    {
-        static int Main(string[] args) => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
-
-        public static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure<App>()
-                .With(new AvaloniaNativePlatformOptions()
-                {
-                })
-                .UsePlatformDetect();
-
-    }
-}
diff --git a/samples/interop/NativeEmbedSample/WinApi.cs b/samples/interop/NativeEmbedSample/WinApi.cs
deleted file mode 100644
index 8e5bcdf49e..0000000000
--- a/samples/interop/NativeEmbedSample/WinApi.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace NativeEmbedSample
-{
-    public unsafe class WinApi
-    {
-        public enum CommonControls : uint
-        {
-            ICC_LISTVIEW_CLASSES   = 0x00000001, // listview, header
-            ICC_TREEVIEW_CLASSES   = 0x00000002, // treeview, tooltips
-            ICC_BAR_CLASSES    = 0x00000004, // toolbar, statusbar, trackbar, tooltips
-            ICC_TAB_CLASSES    = 0x00000008, // tab, tooltips
-            ICC_UPDOWN_CLASS       = 0x00000010, // updown
-            ICC_PROGRESS_CLASS     = 0x00000020, // progress
-            ICC_HOTKEY_CLASS       = 0x00000040, // hotkey
-            ICC_ANIMATE_CLASS      = 0x00000080, // animate
-            ICC_WIN95_CLASSES      = 0x000000FF,
-            ICC_DATE_CLASSES       = 0x00000100, // month picker, date picker, time picker, updown
-            ICC_USEREX_CLASSES     = 0x00000200, // comboex
-            ICC_COOL_CLASSES       = 0x00000400, // rebar (coolbar) control
-            ICC_INTERNET_CLASSES   = 0x00000800,
-            ICC_PAGESCROLLER_CLASS = 0x00001000,  // page scroller
-            ICC_NATIVEFNTCTL_CLASS = 0x00002000,  // native font control
-            ICC_STANDARD_CLASSES   = 0x00004000,
-            ICC_LINK_CLASS     = 0x00008000
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct INITCOMMONCONTROLSEX
-        {
-            public int dwSize;
-            public uint dwICC;
-        }
-
-        [DllImport("Comctl32.dll")]
-        public static extern void InitCommonControlsEx(ref INITCOMMONCONTROLSEX init);
-
-        [DllImport("user32.dll", SetLastError = true)]
-        public static extern bool DestroyWindow(IntPtr hwnd);
-
-        [DllImport("kernel32.dll")]
-        public static extern IntPtr LoadLibrary(string lib);
-
-
-        [DllImport("kernel32.dll")]
-        public static extern IntPtr GetModuleHandle(string lpModuleName);
-
-        [DllImport("user32.dll", SetLastError = true)]
-        public static extern IntPtr CreateWindowEx(
-            int dwExStyle,
-            string lpClassName,
-            string lpWindowName,
-            uint dwStyle,
-            int x,
-            int y,
-            int nWidth,
-            int nHeight,
-            IntPtr hWndParent,
-            IntPtr hMenu,
-            IntPtr hInstance,
-            IntPtr lpParam);
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct SETTEXTEX
-        {
-            public uint Flags;
-            public uint Codepage;
-        }
-
-        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "SendMessageW")]
-        public static extern IntPtr SendMessage(IntPtr hWnd, int Msg, ref SETTEXTEX wParam, byte[] lParam);
-    }
-}
diff --git a/src/Android/Avalonia.Android/AndroidInputMethod.cs b/src/Android/Avalonia.Android/AndroidInputMethod.cs
index b6491a5890..880b210a6c 100644
--- a/src/Android/Avalonia.Android/AndroidInputMethod.cs
+++ b/src/Android/Avalonia.Android/AndroidInputMethod.cs
@@ -13,7 +13,6 @@ namespace Avalonia.Android
     {
         private readonly TView _host;
         private readonly InputMethodManager _imm;
-        private IInputElement _inputElement;
 
         public AndroidInputMethod(TView host)
         {
@@ -33,8 +32,10 @@ namespace Avalonia.Android
             _imm.RestartInput(_host);
         }
 
-        public void SetActive(bool active)
+        public void SetClient(ITextInputMethodClient client)
         {
+            var active = client is { };
+            
             if (active)
             {
                 _host.RequestFocus();
@@ -49,20 +50,8 @@ namespace Avalonia.Android
         {
         }
 
-        public void SetOptions(TextInputOptionsQueryEventArgs options)
+        public void SetOptions(TextInputOptions options)
         {
-            if (_inputElement != null)
-            {
-                _inputElement.PointerReleased -= RestoreSoftKeyboard;
-            }
-
-            _inputElement = options.Source as InputElement;
-
-            if (_inputElement == null)
-            {
-                _imm.HideSoftInputFromWindow(_host.WindowToken, HideSoftInputFlags.None);
-            }
-
             _host.InitEditorInfo((outAttrs) =>
             {
                 outAttrs.InputType = options.ContentType switch
@@ -70,7 +59,7 @@ namespace Avalonia.Android
                     TextInputContentType.Email => global::Android.Text.InputTypes.TextVariationEmailAddress,
                     TextInputContentType.Number => global::Android.Text.InputTypes.ClassNumber,
                     TextInputContentType.Password => global::Android.Text.InputTypes.TextVariationPassword,
-                    TextInputContentType.Phone => global::Android.Text.InputTypes.ClassPhone,
+                    TextInputContentType.Digits => global::Android.Text.InputTypes.ClassPhone,
                     TextInputContentType.Url => global::Android.Text.InputTypes.TextVariationUri,
                     _ => global::Android.Text.InputTypes.ClassText
                 };
@@ -86,8 +75,6 @@ namespace Avalonia.Android
 
                 outAttrs.ImeOptions |= ImeFlags.NoFullscreen | ImeFlags.NoExtractUi;
             });
-
-            //_inputElement.PointerReleased += RestoreSoftKeyboard;
         }
 
         private void RestoreSoftKeyboard(object sender, PointerReleasedEventArgs e)
diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs
index 61aa6ce946..c7dd896cb8 100644
--- a/src/Android/Avalonia.Android/AndroidPlatform.cs
+++ b/src/Android/Avalonia.Android/AndroidPlatform.cs
@@ -61,8 +61,6 @@ namespace Avalonia.Android
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
 
-            SkiaPlatform.Initialize();
-
             if (options.UseGpu)
             {
                 EglPlatformOpenGlInterface.TryInitialize();
diff --git a/src/Android/Avalonia.Android/AndroidViewControlHandle.cs b/src/Android/Avalonia.Android/AndroidViewControlHandle.cs
new file mode 100644
index 0000000000..e999d198c6
--- /dev/null
+++ b/src/Android/Avalonia.Android/AndroidViewControlHandle.cs
@@ -0,0 +1,32 @@
+#nullable enable
+
+using System;
+
+using Android.Views;
+
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+
+namespace Avalonia.Android
+{
+    public class AndroidViewControlHandle : INativeControlHostDestroyableControlHandle
+    {
+        internal const string AndroidDescriptor = "JavaObjectHandle";
+
+        public AndroidViewControlHandle(View view)
+        {
+            View = view;
+        }
+
+        public View View { get; }
+
+        public string HandleDescriptor => AndroidDescriptor;
+
+        IntPtr IPlatformHandle.Handle => View.Handle;
+
+        public void Destroy()
+        {
+            View?.Dispose();
+        }
+    }
+}
diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj
index 203c3accd6..6688dde8f5 100644
--- a/src/Android/Avalonia.Android/Avalonia.Android.csproj
+++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj
@@ -1,7 +1,6 @@
-<Project Sdk="Xamarin.Legacy.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-android</TargetFrameworks>
-    <TargetFrameworks Condition="'$(MSBuildRuntimeType)' != 'Core'">$(TargetFrameworks);monoandroid11.0</TargetFrameworks>
+    <TargetFramework>net6.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
@@ -16,4 +15,5 @@
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
   </ItemGroup>
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Android/Avalonia.Android/AvaloniaActivity.cs b/src/Android/Avalonia.Android/AvaloniaActivity.cs
index f5d620a97a..f3692d33d7 100644
--- a/src/Android/Avalonia.Android/AvaloniaActivity.cs
+++ b/src/Android/Avalonia.Android/AvaloniaActivity.cs
@@ -31,21 +31,22 @@ namespace Avalonia.Android
             
             CustomizeAppBuilder(builder);
 
-            View = new AvaloniaView(this);
-            SetContentView(View);
 
             var lifetime = new SingleViewLifetime();
-            lifetime.View = View;
 
             builder.AfterSetup(x =>
             {
                 _viewModel = new ViewModelProvider(this).Get(Java.Lang.Class.FromType(typeof(AvaloniaViewModel))) as AvaloniaViewModel;
 
+                View = new AvaloniaView(this);
                 if (_viewModel.Content != null)
                 {
                     View.Content = _viewModel.Content;
                 }
 
+                SetContentView(View);
+                lifetime.View = View;
+
                 View.Prepare();
             });
 
diff --git a/src/Android/Avalonia.Android/AvaloniaView.cs b/src/Android/Avalonia.Android/AvaloniaView.cs
index 8177cf1f69..94e863210b 100644
--- a/src/Android/Avalonia.Android/AvaloniaView.cs
+++ b/src/Android/Avalonia.Android/AvaloniaView.cs
@@ -15,13 +15,12 @@ namespace Avalonia.Android
         private EmbeddableControlRoot _root;
         private readonly ViewImpl _view;
 
-        private IDisposable? _timerSubscription;
+        private IDisposable _timerSubscription;
 
         public AvaloniaView(Context context) : base(context)
         {
-            _view = new ViewImpl(context);
+            _view = new ViewImpl(this);
             AddView(_view.View);
-            
         }
 
         internal void Prepare ()
@@ -30,6 +29,8 @@ namespace Avalonia.Android
             _root.Prepare();
         }
 
+        internal TopLevelImpl TopLevelImpl => _view;
+
         public object Content
         {
             get { return _root.Content; }
@@ -73,7 +74,7 @@ namespace Avalonia.Android
 
         class ViewImpl : TopLevelImpl
         {
-            public ViewImpl(Context context) : base(context)
+            public ViewImpl(AvaloniaView avaloniaView) : base(avaloniaView)
             {
                 View.Focusable = true;
                 View.FocusChange += ViewImpl_FocusChange;
diff --git a/src/Android/Avalonia.Android/Platform/AndroidNativeControlHostImpl.cs b/src/Android/Avalonia.Android/Platform/AndroidNativeControlHostImpl.cs
new file mode 100644
index 0000000000..4738bd86f9
--- /dev/null
+++ b/src/Android/Avalonia.Android/Platform/AndroidNativeControlHostImpl.cs
@@ -0,0 +1,139 @@
+#nullable enable
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+using Android.Views;
+using Android.Widget;
+
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+
+namespace Avalonia.Android.Platform
+{
+    internal class AndroidNativeControlHostImpl : INativeControlHostImpl
+    {
+        private readonly AvaloniaView _avaloniaView;
+
+        public AndroidNativeControlHostImpl(AvaloniaView avaloniaView)
+        {
+            _avaloniaView = avaloniaView;
+        }
+
+        public INativeControlHostDestroyableControlHandle CreateDefaultChild(IPlatformHandle parent)
+        {
+            return new AndroidViewControlHandle(new FrameLayout(_avaloniaView.Context!));
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(Func<IPlatformHandle, IPlatformHandle> create)
+        {
+            var parent = new AndroidViewControlHandle(_avaloniaView);
+            AndroidNativeControlAttachment? attachment = null;
+            try
+            {
+                var child = create(parent);
+                // It has to be assigned to the variable before property setter is called so we dispose it on exception
+#pragma warning disable IDE0017 // Simplify object initialization
+                attachment = new AndroidNativeControlAttachment(child);
+#pragma warning restore IDE0017 // Simplify object initialization
+                attachment.AttachedTo = this;
+                return attachment;
+            }
+            catch
+            {
+                attachment?.Dispose();
+                throw;
+            }
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(IPlatformHandle handle)
+        {
+            return new AndroidNativeControlAttachment(handle)
+            {
+                AttachedTo = this
+            };
+        }
+
+        public bool IsCompatibleWith(IPlatformHandle handle) => handle.HandleDescriptor == AndroidViewControlHandle.AndroidDescriptor;
+
+        private class AndroidNativeControlAttachment : INativeControlHostControlTopLevelAttachment
+        {
+            private View? _view;
+            private AndroidNativeControlHostImpl? _attachedTo;
+
+            public AndroidNativeControlAttachment(IPlatformHandle child)
+            {
+                _view = (child as AndroidViewControlHandle)?.View
+                    ?? Java.Lang.Object.GetObject<View>(child.Handle, global::Android.Runtime.JniHandleOwnership.DoNotTransfer);
+            }
+
+            [MemberNotNull(nameof(_view))]
+            private void CheckDisposed()
+            {
+                if (_view == null)
+                    throw new ObjectDisposedException(nameof(AndroidNativeControlAttachment));
+            }
+
+            public void Dispose()
+            {
+                if (_view != null && _attachedTo?._avaloniaView is ViewGroup parent)
+                {
+                    parent.RemoveView(_view);
+                }
+                _attachedTo = null;
+                _view?.Dispose();
+                _view = null;
+            }
+
+            public INativeControlHostImpl? AttachedTo
+            {
+                get => _attachedTo;
+                set
+                {
+                    CheckDisposed();
+
+                    var oldAttachedTo = _attachedTo;
+                    _attachedTo = (AndroidNativeControlHostImpl?)value;
+                    if (_attachedTo == null)
+                    {
+                        oldAttachedTo?._avaloniaView.RemoveView(_view);
+                    }
+                    else
+                    {
+                        _attachedTo._avaloniaView.AddView(_view);
+                    }
+                }
+            }
+
+            public bool IsCompatibleWith(INativeControlHostImpl host) => host is AndroidNativeControlHostImpl;
+
+            public void HideWithSize(Size size)
+            {
+                CheckDisposed();
+                if (_attachedTo == null)
+                    return;
+
+                size *= _attachedTo._avaloniaView.TopLevelImpl.RenderScaling;
+                _view.Visibility = ViewStates.Gone;
+                _view.LayoutParameters = new FrameLayout.LayoutParams(Math.Max(1, (int)size.Width), Math.Max(1, (int)size.Height));
+                _view.RequestLayout();
+            }
+
+            public void ShowInBounds(Rect bounds)
+            {
+                CheckDisposed();
+                if (_attachedTo == null)
+                    throw new InvalidOperationException("The control isn't currently attached to a toplevel");
+
+                bounds *= _attachedTo._avaloniaView.TopLevelImpl.RenderScaling;
+                _view.Visibility = ViewStates.Visible;
+                _view.LayoutParameters = new FrameLayout.LayoutParams(Math.Max(1, (int)bounds.Width), Math.Max(1, (int)bounds.Height))
+                {
+                    LeftMargin = (int)bounds.X,
+                    TopMargin = (int)bounds.Y
+                };
+                _view.RequestLayout();
+            }
+        }
+    }
+}
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index 34784612f1..5343b57251 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -2,18 +2,22 @@ using System;
 using Android.Content;
 using Android.Graphics;
 using Android.OS;
+using Android.Runtime;
 using Android.Util;
 using Android.Views;
+using Avalonia.Android.Platform.SkiaPlatform;
 using Avalonia.Platform;
 
 namespace Avalonia.Android
 {
-    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformHandle
+    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformNativeSurfaceHandle
     {
         bool _invalidateQueued;
         readonly object _lock = new object();
         private readonly Handler _handler;
-   
+
+        IntPtr IPlatformHandle.Handle =>
+            AndroidFramebuffer.ANativeWindow_fromSurface(JNIEnv.Handle, Holder.Surface.Handle);
 
         public InvalidationAwareSurfaceView(Context context) : base(context)
         {
@@ -25,7 +29,7 @@ namespace Avalonia.Android
         {
             lock (_lock)
             {
-                if(_invalidateQueued)
+                if (_invalidateQueued)
                     return;
                 _handler.Post(() =>
                 {
@@ -70,7 +74,7 @@ namespace Avalonia.Android
         public void SurfaceDestroyed(ISurfaceHolder holder)
         {
             Log.Info("AVALONIA", "Surface Destroyed");
-            
+
         }
 
         protected void DoDraw()
@@ -83,5 +87,9 @@ namespace Avalonia.Android
         }
         protected abstract void Draw();
         public string HandleDescriptor => "SurfaceView";
+
+        public PixelSize Size => new PixelSize(Holder.SurfaceFrame.Width(), Holder.SurfaceFrame.Height());
+
+        public double Scaling => Resources.DisplayMetrics.Density;
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index 0afb1db141..10f98609bf 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using Android.Content;
 using Android.Graphics;
-using Android.Runtime;
 using Android.Views;
 using Android.Views.InputMethods;
 using Avalonia.Android.OpenGL;
@@ -21,7 +20,7 @@ using Avalonia.Rendering;
 
 namespace Avalonia.Android.Platform.SkiaPlatform
 {
-    class TopLevelImpl : IAndroidView, ITopLevelImpl, EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo, ITopLevelImplWithTextInputMethod
+    class TopLevelImpl : IAndroidView, ITopLevelImpl, EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo, ITopLevelImplWithTextInputMethod, ITopLevelImplWithNativeControlHost
     {
         private readonly IGlPlatformSurface _gl;
         private readonly IFramebufferPlatformSurface _framebuffer;
@@ -31,21 +30,22 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         private readonly ITextInputMethodImpl _textInputMethod;
         private ViewImpl _view;
 
-        public TopLevelImpl(Context context, bool placeOnTop = false)
+        public TopLevelImpl(AvaloniaView avaloniaView, bool placeOnTop = false)
         {
-            _view = new ViewImpl(context, this, placeOnTop);
+            _view = new ViewImpl(avaloniaView.Context, this, placeOnTop);
             _textInputMethod = new AndroidInputMethod<ViewImpl>(_view);
             _keyboardHelper = new AndroidKeyboardEventsHelper<TopLevelImpl>(this);
             _touchHelper = new AndroidTouchEventsHelper<TopLevelImpl>(this, () => InputRoot,
                 GetAvaloniaPointFromEvent);
-
             _gl = GlPlatformSurface.TryCreate(this);
             _framebuffer = new FramebufferManager(this);
 
-            RenderScaling = (int)_view.Resources.DisplayMetrics.Density;
+            RenderScaling = _view.Scaling;
 
             MaxClientSize = new PixelSize(_view.Resources.DisplayMetrics.WidthPixels,
                 _view.Resources.DisplayMetrics.HeightPixels).ToSize(RenderScaling);
+
+            NativeControlHost = new AndroidNativeControlHostImpl(avaloniaView);
         }
 
         public virtual Point GetAvaloniaPointFromEvent(MotionEvent e, int pointerIndex) =>
@@ -77,7 +77,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
         public IPlatformHandle Handle => _view;
 
-        public IEnumerable<object> Surfaces => new object[] { _gl, _framebuffer };
+        public IEnumerable<object> Surfaces => new object[] { _gl, _framebuffer, Handle };
 
         public IRenderer CreateRenderer(IRenderRoot root) =>
             AndroidPlatform.Options.UseDeferredRendering
@@ -216,15 +216,16 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels => new AcrylicPlatformCompensationLevels(1, 1, 1);
 
-        IntPtr EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo.Handle =>
-            AndroidFramebuffer.ANativeWindow_fromSurface(JNIEnv.Handle, _view.Holder.Surface.Handle);
+        IntPtr EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo.Handle => ((IPlatformHandle)_view).Handle;
 
-        public PixelSize Size => new PixelSize(_view.Holder.SurfaceFrame.Width(), _view.Holder.SurfaceFrame.Height());
+        public PixelSize Size => _view.Size;
 
         public double Scaling => RenderScaling;
 
         public ITextInputMethodImpl TextInputMethod => _textInputMethod;
 
+        public INativeControlHostImpl NativeControlHost { get; }
+
         public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
         {
             throw new NotImplementedException();
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
index 2b2a9dd2b4..4cae700c0a 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Android.Platform.Specific.Helpers
             return DispatchKeyEventInternal(e, out callBase);
         }
 
-        string? UnicodeTextInput(KeyEvent keyEvent)
+        string UnicodeTextInput(KeyEvent keyEvent)
         {
             return keyEvent.Action == KeyEventActions.Multiple
                 && keyEvent.RepeatCount == 0
diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
deleted file mode 100644
index 8cb7aa1cfd..0000000000
--- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
+++ /dev/null
@@ -1,37 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0-android</TargetFramework>
-    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
-    <OutputType>Exe</OutputType>
-    <Nullable>enable</Nullable>
-    <ApplicationId>com.Avalonia.AndroidTestApplication</ApplicationId>
-    <ApplicationVersion>1</ApplicationVersion>
-    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
-    <AndroidPackageFormat>apk</AndroidPackageFormat>
-    <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
-    <DebugSymbols>True</DebugSymbols>
-    <RunAOTCompilation>True</RunAOTCompilation>
-    <EnableLLVM>True</EnableLLVM>
-    <!--<AndroidEnableProfiledAot>True</AndroidEnableProfiledAot>-->
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <None Remove="Assets\AboutAssets.txt" />
-  </ItemGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <BundleAssemblies>True</BundleAssemblies>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <BundleAssemblies>True</BundleAssemblies>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
-    <ProjectReference Include="..\Avalonia.Android\Avalonia.Android.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
deleted file mode 100644
index 471b982d9e..0000000000
--- a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using Android.App;
-using Android.Content.PM;
-using Android.OS;
-using Avalonia.Android;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Media;
-using Avalonia.Styling;
-using Avalonia.Themes.Default;
-
-namespace Avalonia.AndroidTestApplication
-{
-    [Activity(Label = "Main",
-        MainLauncher = true,
-        Icon = "@drawable/icon",
-         Theme = "@style/Theme.AppCompat.NoActionBar",
-         ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize,
-        LaunchMode = LaunchMode.SingleInstance/*,
-        ScreenOrientation = ScreenOrientation.Landscape*/)]
-    public class MainBaseActivity : AvaloniaActivity
-    {
-        protected override void OnCreate(Bundle savedInstanceState)
-        {
-            if (Avalonia.Application.Current == null)
-            {
-                AppBuilder.Configure<App>()
-                    .UseAndroid()
-                    .SetupWithoutStarting();
-            }
-            base.OnCreate(savedInstanceState);
-            Content = App.CreateSimpleWindow();
-        }
-    }
-
-    public class App : Application
-    {
-        public override void Initialize()
-        {
-            Styles.Add(new DefaultTheme());
-
-            var baseLight = (IStyle)AvaloniaXamlLoader.Load(
-                new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"));
-            Styles.Add(baseLight);
-
-
-        }
-
-        // This provides a simple UI tree for testing input handling, drawing, etc
-        public static ContentControl CreateSimpleWindow()
-        {
-            ContentControl window = new ContentControl()
-            {
-                Background = Brushes.Red,
-                Content = new StackPanel
-                {
-                    Margin = new Thickness(30),
-                    Background = Brushes.Yellow,
-                    Children =
-                    {
-                        new TextBlock
-                        {
-                            Text = "TEXT BLOCK",
-                            Width = 300,
-                            Height = 40,
-                            Background = Brushes.White,
-                            Foreground = Brushes.Black
-                        },
-
-                        new Button
-                        {
-                            Content = "BUTTON",
-                            Width = 150,
-                            Height = 40,
-                            Background = Brushes.LightGreen,
-                            Foreground = Brushes.Black
-                        },
-
-                        CreateTextBox(Input.TextInput.TextInputContentType.Normal),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Password),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Email),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Url),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Phone),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Number),
-                    }
-                }
-            };
-
-            return window;
-        }
-
-        private static TextBox CreateTextBox(Input.TextInput.TextInputContentType contentType)
-        {
-            var textBox = new TextBox()
-            {
-                Margin = new Thickness(20, 10),
-                Watermark = contentType.ToString(),
-                BorderThickness = new Thickness(3),
-                FontSize = 20
-            };
-            textBox.TextInputOptionsQuery += (s, e) => { e.ContentType = contentType; };
-
-            return textBox;
-        }
-    }
-}
diff --git a/src/Android/Avalonia.AndroidTestApplication/Properties/AndroidManifest.xml b/src/Android/Avalonia.AndroidTestApplication/Properties/AndroidManifest.xml
deleted file mode 100644
index ad8134f628..0000000000
--- a/src/Android/Avalonia.AndroidTestApplication/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<application android:label="Avalonia.AndroidTestApplication" android:icon="@drawable/Icon" android:hardwareAccelerated="true"></application>
-</manifest>
diff --git a/src/Android/Avalonia.AndroidTestApplication/Resources/AboutResources.txt b/src/Android/Avalonia.AndroidTestApplication/Resources/AboutResources.txt
deleted file mode 100644
index 194ae28a59..0000000000
--- a/src/Android/Avalonia.AndroidTestApplication/Resources/AboutResources.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-Images, layout descriptions, binary blobs and string dictionaries can be included 
-in your application as resource files.  Various Android APIs are designed to 
-operate on the resource IDs instead of dealing with images, strings or binary blobs 
-directly.
-
-For example, a sample Android app that contains a user interface layout (main.xml),
-an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
-would keep its resources in the "Resources" directory of the application:
-
-Resources/
-    drawable-hdpi/
-        icon.png
-
-    drawable-ldpi/
-        icon.png
-
-    drawable-mdpi/
-        icon.png
-
-    layout/
-        main.xml
-
-    values/
-        strings.xml
-
-In order to get the build system to recognize Android resources, set the build action to
-"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
-instead operate on resource IDs.  When you compile an Android application that uses resources, 
-the build system will package the resources for distribution and generate a class called
-"Resource" that contains the tokens for each one of the resources included. For example, 
-for the above Resources layout, this is what the Resource class would expose:
-
-public class Resource {
-    public class drawable {
-        public const int icon = 0x123;
-    }
-
-    public class layout {
-        public const int main = 0x456;
-    }
-
-    public class strings {
-        public const int first_string = 0xabc;
-        public const int second_string = 0xbcd;
-    }
-}
-
-You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main 
-to reference the layout/main.xml file, or Resource.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.
\ No newline at end of file
diff --git a/src/Android/Avalonia.AndroidTestApplication/Resources/drawable/Icon.png b/src/Android/Avalonia.AndroidTestApplication/Resources/drawable/Icon.png
deleted file mode 100644
index 8074c4c571..0000000000
Binary files a/src/Android/Avalonia.AndroidTestApplication/Resources/drawable/Icon.png and /dev/null differ
diff --git a/src/Android/Avalonia.AndroidTestApplication/Resources/values/Strings.xml b/src/Android/Avalonia.AndroidTestApplication/Resources/values/Strings.xml
deleted file mode 100644
index c8dca13c35..0000000000
--- a/src/Android/Avalonia.AndroidTestApplication/Resources/values/Strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-  <string name="Hello">Hello World, Click Me!</string>
-  <string name="ApplicationName">Avalonia.AndroidTestApplication</string>
-</resources>
\ No newline at end of file
diff --git a/src/Avalonia.Animation/Animatable.cs b/src/Avalonia.Animation/Animatable.cs
deleted file mode 100644
index 50fc5ac73b..0000000000
--- a/src/Avalonia.Animation/Animatable.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using Avalonia.Data;
-
-#nullable enable
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Base class for all animatable objects.
-    /// </summary>
-    public class Animatable : AvaloniaObject
-    {
-        /// <summary>
-        /// Defines the <see cref="Clock"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IClock> ClockProperty =
-            AvaloniaProperty.Register<Animatable, IClock>(nameof(Clock), inherits: true);
-
-        /// <summary>
-        /// Defines the <see cref="Transitions"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Transitions?> TransitionsProperty =
-            AvaloniaProperty.Register<Animatable, Transitions?>(nameof(Transitions));
-
-        private bool _transitionsEnabled = true;
-        private Dictionary<ITransition, TransitionState>? _transitionState;
-
-        /// <summary>
-        /// Gets or sets the clock which controls the animations on the control.
-        /// </summary>
-        public IClock Clock
-        {
-            get => GetValue(ClockProperty);
-            set => SetValue(ClockProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the property transitions for the control.
-        /// </summary>
-        public Transitions? Transitions
-        {
-            get => GetValue(TransitionsProperty);
-            set => SetValue(TransitionsProperty, value);
-        }
-
-        /// <summary>
-        /// Enables transitions for the control.
-        /// </summary>
-        /// <remarks>
-        /// This method should not be called from user code, it will be called automatically by the framework
-        /// when a control is added to the visual tree.
-        /// </remarks>
-        protected void EnableTransitions()
-        {
-            if (!_transitionsEnabled)
-            {
-                _transitionsEnabled = true;
-
-                if (Transitions is object)
-                {
-                    AddTransitions(Transitions);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Disables transitions for the control.
-        /// </summary>
-        /// <remarks>
-        /// This method should not be called from user code, it will be called automatically by the framework
-        /// when a control is added to the visual tree.
-        /// </remarks>
-        protected void DisableTransitions()
-        {
-            if (_transitionsEnabled)
-            {
-                _transitionsEnabled = false;
-
-                if (Transitions is object)
-                {
-                    RemoveTransitions(Transitions);
-                }
-            }
-        }
-
-        protected sealed override void OnPropertyChangedCore<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            if (change.Property == TransitionsProperty && change.IsEffectiveValueChange)
-            {
-                var oldTransitions = change.OldValue.GetValueOrDefault<Transitions>();
-                var newTransitions = change.NewValue.GetValueOrDefault<Transitions>();
-
-                // When transitions are replaced, we add the new transitions before removing the old
-                // transitions, so that when the old transition being disposed causes the value to
-                // change, there is a corresponding entry in `_transitionStates`. This means that we
-                // need to account for any transitions present in both the old and new transitions
-                // collections.
-                if (newTransitions is object)
-                {
-                    var toAdd = (IList)newTransitions;
-
-                    if (newTransitions.Count > 0 && oldTransitions?.Count > 0)
-                    {
-                        toAdd = newTransitions.Except(oldTransitions).ToList();
-                    }
-
-                    newTransitions.CollectionChanged += TransitionsCollectionChanged;
-                    AddTransitions(toAdd);
-                }
-
-                if (oldTransitions is object)
-                {
-                    var toRemove = (IList)oldTransitions;
-
-                    if (oldTransitions.Count > 0 && newTransitions?.Count > 0)
-                    {
-                        toRemove = oldTransitions.Except(newTransitions).ToList();
-                    }
-
-                    oldTransitions.CollectionChanged -= TransitionsCollectionChanged;
-                    RemoveTransitions(toRemove);
-                }
-            }
-            else if (_transitionsEnabled &&
-                     Transitions is object &&
-                     _transitionState is object &&
-                     !change.Property.IsDirect &&
-                     change.Priority > BindingPriority.Animation)
-            {
-                for (var i = Transitions.Count -1; i >= 0; --i)
-                {
-                    var transition = Transitions[i];
-
-                    if (transition.Property == change.Property &&
-                        _transitionState.TryGetValue(transition, out var state))
-                    {
-                        var oldValue = state.BaseValue;
-                        var newValue = GetAnimationBaseValue(transition.Property);
-
-                        if (!Equals(oldValue, newValue))
-                        {
-                            state.BaseValue = newValue;
-
-                            // We need to transition from the current animated value if present,
-                            // instead of the old base value.
-                            var animatedValue = GetValue(transition.Property);
-
-                            if (!Equals(newValue, animatedValue))
-                            {
-                                oldValue = animatedValue;
-                            }
-
-                            state.Instance?.Dispose();
-                            state.Instance = transition.Apply(
-                                this,
-                                Clock ?? AvaloniaLocator.Current.GetRequiredService<IGlobalClock>(),
-                                oldValue,
-                                newValue);
-                            return;
-                        }
-                    }
-                }
-            }
-
-            base.OnPropertyChangedCore(change);
-        }
-
-        private void TransitionsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (!_transitionsEnabled)
-            {
-                return;
-            }
-
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    AddTransitions(e.NewItems!);
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    RemoveTransitions(e.OldItems!);
-                    break;
-                case NotifyCollectionChangedAction.Replace:
-                    RemoveTransitions(e.OldItems!);
-                    AddTransitions(e.NewItems!);
-                    break;
-                case NotifyCollectionChangedAction.Reset:
-                    throw new NotSupportedException("Transitions collection cannot be reset.");
-            }
-        }
-
-        private void AddTransitions(IList items)
-        {
-            if (!_transitionsEnabled)
-            {
-                return;
-            }
-
-            _transitionState ??= new Dictionary<ITransition, TransitionState>();
-
-            for (var i = 0; i < items.Count; ++i)
-            {
-                var t = (ITransition)items[i]!;
-
-                _transitionState.Add(t, new TransitionState
-                {
-                    BaseValue = GetAnimationBaseValue(t.Property),
-                });
-            }
-        }
-
-        private void RemoveTransitions(IList items)
-        {
-            if (_transitionState is null)
-            {
-                return;
-            }
-
-            for (var i = 0; i < items.Count; ++i)
-            {
-                var t = (ITransition)items[i]!;
-
-                if (_transitionState.TryGetValue(t, out var state))
-                {
-                    state.Instance?.Dispose();
-                    _transitionState.Remove(t);
-                }
-            }
-        }
-
-        private object? GetAnimationBaseValue(AvaloniaProperty property)
-        {
-            var value = this.GetBaseValue(property, BindingPriority.LocalValue);
-
-            if (value == AvaloniaProperty.UnsetValue)
-            {
-                value = GetValue(property);
-            }
-
-            return value;
-        }
-
-        private class TransitionState
-        {
-            public IDisposable? Instance { get; set; }
-            public object? BaseValue { get; set; }
-        }
-    }
-}
diff --git a/src/Avalonia.Animation/ApiCompatBaseline.txt b/src/Avalonia.Animation/ApiCompatBaseline.txt
deleted file mode 100644
index 973698f872..0000000000
--- a/src/Avalonia.Animation/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Compat issues with assembly Avalonia.Animation:
-InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock, System.Threading.CancellationToken)' is present in the implementation but not in the contract.
-Total Issues: 3
diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj
deleted file mode 100644
index d81d14bbff..0000000000
--- a/src/Avalonia.Animation/Avalonia.Animation.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-  </ItemGroup>
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
diff --git a/src/Avalonia.Animation/Easing/Easing.cs b/src/Avalonia.Animation/Easing/Easing.cs
deleted file mode 100644
index 2f4b93dab1..0000000000
--- a/src/Avalonia.Animation/Easing/Easing.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-
-namespace Avalonia.Animation.Easings
-{
-    /// <summary>
-    /// Base class for all Easing classes.
-    /// </summary>
-    [TypeConverter(typeof(EasingTypeConverter))]
-    public abstract class Easing : IEasing
-    {
-        /// <inheritdoc/>
-        public abstract double Ease(double progress);
-
-        static Dictionary<string, Type>? _easingTypes;
-
-        static readonly Type s_thisType = typeof(Easing);
-
-        /// <summary>
-        /// Parses a Easing type string.
-        /// </summary>
-        /// <param name="e">The Easing type string.</param>
-        /// <returns>Returns the instance of the parsed type.</returns>
-        public static Easing Parse(string e)
-        {
-            if (e.Contains(','))
-            {
-                return new SplineEasing(KeySpline.Parse(e, CultureInfo.InvariantCulture));
-            }
-
-            if (_easingTypes == null)
-            {
-                _easingTypes = new Dictionary<string, Type>();
-
-                // Fetch the built-in easings.
-                var derivedTypes = typeof(Easing).Assembly.GetTypes()
-                                      .Where(p => p.Namespace == s_thisType.Namespace)
-                                      .Where(p => p.IsSubclassOf(s_thisType))
-                                      .Select(p => p).ToList();
-
-                foreach (var easingType in derivedTypes)
-                    _easingTypes.Add(easingType.Name, easingType);
-            }
-
-            if (_easingTypes.ContainsKey(e))
-            {
-                var type = _easingTypes[e];
-                return (Easing)Activator.CreateInstance(type)!;
-            }
-            else
-            {
-                throw new FormatException($"Easing \"{e}\" was not found in {s_thisType.Namespace} namespace.");
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Animation/IAnimation.cs b/src/Avalonia.Animation/IAnimation.cs
deleted file mode 100644
index 436a765d27..0000000000
--- a/src/Avalonia.Animation/IAnimation.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Interface for Animation objects
-    /// </summary>
-    public interface IAnimation
-    {
-        /// <summary>
-        /// Apply the animation to the specified control and run it when <paramref name="match" /> produces <c>true</c>.
-        /// </summary>
-        IDisposable Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete = null);
-
-        /// <summary>
-        /// Run the animation on the specified control.
-        /// </summary>
-        Task RunAsync(Animatable control, IClock clock, CancellationToken cancellationToken = default);
-    }
-}
diff --git a/src/Avalonia.Animation/IAnimationSetter.cs b/src/Avalonia.Animation/IAnimationSetter.cs
deleted file mode 100644
index 6a1d3539e2..0000000000
--- a/src/Avalonia.Animation/IAnimationSetter.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Avalonia.Animation
-{
-    public interface IAnimationSetter
-    {
-        AvaloniaProperty? Property { get; set; }
-        object? Value { get; set; }
-    }
-}
diff --git a/src/Avalonia.Animation/IAnimator.cs b/src/Avalonia.Animation/IAnimator.cs
deleted file mode 100644
index f64ac9f913..0000000000
--- a/src/Avalonia.Animation/IAnimator.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Interface for Animator objects
-    /// </summary>
-    public interface IAnimator : IList<AnimatorKeyFrame>
-    {
-        /// <summary>
-        /// The target property.
-        /// </summary>
-        AvaloniaProperty? Property {get; set;}
-
-        /// <summary>
-        /// Applies the current KeyFrame group to the specified control.
-        /// </summary>
-        IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete);
-    }
-}
diff --git a/src/Avalonia.Animation/IClock.cs b/src/Avalonia.Animation/IClock.cs
deleted file mode 100644
index ae44102077..0000000000
--- a/src/Avalonia.Animation/IClock.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Animation
-{
-    public interface IClock : IObservable<TimeSpan>
-    {
-        PlayState PlayState { get; set; }
-    }
-}
diff --git a/src/Avalonia.Animation/IGlobalClock.cs b/src/Avalonia.Animation/IGlobalClock.cs
deleted file mode 100644
index b0455e2c80..0000000000
--- a/src/Avalonia.Animation/IGlobalClock.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Animation
-{
-    public interface IGlobalClock : IClock
-    {
-    }
-}
diff --git a/src/Avalonia.Animation/ITransition.cs b/src/Avalonia.Animation/ITransition.cs
deleted file mode 100644
index 241ca208d1..0000000000
--- a/src/Avalonia.Animation/ITransition.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Interface for Transition objects.
-    /// </summary>
-    public interface ITransition
-    {
-        /// <summary>
-        /// Applies the transition to the specified <see cref="Animatable"/>.
-        /// </summary>
-        IDisposable Apply(Animatable control, IClock clock, object? oldValue, object? newValue);
-
-        /// <summary>
-        /// Gets the property to be animated.
-        /// </summary>
-        AvaloniaProperty Property { get; set; }
-    
-    }
-}
diff --git a/src/Avalonia.Animation/Properties/AssemblyInfo.cs b/src/Avalonia.Animation/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6b539b075b..0000000000
--- a/src/Avalonia.Animation/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Avalonia.Metadata;
-using System.Runtime.CompilerServices;
-
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Easings")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Animators")]
-
-[assembly: InternalsVisibleTo("Avalonia.LeakTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Animation.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
diff --git a/src/Avalonia.Base/Animation/Animatable.cs b/src/Avalonia.Base/Animation/Animatable.cs
new file mode 100644
index 0000000000..b045a32cd1
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Animatable.cs
@@ -0,0 +1,254 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using Avalonia.Data;
+
+#nullable enable
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Base class for all animatable objects.
+    /// </summary>
+    public class Animatable : AvaloniaObject
+    {
+        /// <summary>
+        /// Defines the <see cref="Clock"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IClock> ClockProperty =
+            AvaloniaProperty.Register<Animatable, IClock>(nameof(Clock), inherits: true);
+
+        /// <summary>
+        /// Defines the <see cref="Transitions"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Transitions?> TransitionsProperty =
+            AvaloniaProperty.Register<Animatable, Transitions?>(nameof(Transitions));
+
+        private bool _transitionsEnabled = true;
+        private Dictionary<ITransition, TransitionState>? _transitionState;
+
+        /// <summary>
+        /// Gets or sets the clock which controls the animations on the control.
+        /// </summary>
+        public IClock Clock
+        {
+            get => GetValue(ClockProperty);
+            set => SetValue(ClockProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the property transitions for the control.
+        /// </summary>
+        public Transitions? Transitions
+        {
+            get => GetValue(TransitionsProperty);
+            set => SetValue(TransitionsProperty, value);
+        }
+
+        /// <summary>
+        /// Enables transitions for the control.
+        /// </summary>
+        /// <remarks>
+        /// This method should not be called from user code, it will be called automatically by the framework
+        /// when a control is added to the visual tree.
+        /// </remarks>
+        protected void EnableTransitions()
+        {
+            if (!_transitionsEnabled)
+            {
+                _transitionsEnabled = true;
+
+                if (Transitions is object)
+                {
+                    AddTransitions(Transitions);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Disables transitions for the control.
+        /// </summary>
+        /// <remarks>
+        /// This method should not be called from user code, it will be called automatically by the framework
+        /// when a control is added to the visual tree.
+        /// </remarks>
+        protected void DisableTransitions()
+        {
+            if (_transitionsEnabled)
+            {
+                _transitionsEnabled = false;
+
+                if (Transitions is object)
+                {
+                    RemoveTransitions(Transitions);
+                }
+            }
+        }
+
+        protected sealed override void OnPropertyChangedCore(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (change.Property == TransitionsProperty && change.IsEffectiveValueChange)
+            {
+                var e = (AvaloniaPropertyChangedEventArgs<Transitions?>)change;
+                var oldTransitions = e.OldValue.GetValueOrDefault();
+                var newTransitions = e.NewValue.GetValueOrDefault();
+
+                // When transitions are replaced, we add the new transitions before removing the old
+                // transitions, so that when the old transition being disposed causes the value to
+                // change, there is a corresponding entry in `_transitionStates`. This means that we
+                // need to account for any transitions present in both the old and new transitions
+                // collections.
+                if (newTransitions is object)
+                {
+                    var toAdd = (IList)newTransitions;
+
+                    if (newTransitions.Count > 0 && oldTransitions?.Count > 0)
+                    {
+                        toAdd = newTransitions.Except(oldTransitions).ToList();
+                    }
+
+                    newTransitions.CollectionChanged += TransitionsCollectionChanged;
+                    AddTransitions(toAdd);
+                }
+
+                if (oldTransitions is object)
+                {
+                    var toRemove = (IList)oldTransitions;
+
+                    if (oldTransitions.Count > 0 && newTransitions?.Count > 0)
+                    {
+                        toRemove = oldTransitions.Except(newTransitions).ToList();
+                    }
+
+                    oldTransitions.CollectionChanged -= TransitionsCollectionChanged;
+                    RemoveTransitions(toRemove);
+                }
+            }
+            else if (_transitionsEnabled &&
+                     Transitions is object &&
+                     _transitionState is object &&
+                     !change.Property.IsDirect &&
+                     change.Priority > BindingPriority.Animation)
+            {
+                for (var i = Transitions.Count -1; i >= 0; --i)
+                {
+                    var transition = Transitions[i];
+
+                    if (transition.Property == change.Property &&
+                        _transitionState.TryGetValue(transition, out var state))
+                    {
+                        var oldValue = state.BaseValue;
+                        var newValue = GetAnimationBaseValue(transition.Property);
+
+                        if (!Equals(oldValue, newValue))
+                        {
+                            state.BaseValue = newValue;
+
+                            // We need to transition from the current animated value if present,
+                            // instead of the old base value.
+                            var animatedValue = GetValue(transition.Property);
+
+                            if (!Equals(newValue, animatedValue))
+                            {
+                                oldValue = animatedValue;
+                            }
+
+                            state.Instance?.Dispose();
+                            state.Instance = transition.Apply(
+                                this,
+                                Clock ?? AvaloniaLocator.Current.GetRequiredService<IGlobalClock>(),
+                                oldValue,
+                                newValue);
+                            return;
+                        }
+                    }
+                }
+            }
+
+            base.OnPropertyChangedCore(change);
+        }
+
+        private void TransitionsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (!_transitionsEnabled)
+            {
+                return;
+            }
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    AddTransitions(e.NewItems!);
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    RemoveTransitions(e.OldItems!);
+                    break;
+                case NotifyCollectionChangedAction.Replace:
+                    RemoveTransitions(e.OldItems!);
+                    AddTransitions(e.NewItems!);
+                    break;
+                case NotifyCollectionChangedAction.Reset:
+                    throw new NotSupportedException("Transitions collection cannot be reset.");
+            }
+        }
+
+        private void AddTransitions(IList items)
+        {
+            if (!_transitionsEnabled)
+            {
+                return;
+            }
+
+            _transitionState ??= new Dictionary<ITransition, TransitionState>();
+
+            for (var i = 0; i < items.Count; ++i)
+            {
+                var t = (ITransition)items[i]!;
+
+                _transitionState.Add(t, new TransitionState
+                {
+                    BaseValue = GetAnimationBaseValue(t.Property),
+                });
+            }
+        }
+
+        private void RemoveTransitions(IList items)
+        {
+            if (_transitionState is null)
+            {
+                return;
+            }
+
+            for (var i = 0; i < items.Count; ++i)
+            {
+                var t = (ITransition)items[i]!;
+
+                if (_transitionState.TryGetValue(t, out var state))
+                {
+                    state.Instance?.Dispose();
+                    _transitionState.Remove(t);
+                }
+            }
+        }
+
+        private object? GetAnimationBaseValue(AvaloniaProperty property)
+        {
+            var value = this.GetBaseValue(property, BindingPriority.LocalValue);
+
+            if (value == AvaloniaProperty.UnsetValue)
+            {
+                value = GetValue(property);
+            }
+
+            return value;
+        }
+
+        private class TransitionState
+        {
+            public IDisposable? Instance { get; set; }
+            public object? BaseValue { get; set; }
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Base/Animation/Animation.cs
similarity index 100%
rename from src/Avalonia.Animation/Animation.cs
rename to src/Avalonia.Base/Animation/Animation.cs
diff --git a/src/Avalonia.Animation/AnimationInstance`1.cs b/src/Avalonia.Base/Animation/AnimationInstance`1.cs
similarity index 100%
rename from src/Avalonia.Animation/AnimationInstance`1.cs
rename to src/Avalonia.Base/Animation/AnimationInstance`1.cs
diff --git a/src/Avalonia.Animation/AnimatorDrivenTransition.cs b/src/Avalonia.Base/Animation/AnimatorDrivenTransition.cs
similarity index 100%
rename from src/Avalonia.Animation/AnimatorDrivenTransition.cs
rename to src/Avalonia.Base/Animation/AnimatorDrivenTransition.cs
diff --git a/src/Avalonia.Animation/AnimatorKeyFrame.cs b/src/Avalonia.Base/Animation/AnimatorKeyFrame.cs
similarity index 100%
rename from src/Avalonia.Animation/AnimatorKeyFrame.cs
rename to src/Avalonia.Base/Animation/AnimatorKeyFrame.cs
diff --git a/src/Avalonia.Animation/AnimatorTransitionObservable.cs b/src/Avalonia.Base/Animation/AnimatorTransitionObservable.cs
similarity index 100%
rename from src/Avalonia.Animation/AnimatorTransitionObservable.cs
rename to src/Avalonia.Base/Animation/AnimatorTransitionObservable.cs
diff --git a/src/Avalonia.Animation/Animators/Animator`1.cs b/src/Avalonia.Base/Animation/Animators/Animator`1.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/Animator`1.cs
rename to src/Avalonia.Base/Animation/Animators/Animator`1.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs b/src/Avalonia.Base/Animation/Animators/BaseBrushAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/BaseBrushAnimator.cs
diff --git a/src/Avalonia.Animation/Animators/BoolAnimator.cs b/src/Avalonia.Base/Animation/Animators/BoolAnimator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/BoolAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/BoolAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/BoxShadowAnimator.cs b/src/Avalonia.Base/Animation/Animators/BoxShadowAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/BoxShadowAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/BoxShadowAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/BoxShadowsAnimator.cs b/src/Avalonia.Base/Animation/Animators/BoxShadowsAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/BoxShadowsAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/BoxShadowsAnimator.cs
diff --git a/src/Avalonia.Animation/Animators/ByteAnimator.cs b/src/Avalonia.Base/Animation/Animators/ByteAnimator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/ByteAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/ByteAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/ColorAnimator.cs b/src/Avalonia.Base/Animation/Animators/ColorAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/ColorAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/ColorAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/CornerRadiusAnimator.cs b/src/Avalonia.Base/Animation/Animators/CornerRadiusAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/CornerRadiusAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/CornerRadiusAnimator.cs
diff --git a/src/Avalonia.Animation/Animators/DecimalAnimator.cs b/src/Avalonia.Base/Animation/Animators/DecimalAnimator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/DecimalAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/DecimalAnimator.cs
diff --git a/src/Avalonia.Animation/Animators/DoubleAnimator.cs b/src/Avalonia.Base/Animation/Animators/DoubleAnimator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/DoubleAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/DoubleAnimator.cs
diff --git a/src/Avalonia.Animation/Animators/FloatAnimator.cs b/src/Avalonia.Base/Animation/Animators/FloatAnimator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/FloatAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/FloatAnimator.cs
diff --git a/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs b/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
new file mode 100644
index 0000000000..4727ea1bfb
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+
+using Avalonia.Data;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+
+#nullable enable
+
+namespace Avalonia.Animation.Animators
+{
+    /// <summary>
+    /// Animator that handles <see cref="SolidColorBrush"/> values. 
+    /// </summary>
+    public class GradientBrushAnimator : Animator<IGradientBrush?>
+    {
+        private static readonly RelativePointAnimator s_relativePointAnimator = new RelativePointAnimator();
+        private static readonly DoubleAnimator s_doubleAnimator = new DoubleAnimator();
+
+        public override IGradientBrush? Interpolate(double progress, IGradientBrush? oldValue, IGradientBrush? newValue)
+        {
+            if (oldValue is null || newValue is null)
+            {
+                return progress >= 0.5 ? newValue : oldValue;
+            }
+
+            switch (oldValue)
+            {
+                case IRadialGradientBrush oldRadial when newValue is IRadialGradientBrush newRadial:
+                    return new ImmutableRadialGradientBrush(
+                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
+                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
+                        oldValue.Transform is { } ? new ImmutableTransform(oldValue.Transform.Value) : null,
+                        s_relativePointAnimator.Interpolate(progress, oldValue.TransformOrigin, newValue.TransformOrigin),
+                        oldValue.SpreadMethod,
+                        s_relativePointAnimator.Interpolate(progress, oldRadial.Center, newRadial.Center),
+                        s_relativePointAnimator.Interpolate(progress, oldRadial.GradientOrigin, newRadial.GradientOrigin),
+                        s_doubleAnimator.Interpolate(progress, oldRadial.Radius, newRadial.Radius));
+
+                case IConicGradientBrush oldConic when newValue is IConicGradientBrush newConic:
+                    return new ImmutableConicGradientBrush(
+                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
+                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
+                        oldValue.Transform is { } ? new ImmutableTransform(oldValue.Transform.Value) : null,
+                        s_relativePointAnimator.Interpolate(progress, oldValue.TransformOrigin, newValue.TransformOrigin),
+                        oldValue.SpreadMethod,
+                        s_relativePointAnimator.Interpolate(progress, oldConic.Center, newConic.Center),
+                        s_doubleAnimator.Interpolate(progress, oldConic.Angle, newConic.Angle));
+
+                case ILinearGradientBrush oldLinear when newValue is ILinearGradientBrush newLinear:
+                    return new ImmutableLinearGradientBrush(
+                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
+                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
+                        oldValue.Transform is { } ? new ImmutableTransform(oldValue.Transform.Value) : null,
+                        s_relativePointAnimator.Interpolate(progress, oldValue.TransformOrigin, newValue.TransformOrigin),
+                        oldValue.SpreadMethod,
+                        s_relativePointAnimator.Interpolate(progress, oldLinear.StartPoint, newLinear.StartPoint),
+                        s_relativePointAnimator.Interpolate(progress, oldLinear.EndPoint, newLinear.EndPoint));
+
+                default:
+                    return progress >= 0.5 ? newValue : oldValue;
+            }
+        }
+
+        public override IDisposable BindAnimation(Animatable control, IObservable<IGradientBrush?> instance)
+        {
+            if (Property is null)
+            {
+                throw new InvalidOperationException("Animator has no property specified.");
+            }
+
+            return control.Bind((AvaloniaProperty<IBrush?>)Property, instance, BindingPriority.Animation);
+        }
+
+        private IReadOnlyList<ImmutableGradientStop> InterpolateStops(double progress, IReadOnlyList<IGradientStop> oldValue, IReadOnlyList<IGradientStop> newValue)
+        {
+            var resultCount = Math.Max(oldValue.Count, newValue.Count);
+            var stops = new ImmutableGradientStop[resultCount];
+
+            for (int index = 0, oldIndex = 0, newIndex = 0; index < resultCount; index++)
+            {
+                stops[index] = new ImmutableGradientStop(
+                    s_doubleAnimator.Interpolate(progress, oldValue[oldIndex].Offset, newValue[newIndex].Offset),
+                    ColorAnimator.InterpolateCore(progress, oldValue[oldIndex].Color, newValue[newIndex].Color));
+
+                if (oldIndex < oldValue.Count - 1)
+                {
+                    oldIndex++;
+                }
+
+                if (newIndex < newValue.Count - 1)
+                {
+                    newIndex++;
+                }
+            }
+            
+            return stops;
+        }
+
+        internal static IGradientBrush ConvertSolidColorBrushToGradient(IGradientBrush gradientBrush, ISolidColorBrush solidColorBrush)
+        {
+            switch (gradientBrush)
+            {
+                case IRadialGradientBrush oldRadial:
+                    return new ImmutableRadialGradientBrush(
+                        CreateStopsFromSolidColorBrush(solidColorBrush, oldRadial.GradientStops), solidColorBrush.Opacity,
+                        oldRadial.Transform is { } ? new ImmutableTransform(oldRadial.Transform.Value) : null,
+                        oldRadial.TransformOrigin,
+                        oldRadial.SpreadMethod, oldRadial.Center, oldRadial.GradientOrigin, oldRadial.Radius);
+
+                case IConicGradientBrush oldConic:
+                    return new ImmutableConicGradientBrush(
+                        CreateStopsFromSolidColorBrush(solidColorBrush, oldConic.GradientStops), solidColorBrush.Opacity,
+                        oldConic.Transform is { } ? new ImmutableTransform(oldConic.Transform.Value) : null,
+                        oldConic.TransformOrigin,
+                        oldConic.SpreadMethod, oldConic.Center, oldConic.Angle);
+
+                case ILinearGradientBrush oldLinear:
+                    return new ImmutableLinearGradientBrush(
+                        CreateStopsFromSolidColorBrush(solidColorBrush, oldLinear.GradientStops), solidColorBrush.Opacity,
+                        oldLinear.Transform is { } ? new ImmutableTransform(oldLinear.Transform.Value) : null,
+                        oldLinear.TransformOrigin,
+                        oldLinear.SpreadMethod, oldLinear.StartPoint, oldLinear.EndPoint);
+
+                default:
+                    throw new NotSupportedException($"Gradient of type {gradientBrush?.GetType()} is not supported");
+            }
+
+            static IReadOnlyList<ImmutableGradientStop> CreateStopsFromSolidColorBrush(ISolidColorBrush solidColorBrush, IReadOnlyList<IGradientStop> baseStops)
+            {
+                var stops = new ImmutableGradientStop[baseStops.Count];
+                for (int index = 0; index < baseStops.Count; index++)
+                {
+                    stops[index] = new ImmutableGradientStop(baseStops[index].Offset, solidColorBrush.Color);
+                }
+                return stops;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/Animators/Int16Animator.cs b/src/Avalonia.Base/Animation/Animators/Int16Animator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/Int16Animator.cs
rename to src/Avalonia.Base/Animation/Animators/Int16Animator.cs
diff --git a/src/Avalonia.Animation/Animators/Int32Animator.cs b/src/Avalonia.Base/Animation/Animators/Int32Animator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/Int32Animator.cs
rename to src/Avalonia.Base/Animation/Animators/Int32Animator.cs
diff --git a/src/Avalonia.Animation/Animators/Int64Animator.cs b/src/Avalonia.Base/Animation/Animators/Int64Animator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/Int64Animator.cs
rename to src/Avalonia.Base/Animation/Animators/Int64Animator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/PointAnimator.cs b/src/Avalonia.Base/Animation/Animators/PointAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/PointAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/PointAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/RectAnimator.cs b/src/Avalonia.Base/Animation/Animators/RectAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/RectAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/RectAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/RelativePointAnimator.cs b/src/Avalonia.Base/Animation/Animators/RelativePointAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/RelativePointAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/RelativePointAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/SizeAnimator.cs b/src/Avalonia.Base/Animation/Animators/SizeAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/SizeAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/SizeAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs b/src/Avalonia.Base/Animation/Animators/SolidColorBrushAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/SolidColorBrushAnimator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/ThicknessAnimator.cs b/src/Avalonia.Base/Animation/Animators/ThicknessAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/ThicknessAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/ThicknessAnimator.cs
diff --git a/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs b/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs
new file mode 100644
index 0000000000..e12ca722f9
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Reactive.Disposables;
+using Avalonia.Logging;
+using Avalonia.Media;
+using Avalonia.Media.Transformation;
+
+namespace Avalonia.Animation.Animators
+{
+    /// <summary>
+    /// Animator that handles <see cref="Transform"/> properties.
+    /// </summary>
+    public class TransformAnimator : Animator<double>
+    {
+        DoubleAnimator? _doubleAnimator;
+
+        /// <inheritdoc/>
+        public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> obsMatch, Action? onComplete)
+        {
+            var ctrl = (Visual)control;
+
+            if (Property is null)
+            {
+                throw new InvalidOperationException("Animator has no property specified.");
+            }
+
+            // Check if the Target Property is Transform derived.
+            if (typeof(Transform).IsAssignableFrom(Property.OwnerType))
+            {
+                if (ctrl.RenderTransform is TransformOperations)
+                {
+                    // HACK: This animator cannot reasonably animate CSS transforms at the moment.
+                    return Disposable.Empty;
+                }
+
+                if (ctrl.RenderTransform == null)
+                {
+                    var normalTransform = new TransformGroup();
+
+                    // Add the transforms according to MS Expression Blend's 
+                    // default RenderTransform order.
+
+                    normalTransform.Children.Add(new ScaleTransform());
+                    normalTransform.Children.Add(new SkewTransform());
+                    normalTransform.Children.Add(new RotateTransform());
+                    normalTransform.Children.Add(new TranslateTransform());
+                    normalTransform.Children.Add(new Rotate3DTransform());
+
+                    ctrl.RenderTransform = normalTransform;
+                }
+
+                var renderTransformType = ctrl.RenderTransform.GetType();
+
+                if (_doubleAnimator == null)
+                {
+                    _doubleAnimator = new DoubleAnimator();
+
+                    foreach (AnimatorKeyFrame keyframe in this)
+                    {
+                        _doubleAnimator.Add(keyframe);
+                    }
+
+                    _doubleAnimator.Property = Property;
+                }
+
+                // It's a transform object so let's target that.
+                if (renderTransformType == Property.OwnerType)
+                {
+                    return _doubleAnimator.Apply(animation, (Transform) ctrl.RenderTransform, clock ?? control.Clock, obsMatch, onComplete);
+                }
+                // It's a TransformGroup and try finding the target there.
+                else if (renderTransformType == typeof(TransformGroup))
+                {
+                    foreach (Transform transform in ((TransformGroup)ctrl.RenderTransform).Children)
+                    {
+                        if (transform.GetType() == Property.OwnerType)
+                        {
+                            return _doubleAnimator.Apply(animation, transform, clock ?? control.Clock, obsMatch, onComplete);
+                        }
+                    }
+                }
+
+                Logger.TryGet(LogEventLevel.Warning, LogArea.Animations)?.Log(
+                    control,
+                    $"Cannot find the appropriate transform: \"{Property.OwnerType}\" in {control}.");
+            }
+            else
+            {
+                Logger.TryGet(LogEventLevel.Error, LogArea.Animations)?.Log(
+                    control,
+                    $"Cannot apply animation: Target property owner {Property.OwnerType} is not a Transform object.");
+            }
+            return null;
+        }
+
+        /// <inheritdocs/> 
+        public override double Interpolate(double p, double o, double n) => 0;
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/Animators/TransformOperationsAnimator.cs b/src/Avalonia.Base/Animation/Animators/TransformOperationsAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/TransformOperationsAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/TransformOperationsAnimator.cs
diff --git a/src/Avalonia.Animation/Animators/UInt16Animator.cs b/src/Avalonia.Base/Animation/Animators/UInt16Animator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/UInt16Animator.cs
rename to src/Avalonia.Base/Animation/Animators/UInt16Animator.cs
diff --git a/src/Avalonia.Animation/Animators/UInt32Animator.cs b/src/Avalonia.Base/Animation/Animators/UInt32Animator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/UInt32Animator.cs
rename to src/Avalonia.Base/Animation/Animators/UInt32Animator.cs
diff --git a/src/Avalonia.Animation/Animators/UInt64Animator.cs b/src/Avalonia.Base/Animation/Animators/UInt64Animator.cs
similarity index 100%
rename from src/Avalonia.Animation/Animators/UInt64Animator.cs
rename to src/Avalonia.Base/Animation/Animators/UInt64Animator.cs
diff --git a/src/Avalonia.Visuals/Animation/Animators/VectorAnimator.cs b/src/Avalonia.Base/Animation/Animators/VectorAnimator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Animators/VectorAnimator.cs
rename to src/Avalonia.Base/Animation/Animators/VectorAnimator.cs
diff --git a/src/Avalonia.Animation/Clock.cs b/src/Avalonia.Base/Animation/Clock.cs
similarity index 100%
rename from src/Avalonia.Animation/Clock.cs
rename to src/Avalonia.Base/Animation/Clock.cs
diff --git a/src/Avalonia.Animation/ClockBase.cs b/src/Avalonia.Base/Animation/ClockBase.cs
similarity index 100%
rename from src/Avalonia.Animation/ClockBase.cs
rename to src/Avalonia.Base/Animation/ClockBase.cs
diff --git a/src/Avalonia.Base/Animation/CompositePageTransition.cs b/src/Avalonia.Base/Animation/CompositePageTransition.cs
new file mode 100644
index 0000000000..62119a0051
--- /dev/null
+++ b/src/Avalonia.Base/Animation/CompositePageTransition.cs
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Defines a composite page transition that can be used to combine multiple transitions.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Instantiate the <see cref="CompositePageTransition" /> in XAML and initialize the
+    /// <see cref="Transitions" /> property in order to have many animations triggered at once.
+    /// For example, you can combine <see cref="CrossFade"/> and <see cref="PageSlide"/>.
+    /// <code>
+    /// <![CDATA[
+    /// <reactiveUi:RoutedViewHost Router="{Binding Router}">
+    ///   <reactiveUi:RoutedViewHost.PageTransition>
+    ///     <CompositePageTransition>
+    ///       <PageSlide Duration="0.5" />
+    ///       <CrossFade Duration="0.5" />
+    ///     </CompositePageTransition>
+    ///   </reactiveUi:RoutedViewHost.PageTransition>
+    /// </reactiveUi:RoutedViewHost>
+    /// ]]>
+    /// </code>
+    /// </para>
+    /// </remarks>
+    public class CompositePageTransition : IPageTransition
+    {
+        /// <summary>
+        /// Gets or sets the transitions to be executed. Can be defined from XAML.
+        /// </summary>
+        [Content]
+        public List<IPageTransition> PageTransitions { get; set; } = new List<IPageTransition>();
+
+        /// <inheritdoc />
+        public Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+        {
+            var transitionTasks = PageTransitions
+                .Select(transition => transition.Start(from, to, forward, cancellationToken))
+                .ToArray();
+            return Task.WhenAll(transitionTasks);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/CrossFade.cs b/src/Avalonia.Base/Animation/CrossFade.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/CrossFade.cs
rename to src/Avalonia.Base/Animation/CrossFade.cs
diff --git a/src/Avalonia.Animation/Cue.cs b/src/Avalonia.Base/Animation/Cue.cs
similarity index 100%
rename from src/Avalonia.Animation/Cue.cs
rename to src/Avalonia.Base/Animation/Cue.cs
diff --git a/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs b/src/Avalonia.Base/Animation/DisposeAnimationInstanceSubject.cs
similarity index 100%
rename from src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs
rename to src/Avalonia.Base/Animation/DisposeAnimationInstanceSubject.cs
diff --git a/src/Avalonia.Animation/Easing/BackEaseIn.cs b/src/Avalonia.Base/Animation/Easings/BackEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/BackEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/BackEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/BackEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/BackEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/BackEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/BackEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/BackEaseOut.cs b/src/Avalonia.Base/Animation/Easings/BackEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/BackEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/BackEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/BounceEaseIn.cs b/src/Avalonia.Base/Animation/Easings/BounceEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/BounceEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/BounceEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/BounceEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/BounceEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/BounceEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/BounceEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/BounceEaseOut.cs b/src/Avalonia.Base/Animation/Easings/BounceEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/BounceEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/BounceEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/CircularEaseIn.cs b/src/Avalonia.Base/Animation/Easings/CircularEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/CircularEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/CircularEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/CircularEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/CircularEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/CircularEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/CircularEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/CircularEaseOut.cs b/src/Avalonia.Base/Animation/Easings/CircularEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/CircularEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/CircularEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/CubicEaseIn.cs b/src/Avalonia.Base/Animation/Easings/CubicEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/CubicEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/CubicEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/CubicEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/CubicEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/CubicEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/CubicEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/CubicEaseOut.cs b/src/Avalonia.Base/Animation/Easings/CubicEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/CubicEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/CubicEaseOut.cs
diff --git a/src/Avalonia.Base/Animation/Easings/Easing.cs b/src/Avalonia.Base/Animation/Easings/Easing.cs
new file mode 100644
index 0000000000..d4f817ccc3
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Easings/Easing.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using Avalonia.SourceGenerator;
+
+namespace Avalonia.Animation.Easings
+{
+    /// <summary>
+    /// Base class for all Easing classes.
+    /// </summary>
+    [TypeConverter(typeof(EasingTypeConverter))]
+    public abstract partial class Easing : IEasing
+    {
+        /// <inheritdoc/>
+        public abstract double Ease(double progress);
+
+        private const string Namespace = "Avalonia.Animation.Easings";
+
+        [SubtypesFactory(typeof(Easing), Namespace)]
+        private static partial bool TryCreateEasingInstance(string type, [NotNullWhen(true)] out Easing? instance);
+
+        /// <summary>
+        /// Parses a Easing type string.
+        /// </summary>
+        /// <param name="e">The Easing type string.</param>
+        /// <returns>Returns the instance of the parsed type.</returns>
+        public static Easing Parse(string e)
+        {
+#if NETSTANDARD2_0
+            if (e.Contains(","))
+#else
+            if (e.Contains(','))
+#endif
+            {
+                return new SplineEasing(KeySpline.Parse(e, CultureInfo.InvariantCulture));
+            }
+
+            return TryCreateEasingInstance(e, out var easing)
+                ? easing
+                : throw new FormatException($"Easing \"{e}\" was not found in {Namespace} namespace.");
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/Easing/EasingTypeConverter.cs b/src/Avalonia.Base/Animation/Easings/EasingTypeConverter.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/EasingTypeConverter.cs
rename to src/Avalonia.Base/Animation/Easings/EasingTypeConverter.cs
diff --git a/src/Avalonia.Animation/Easing/ElasticEaseIn.cs b/src/Avalonia.Base/Animation/Easings/ElasticEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/ElasticEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/ElasticEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/ElasticEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/ElasticEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/ElasticEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/ElasticEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/ElasticEaseOut.cs b/src/Avalonia.Base/Animation/Easings/ElasticEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/ElasticEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/ElasticEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/ExponentialEaseIn.cs b/src/Avalonia.Base/Animation/Easings/ExponentialEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/ExponentialEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/ExponentialEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/ExponentialEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/ExponentialEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/ExponentialEaseOut.cs b/src/Avalonia.Base/Animation/Easings/ExponentialEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/ExponentialEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/ExponentialEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/IEasing.cs b/src/Avalonia.Base/Animation/Easings/IEasing.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/IEasing.cs
rename to src/Avalonia.Base/Animation/Easings/IEasing.cs
diff --git a/src/Avalonia.Animation/Easing/LinearEasing.cs b/src/Avalonia.Base/Animation/Easings/LinearEasing.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/LinearEasing.cs
rename to src/Avalonia.Base/Animation/Easings/LinearEasing.cs
diff --git a/src/Avalonia.Animation/Easing/QuadraticEaseIn.cs b/src/Avalonia.Base/Animation/Easings/QuadraticEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuadraticEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/QuadraticEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/QuadraticEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/QuadraticEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/QuadraticEaseOut.cs b/src/Avalonia.Base/Animation/Easings/QuadraticEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuadraticEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/QuadraticEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/QuarticEaseIn.cs b/src/Avalonia.Base/Animation/Easings/QuarticEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuarticEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/QuarticEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/QuarticEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/QuarticEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuarticEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/QuarticEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/QuarticEaseOut.cs b/src/Avalonia.Base/Animation/Easings/QuarticEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuarticEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/QuarticEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/QuinticEaseIn.cs b/src/Avalonia.Base/Animation/Easings/QuinticEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuinticEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/QuinticEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/QuinticEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/QuinticEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuinticEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/QuinticEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/QuinticEaseOut.cs b/src/Avalonia.Base/Animation/Easings/QuinticEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/QuinticEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/QuinticEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/SineEaseIn.cs b/src/Avalonia.Base/Animation/Easings/SineEaseIn.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/SineEaseIn.cs
rename to src/Avalonia.Base/Animation/Easings/SineEaseIn.cs
diff --git a/src/Avalonia.Animation/Easing/SineEaseInOut.cs b/src/Avalonia.Base/Animation/Easings/SineEaseInOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/SineEaseInOut.cs
rename to src/Avalonia.Base/Animation/Easings/SineEaseInOut.cs
diff --git a/src/Avalonia.Animation/Easing/SineEaseOut.cs b/src/Avalonia.Base/Animation/Easings/SineEaseOut.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/SineEaseOut.cs
rename to src/Avalonia.Base/Animation/Easings/SineEaseOut.cs
diff --git a/src/Avalonia.Animation/Easing/SplineEasing.cs b/src/Avalonia.Base/Animation/Easings/SplineEasing.cs
similarity index 100%
rename from src/Avalonia.Animation/Easing/SplineEasing.cs
rename to src/Avalonia.Base/Animation/Easings/SplineEasing.cs
diff --git a/src/Avalonia.Animation/FillMode.cs b/src/Avalonia.Base/Animation/FillMode.cs
similarity index 100%
rename from src/Avalonia.Animation/FillMode.cs
rename to src/Avalonia.Base/Animation/FillMode.cs
diff --git a/src/Avalonia.Base/Animation/IAnimation.cs b/src/Avalonia.Base/Animation/IAnimation.cs
new file mode 100644
index 0000000000..eda86ed106
--- /dev/null
+++ b/src/Avalonia.Base/Animation/IAnimation.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Interface for Animation objects
+    /// </summary>
+    [NotClientImplementable]
+    public interface IAnimation
+    {
+        /// <summary>
+        /// Apply the animation to the specified control and run it when <paramref name="match" /> produces <c>true</c>.
+        /// </summary>
+        IDisposable Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete = null);
+
+        /// <summary>
+        /// Run the animation on the specified control.
+        /// </summary>
+        Task RunAsync(Animatable control, IClock clock, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/Avalonia.Base/Animation/IAnimationSetter.cs b/src/Avalonia.Base/Animation/IAnimationSetter.cs
new file mode 100644
index 0000000000..8c4ba95517
--- /dev/null
+++ b/src/Avalonia.Base/Animation/IAnimationSetter.cs
@@ -0,0 +1,11 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    [NotClientImplementable]
+    public interface IAnimationSetter
+    {
+        AvaloniaProperty? Property { get; set; }
+        object? Value { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Animation/IAnimator.cs b/src/Avalonia.Base/Animation/IAnimator.cs
new file mode 100644
index 0000000000..06ba8dc329
--- /dev/null
+++ b/src/Avalonia.Base/Animation/IAnimator.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Interface for Animator objects
+    /// </summary>
+    [NotClientImplementable]
+    public interface IAnimator : IList<AnimatorKeyFrame>
+    {
+        /// <summary>
+        /// The target property.
+        /// </summary>
+        AvaloniaProperty? Property {get; set;}
+
+        /// <summary>
+        /// Applies the current KeyFrame group to the specified control.
+        /// </summary>
+        IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete);
+    }
+}
diff --git a/src/Avalonia.Base/Animation/IClock.cs b/src/Avalonia.Base/Animation/IClock.cs
new file mode 100644
index 0000000000..7b3b7b3924
--- /dev/null
+++ b/src/Avalonia.Base/Animation/IClock.cs
@@ -0,0 +1,11 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    [NotClientImplementable]
+    public interface IClock : IObservable<TimeSpan>
+    {
+        PlayState PlayState { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Animation/IGlobalClock.cs b/src/Avalonia.Base/Animation/IGlobalClock.cs
new file mode 100644
index 0000000000..138dc07539
--- /dev/null
+++ b/src/Avalonia.Base/Animation/IGlobalClock.cs
@@ -0,0 +1,9 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    [NotClientImplementable]
+    public interface IGlobalClock : IClock
+    {
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/IPageTransition.cs b/src/Avalonia.Base/Animation/IPageTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/IPageTransition.cs
rename to src/Avalonia.Base/Animation/IPageTransition.cs
diff --git a/src/Avalonia.Base/Animation/ITransition.cs b/src/Avalonia.Base/Animation/ITransition.cs
new file mode 100644
index 0000000000..639b92ce35
--- /dev/null
+++ b/src/Avalonia.Base/Animation/ITransition.cs
@@ -0,0 +1,23 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Interface for Transition objects.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ITransition
+    {
+        /// <summary>
+        /// Applies the transition to the specified <see cref="Animatable"/>.
+        /// </summary>
+        IDisposable Apply(Animatable control, IClock clock, object? oldValue, object? newValue);
+
+        /// <summary>
+        /// Gets the property to be animated.
+        /// </summary>
+        AvaloniaProperty Property { get; set; }
+    
+    }
+}
diff --git a/src/Avalonia.Animation/IterationCount.cs b/src/Avalonia.Base/Animation/IterationCount.cs
similarity index 100%
rename from src/Avalonia.Animation/IterationCount.cs
rename to src/Avalonia.Base/Animation/IterationCount.cs
diff --git a/src/Avalonia.Animation/IterationCountTypeConverter.cs b/src/Avalonia.Base/Animation/IterationCountTypeConverter.cs
similarity index 100%
rename from src/Avalonia.Animation/IterationCountTypeConverter.cs
rename to src/Avalonia.Base/Animation/IterationCountTypeConverter.cs
diff --git a/src/Avalonia.Animation/KeyFrame.cs b/src/Avalonia.Base/Animation/KeyFrame.cs
similarity index 100%
rename from src/Avalonia.Animation/KeyFrame.cs
rename to src/Avalonia.Base/Animation/KeyFrame.cs
diff --git a/src/Avalonia.Animation/KeyFrames.cs b/src/Avalonia.Base/Animation/KeyFrames.cs
similarity index 100%
rename from src/Avalonia.Animation/KeyFrames.cs
rename to src/Avalonia.Base/Animation/KeyFrames.cs
diff --git a/src/Avalonia.Animation/KeySpline.cs b/src/Avalonia.Base/Animation/KeySpline.cs
similarity index 100%
rename from src/Avalonia.Animation/KeySpline.cs
rename to src/Avalonia.Base/Animation/KeySpline.cs
diff --git a/src/Avalonia.Animation/KeySplineTypeConverter.cs b/src/Avalonia.Base/Animation/KeySplineTypeConverter.cs
similarity index 100%
rename from src/Avalonia.Animation/KeySplineTypeConverter.cs
rename to src/Avalonia.Base/Animation/KeySplineTypeConverter.cs
diff --git a/src/Avalonia.Base/Animation/PageSlide.cs b/src/Avalonia.Base/Animation/PageSlide.cs
new file mode 100644
index 0000000000..b22bc8b243
--- /dev/null
+++ b/src/Avalonia.Base/Animation/PageSlide.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Animation.Easings;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Transitions between two pages by sliding them horizontally or vertically.
+    /// </summary>
+    public class PageSlide : IPageTransition
+    {
+        /// <summary>
+        /// The axis on which the PageSlide should occur
+        /// </summary>
+        public enum SlideAxis
+        {
+            Horizontal,
+            Vertical
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PageSlide"/> class.
+        /// </summary>
+        public PageSlide()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PageSlide"/> class.
+        /// </summary>
+        /// <param name="duration">The duration of the animation.</param>
+        /// <param name="orientation">The axis on which the animation should occur</param>
+        public PageSlide(TimeSpan duration, SlideAxis orientation = SlideAxis.Horizontal)
+        {
+            Duration = duration;
+            Orientation = orientation;
+        }
+
+        /// <summary>
+        /// Gets the duration of the animation.
+        /// </summary>
+        public TimeSpan Duration { get; set; }
+
+        /// <summary>
+        /// Gets the duration of the animation.
+        /// </summary>
+        public SlideAxis Orientation { get; set; }
+        
+        /// <summary>
+        /// Gets or sets element entrance easing.
+        /// </summary>
+        public Easing SlideInEasing { get; set; } = new LinearEasing();
+        
+        /// <summary>
+        /// Gets or sets element exit easing.
+        /// </summary>
+        public Easing SlideOutEasing { get; set; } = new LinearEasing();
+
+        /// <inheritdoc />
+        public virtual async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
+
+            var tasks = new List<Task>();
+            var parent = GetVisualParent(from, to);
+            var distance = Orientation == SlideAxis.Horizontal ? parent.Bounds.Width : parent.Bounds.Height;
+            var translateProperty = Orientation == SlideAxis.Horizontal ? TranslateTransform.XProperty : TranslateTransform.YProperty;
+
+            if (from != null)
+            {
+                var animation = new Animation
+                {
+                    Easing = SlideOutEasing,
+                    FillMode = FillMode.Forward,
+                    Children =
+                    {
+                        new KeyFrame
+                        {
+                            Setters = { new Setter { Property = translateProperty, Value = 0d } },
+                            Cue = new Cue(0d)
+                        },
+                        new KeyFrame
+                        {
+                            Setters =
+                            {
+                                new Setter
+                                {
+                                    Property = translateProperty,
+                                    Value = forward ? -distance : distance
+                                }
+                            },
+                            Cue = new Cue(1d)
+                        }
+                    },
+                    Duration = Duration
+                };
+                tasks.Add(animation.RunAsync(from, null, cancellationToken));
+            }
+
+            if (to != null)
+            {
+                to.IsVisible = true;
+                var animation = new Animation
+                {
+                    FillMode = FillMode.Forward,
+                    Easing = SlideInEasing,
+                    Children =
+                    {
+                        new KeyFrame
+                        {
+                            Setters =
+                            {
+                                new Setter
+                                {
+                                    Property = translateProperty,
+                                    Value = forward ? distance : -distance
+                                }
+                            },
+                            Cue = new Cue(0d)
+                        },
+                        new KeyFrame
+                        {
+                            Setters = { new Setter { Property = translateProperty, Value = 0d } },
+                            Cue = new Cue(1d)
+                        }
+                    },
+                    Duration = Duration
+                };
+                tasks.Add(animation.RunAsync(to, null, cancellationToken));
+            }
+
+            await Task.WhenAll(tasks);
+
+            if (from != null && !cancellationToken.IsCancellationRequested)
+            {
+                from.IsVisible = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets the common visual parent of the two control.
+        /// </summary>
+        /// <param name="from">The from control.</param>
+        /// <param name="to">The to control.</param>
+        /// <returns>The common parent.</returns>
+        /// <exception cref="ArgumentException">
+        /// The two controls do not share a common parent.
+        /// </exception>
+        /// <remarks>
+        /// Any one of the parameters may be null, but not both.
+        /// </remarks>
+        protected static IVisual GetVisualParent(IVisual? from, IVisual? to)
+        {
+            var p1 = (from ?? to)!.VisualParent;
+            var p2 = (to ?? from)!.VisualParent;
+
+            if (p1 != null && p2 != null && p1 != p2)
+            {
+                throw new ArgumentException("Controls for PageSlide must have same parent.");
+            }
+
+            return p1 ?? throw new InvalidOperationException("Cannot determine visual parent.");
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/PlayState.cs b/src/Avalonia.Base/Animation/PlayState.cs
similarity index 100%
rename from src/Avalonia.Animation/PlayState.cs
rename to src/Avalonia.Base/Animation/PlayState.cs
diff --git a/src/Avalonia.Animation/PlaybackDirection.cs b/src/Avalonia.Base/Animation/PlaybackDirection.cs
similarity index 100%
rename from src/Avalonia.Animation/PlaybackDirection.cs
rename to src/Avalonia.Base/Animation/PlaybackDirection.cs
diff --git a/src/Avalonia.Visuals/Animation/RenderLoopClock.cs b/src/Avalonia.Base/Animation/RenderLoopClock.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/RenderLoopClock.cs
rename to src/Avalonia.Base/Animation/RenderLoopClock.cs
diff --git a/src/Avalonia.Animation/Transition.cs b/src/Avalonia.Base/Animation/Transition.cs
similarity index 100%
rename from src/Avalonia.Animation/Transition.cs
rename to src/Avalonia.Base/Animation/Transition.cs
diff --git a/src/Avalonia.Animation/TransitionInstance.cs b/src/Avalonia.Base/Animation/TransitionInstance.cs
similarity index 100%
rename from src/Avalonia.Animation/TransitionInstance.cs
rename to src/Avalonia.Base/Animation/TransitionInstance.cs
diff --git a/src/Avalonia.Animation/TransitionObservableBase.cs b/src/Avalonia.Base/Animation/TransitionObservableBase.cs
similarity index 100%
rename from src/Avalonia.Animation/TransitionObservableBase.cs
rename to src/Avalonia.Base/Animation/TransitionObservableBase.cs
diff --git a/src/Avalonia.Animation/Transitions.cs b/src/Avalonia.Base/Animation/Transitions.cs
similarity index 100%
rename from src/Avalonia.Animation/Transitions.cs
rename to src/Avalonia.Base/Animation/Transitions.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/BoxShadowsTransition.cs b/src/Avalonia.Base/Animation/Transitions/BoxShadowsTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/BoxShadowsTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/BoxShadowsTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/BrushTransition.cs b/src/Avalonia.Base/Animation/Transitions/BrushTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/BrushTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/BrushTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/ColorTransition.cs b/src/Avalonia.Base/Animation/Transitions/ColorTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/ColorTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/ColorTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/CornerRadiusTransition.cs b/src/Avalonia.Base/Animation/Transitions/CornerRadiusTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/CornerRadiusTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/CornerRadiusTransition.cs
diff --git a/src/Avalonia.Animation/Transitions/DoubleTransition.cs b/src/Avalonia.Base/Animation/Transitions/DoubleTransition.cs
similarity index 100%
rename from src/Avalonia.Animation/Transitions/DoubleTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/DoubleTransition.cs
diff --git a/src/Avalonia.Animation/Transitions/FloatTransition.cs b/src/Avalonia.Base/Animation/Transitions/FloatTransition.cs
similarity index 100%
rename from src/Avalonia.Animation/Transitions/FloatTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/FloatTransition.cs
diff --git a/src/Avalonia.Animation/Transitions/IntegerTransition.cs b/src/Avalonia.Base/Animation/Transitions/IntegerTransition.cs
similarity index 100%
rename from src/Avalonia.Animation/Transitions/IntegerTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/IntegerTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs b/src/Avalonia.Base/Animation/Transitions/PointTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/PointTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/RelativePointTransition.cs b/src/Avalonia.Base/Animation/Transitions/RelativePointTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/RelativePointTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/RelativePointTransition.cs
diff --git a/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs b/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs
new file mode 100644
index 0000000000..239f3aea08
--- /dev/null
+++ b/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Media;
+using Avalonia.Styling;
+
+namespace Avalonia.Animation;
+
+public class Rotate3DTransition: PageSlide
+{
+
+    /// <summary>
+    ///  Creates a new instance of the <see cref="Rotate3DTransition"/>
+    /// </summary>
+    /// <param name="duration">How long the rotation should take place</param>
+    /// <param name="orientation">The orientation of the rotation</param>
+    /// <param name="depth">Defines the depth of the 3D Effect. If null, depth will be calculated automatically from the width or height of the common parent of the visual being rotated</param>
+    public Rotate3DTransition(TimeSpan duration, SlideAxis orientation = SlideAxis.Horizontal, double? depth = null)
+        : base(duration, orientation)
+    {
+        Depth = depth;
+    }
+    
+    /// <summary>
+    ///  Defines the depth of the 3D Effect. If null, depth will be calculated automatically from the width or height
+    ///  of the common parent of the visual being rotated.
+    /// </summary>
+    public double? Depth { get; set; }
+
+    /// <summary>
+    ///  Creates a new instance of the <see cref="Rotate3DTransition"/>
+    /// </summary>
+    public Rotate3DTransition() { }
+
+    /// <inheritdoc />
+    public override async Task Start(Visual? @from, Visual? to, bool forward, CancellationToken cancellationToken)
+    {
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
+
+        var tasks = new Task[from != null && to != null ? 2 : 1];
+        var parent = GetVisualParent(from, to);
+        var (rotateProperty, center) = Orientation switch
+        {
+            SlideAxis.Vertical => (Rotate3DTransform.AngleXProperty, parent.Bounds.Height),
+            SlideAxis.Horizontal => (Rotate3DTransform.AngleYProperty, parent.Bounds.Width),
+            _ => throw new ArgumentOutOfRangeException()
+        };
+
+        var depthSetter = new Setter {Property = Rotate3DTransform.DepthProperty, Value = Depth ?? center};
+        var centerZSetter = new Setter {Property = Rotate3DTransform.CenterZProperty, Value = -center / 2};
+
+        KeyFrame CreateKeyFrame(double cue, double rotation, int zIndex, bool isVisible = true) => 
+            new() {
+                Setters =
+                {
+                    new Setter { Property = rotateProperty, Value = rotation },
+                    new Setter { Property = Visual.ZIndexProperty, Value = zIndex },
+                    new Setter { Property = Visual.IsVisibleProperty, Value = isVisible },
+                    centerZSetter,
+                    depthSetter
+                },
+                Cue = new Cue(cue)
+            };
+
+        if (from != null)
+        {
+            var animation = new Animation
+            {
+                Easing = SlideOutEasing,
+                Duration = Duration,
+                FillMode = FillMode.Forward,
+                Children =
+                {
+                    CreateKeyFrame(0d, 0d, 2),
+                    CreateKeyFrame(0.5d, 45d * (forward ? -1 : 1), 1),
+                    CreateKeyFrame(1d, 90d * (forward ? -1 : 1), 1, isVisible: false)
+                }
+            };
+
+            tasks[0] = animation.RunAsync(from, null, cancellationToken);
+        }
+
+        if (to != null)
+        {
+            to.IsVisible = true;
+            var animation = new Animation
+            {
+                Easing = SlideInEasing,
+                Duration = Duration,
+                FillMode = FillMode.Forward,
+                Children =
+                {
+                    CreateKeyFrame(0d, 90d * (forward ? 1 : -1), 1),
+                    CreateKeyFrame(0.5d, 45d * (forward ? 1 : -1), 1),
+                    CreateKeyFrame(1d, 0d, 2)
+                }
+            };
+
+            tasks[from != null ? 1 : 0] = animation.RunAsync(to, null, cancellationToken);
+        }
+
+        await Task.WhenAll(tasks);
+
+        if (!cancellationToken.IsCancellationRequested)
+        {
+            if (to != null)
+            {
+                to.ZIndex = 2;
+            }
+            
+            if (from != null)
+            {
+                from.IsVisible = false;
+                from.ZIndex = 1;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/Transitions/SizeTransition.cs b/src/Avalonia.Base/Animation/Transitions/SizeTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/SizeTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/SizeTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs b/src/Avalonia.Base/Animation/Transitions/ThicknessTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/ThicknessTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/TransformOperationsTransition.cs b/src/Avalonia.Base/Animation/Transitions/TransformOperationsTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/TransformOperationsTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/TransformOperationsTransition.cs
diff --git a/src/Avalonia.Visuals/Animation/Transitions/VectorTransition.cs b/src/Avalonia.Base/Animation/Transitions/VectorTransition.cs
similarity index 100%
rename from src/Avalonia.Visuals/Animation/Transitions/VectorTransition.cs
rename to src/Avalonia.Base/Animation/Transitions/VectorTransition.cs
diff --git a/src/Avalonia.Animation/Utils/BounceEaseUtils.cs b/src/Avalonia.Base/Animation/Utils/BounceEaseUtils.cs
similarity index 100%
rename from src/Avalonia.Animation/Utils/BounceEaseUtils.cs
rename to src/Avalonia.Base/Animation/Utils/BounceEaseUtils.cs
diff --git a/src/Avalonia.Animation/Utils/EasingUtils.cs b/src/Avalonia.Base/Animation/Utils/EasingUtils.cs
similarity index 100%
rename from src/Avalonia.Animation/Utils/EasingUtils.cs
rename to src/Avalonia.Base/Animation/Utils/EasingUtils.cs
diff --git a/src/Avalonia.Base/ApiCompatBaseline.txt b/src/Avalonia.Base/ApiCompatBaseline.txt
index 4701a83175..7f378d2f65 100644
--- a/src/Avalonia.Base/ApiCompatBaseline.txt
+++ b/src/Avalonia.Base/ApiCompatBaseline.txt
@@ -1,3 +1,4 @@
 Compat issues with assembly Avalonia.Base:
+MembersMustExist : Member 'public System.Int32 System.Int32 Avalonia.Threading.DispatcherPriority.value__' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Threading.IDispatcher.Post<T>(System.Action<T>, T, Avalonia.Threading.DispatcherPriority)' is present in the implementation but not in the contract.
-Total Issues: 1
+Total Issues: 2
diff --git a/src/Avalonia.Visuals/Assets/BiDi.trie b/src/Avalonia.Base/Assets/BiDi.trie
similarity index 100%
rename from src/Avalonia.Visuals/Assets/BiDi.trie
rename to src/Avalonia.Base/Assets/BiDi.trie
diff --git a/src/Avalonia.Visuals/Assets/GraphemeBreak.trie b/src/Avalonia.Base/Assets/GraphemeBreak.trie
similarity index 100%
rename from src/Avalonia.Visuals/Assets/GraphemeBreak.trie
rename to src/Avalonia.Base/Assets/GraphemeBreak.trie
diff --git a/src/Avalonia.Visuals/Assets/UnicodeData.trie b/src/Avalonia.Base/Assets/UnicodeData.trie
similarity index 100%
rename from src/Avalonia.Visuals/Assets/UnicodeData.trie
rename to src/Avalonia.Base/Assets/UnicodeData.trie
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index 376075df2a..a07e0e3667 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -5,6 +5,9 @@
     <RootNamespace>Avalonia</RootNamespace>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>    
   </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Assets\*.trie" />
+  </ItemGroup>
   <Import Project="..\..\build\Base.props" />
   <Import Project="..\..\build\Binding.props" />
   <Import Project="..\..\build\Rx.props" />
@@ -12,4 +15,23 @@
   <Import Project="..\..\build\System.Memory.props" />
   <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\NullableEnable.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
+  <Import Project="..\..\build\SourceGenerators.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Base.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Controls, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Controls.ColorPicker, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Controls.DataGrid, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Controls.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.DesignerSupport, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Direct2D1.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.LeakTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Markup.Xaml.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Skia.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Skia.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Web.Blazor, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7"/>
+  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 437339d3b2..1f14ddede4 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -5,6 +5,7 @@ using Avalonia.Data;
 using Avalonia.Diagnostics;
 using Avalonia.Logging;
 using Avalonia.PropertyStore;
+using Avalonia.Reactive;
 using Avalonia.Threading;
 
 namespace Avalonia
@@ -15,13 +16,13 @@ namespace Avalonia
     /// <remarks>
     /// This class is analogous to DependencyObject in WPF.
     /// </remarks>
-    public class AvaloniaObject : IAvaloniaObject, IAvaloniaObjectDebug, INotifyPropertyChanged, IValueSink
+    public class AvaloniaObject : IAvaloniaObject, IAvaloniaObjectDebug, INotifyPropertyChanged
     {
-        private IAvaloniaObject? _inheritanceParent;
+        private AvaloniaObject? _inheritanceParent;
         private List<IDisposable>? _directBindings;
         private PropertyChangedEventHandler? _inpcChanged;
         private EventHandler<AvaloniaPropertyChangedEventArgs>? _propertyChanged;
-        private List<IAvaloniaObject>? _inheritanceChildren;
+        private List<AvaloniaObject>? _inheritanceChildren;
         private ValueStore? _values;
         private bool _batchUpdate;
 
@@ -58,7 +59,7 @@ namespace Avalonia
         /// <value>
         /// The inheritance parent.
         /// </value>
-        protected IAvaloniaObject? InheritanceParent
+        protected AvaloniaObject? InheritanceParent
         {
             get
             {
@@ -320,14 +321,14 @@ namespace Avalonia
         /// <param name="property">The property.</param>
         /// <param name="value">The value.</param>
         /// <param name="priority">The priority of the value.</param>
-        public void SetValue(
+        public IDisposable? SetValue(
             AvaloniaProperty property,
             object? value,
             BindingPriority priority = BindingPriority.LocalValue)
         {
             property = property ?? throw new ArgumentNullException(nameof(property));
 
-            property.RouteSetValue(this, value, priority);
+            return property.RouteSetValue(this, value, priority);
         }
 
         /// <summary>
@@ -385,6 +386,26 @@ namespace Avalonia
             SetDirectValueUnchecked(property, value);
         }
 
+        /// <summary>
+        /// Binds a <see cref="AvaloniaProperty"/> to an observable.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <param name="source">The observable.</param>
+        /// <param name="priority">The priority of the binding.</param>
+        /// <returns>
+        /// A disposable which can be used to terminate the binding.
+        /// </returns>
+        public IDisposable Bind(
+            AvaloniaProperty property,
+            IObservable<object?> source,
+            BindingPriority priority = BindingPriority.LocalValue)
+        {
+            property = property ?? throw new ArgumentNullException(nameof(property));
+            source = source ?? throw new ArgumentNullException(nameof(source));
+
+            return property.RouteBind(this, source.ToBindingValue(), priority);
+        }
+
         /// <summary>
         /// Binds a <see cref="AvaloniaProperty"/> to an observable.
         /// </summary>
@@ -445,9 +466,8 @@ namespace Avalonia
         /// <summary>
         /// Coerces the specified <see cref="AvaloniaProperty"/>.
         /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
-        public void CoerceValue<T>(StyledPropertyBase<T> property)
+        public void CoerceValue(AvaloniaProperty property)
         {
             _values?.CoerceValue(property);
         }
@@ -475,19 +495,19 @@ namespace Avalonia
         }
 
         /// <inheritdoc/>
-        void IAvaloniaObject.AddInheritanceChild(IAvaloniaObject child)
+        internal void AddInheritanceChild(AvaloniaObject child)
         {
-            _inheritanceChildren ??= new List<IAvaloniaObject>();
+            _inheritanceChildren ??= new List<AvaloniaObject>();
             _inheritanceChildren.Add(child);
         }
         
         /// <inheritdoc/>
-        void IAvaloniaObject.RemoveInheritanceChild(IAvaloniaObject child)
+        internal void RemoveInheritanceChild(AvaloniaObject child)
         {
             _inheritanceChildren?.Remove(child);
         }
 
-        void IAvaloniaObject.InheritedPropertyChanged<T>(
+        internal void InheritedPropertyChanged<T>(
             AvaloniaProperty<T> property,
             Optional<T> oldValue,
             Optional<T> newValue)
@@ -504,7 +524,7 @@ namespace Avalonia
             return _propertyChanged?.GetInvocationList();
         }
 
-        void IValueSink.ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        internal void ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
             var property = (StyledPropertyBase<T>)change.Property;
 
@@ -543,7 +563,7 @@ namespace Avalonia
             }
         }
 
-        void IValueSink.Completed<T>(
+        internal void Completed<T>(
             StyledPropertyBase<T> property,
             IPriorityValueEntry entry,
             Optional<T> oldValue) 
@@ -554,7 +574,7 @@ namespace Avalonia
                 oldValue,
                 default,
                 BindingPriority.Unset);
-            ((IValueSink)this).ValueChanged(change);
+            ValueChanged(change);
         }
 
         /// <summary>
@@ -565,14 +585,11 @@ namespace Avalonia
         /// <param name="oldParent">The old inheritance parent.</param>
         internal void InheritanceParentChanged<T>(
             StyledPropertyBase<T> property,
-            IAvaloniaObject? oldParent)
+            AvaloniaObject? oldParent)
         {
-            var oldValue = oldParent switch
-            {
-                AvaloniaObject o => o.GetValueOrInheritedOrDefault(property),
-                null => property.GetDefaultValue(GetType()),
-                _ => oldParent.GetValue(property)
-            };
+            var oldValue = oldParent is not null ?
+                oldParent.GetValueOrInheritedOrDefault(property) :
+                property.GetDefaultValue(GetType());
 
             var newValue = GetInheritedOrDefault(property);
 
@@ -629,10 +646,12 @@ namespace Avalonia
         /// enabled.
         /// </summary>
         /// <param name="property">The property.</param>
-        /// <param name="value">The new binding value for the property.</param>
-        protected virtual void UpdateDataValidation<T>(
-            AvaloniaProperty<T> property,
-            BindingValue<T> value)
+        /// <param name="state">The current data binding state.</param>
+        /// <param name="error">The current data binding error, if any.</param>
+        protected virtual void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
         }
 
@@ -640,7 +659,7 @@ namespace Avalonia
         /// Called when a avalonia property changes on the object.
         /// </summary>
         /// <param name="change">The property change details.</param>
-        protected virtual void OnPropertyChangedCore<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected virtual void OnPropertyChangedCore(AvaloniaPropertyChangedEventArgs change)
         {
             if (change.IsEffectiveValueChange)
             {
@@ -652,7 +671,7 @@ namespace Avalonia
         /// Called when a avalonia property changes on the object.
         /// </summary>
         /// <param name="change">The property change details.</param>
-        protected virtual void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected virtual void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
         }
 
@@ -843,7 +862,7 @@ namespace Avalonia
 
             if (metadata.EnableDataValidation == true)
             {
-                UpdateDataValidation(property, value);
+                UpdateDataValidation(property, value.Type, value.Error);
             }
         }
 
diff --git a/src/Avalonia.Base/AvaloniaObjectExtensions.cs b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
index 51237409bf..134e3b2ac7 100644
--- a/src/Avalonia.Base/AvaloniaObjectExtensions.cs
+++ b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
@@ -25,7 +25,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets an observable for a <see cref="AvaloniaProperty"/>.
+        /// Gets an observable for an <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <param name="o">The object.</param>
         /// <param name="property">The property.</param>
@@ -44,7 +44,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets an observable for a <see cref="AvaloniaProperty"/>.
+        /// Gets an observable for an <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <param name="o">The object.</param>
         /// <typeparam name="T">The property type.</typeparam>
@@ -64,7 +64,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets an observable for a <see cref="AvaloniaProperty"/>.
+        /// Gets an observable for an <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <param name="o">The object.</param>
         /// <param name="property">The property.</param>
@@ -85,7 +85,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets an observable for a <see cref="AvaloniaProperty"/>.
+        /// Gets an observable for an <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <param name="o">The object.</param>
         /// <typeparam name="T">The property type.</typeparam>
@@ -128,7 +128,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets a subject for a <see cref="AvaloniaProperty"/>.
+        /// Gets a subject for an <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <param name="o">The object.</param>
         /// <param name="property">The property.</param>
@@ -150,7 +150,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets a subject for a <see cref="AvaloniaProperty"/>.
+        /// Gets a subject for an <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <typeparam name="T">The property type.</typeparam>
         /// <param name="o">The object.</param>
@@ -230,30 +230,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Binds a <see cref="AvaloniaProperty"/> to an observable.
-        /// </summary>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        /// <param name="source">The observable.</param>
-        /// <param name="priority">The priority of the binding.</param>
-        /// <returns>
-        /// A disposable which can be used to terminate the binding.
-        /// </returns>
-        public static IDisposable Bind(
-            this IAvaloniaObject target,
-            AvaloniaProperty property,
-            IObservable<BindingValue<object?>> source,
-            BindingPriority priority = BindingPriority.LocalValue)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-            source = source ?? throw new ArgumentNullException(nameof(source));
-
-            return property.RouteBind(target, source, priority);
-        }
-
-        /// <summary>
-        /// Binds a <see cref="AvaloniaProperty"/> to an observable.
+        /// Binds an <see cref="AvaloniaProperty"/> to an observable.
         /// </summary>
         /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="target">The object.</param>
@@ -273,42 +250,22 @@ namespace Avalonia
             property = property ?? throw new ArgumentNullException(nameof(property));
             source = source ?? throw new ArgumentNullException(nameof(source));
 
-            return property switch
+            if (target is AvaloniaObject ao)
             {
-                StyledPropertyBase<T> styled => target.Bind(styled, source, priority),
-                DirectPropertyBase<T> direct => target.Bind(direct, source),
-                _ => throw new NotSupportedException("Unsupported AvaloniaProperty type."),
-            };
-        }
+                return property switch
+                {
+                    StyledPropertyBase<T> styled => ao.Bind(styled, source, priority),
+                    DirectPropertyBase<T> direct => ao.Bind(direct, source),
+                    _ => throw new NotSupportedException("Unsupported AvaloniaProperty type."),
+                };
+            }
 
-        /// <summary>
-        /// Binds a <see cref="AvaloniaProperty"/> to an observable.
-        /// </summary>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        /// <param name="source">The observable.</param>
-        /// <param name="priority">The priority of the binding.</param>
-        /// <returns>
-        /// A disposable which can be used to terminate the binding.
-        /// </returns>
-        public static IDisposable Bind(
-            this IAvaloniaObject target,
-            AvaloniaProperty property,
-            IObservable<object?> source,
-            BindingPriority priority = BindingPriority.LocalValue)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-            source = source ?? throw new ArgumentNullException(nameof(source));
+            throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.");
 
-            return target.Bind(
-                property,
-                source.ToBindingValue(),
-                priority);
         }
 
         /// <summary>
-        /// Binds a <see cref="AvaloniaProperty"/> to an observable.
+        /// Binds an <see cref="AvaloniaProperty"/> to an observable.
         /// </summary>
         /// <param name="target">The object.</param>
         /// <param name="property">The property.</param>
@@ -334,7 +291,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Binds a property on an <see cref="IAvaloniaObject"/> to an <see cref="IBinding"/>.
+        /// Binds a property on an <see cref="AvaloniaObject"/> to an <see cref="IBinding"/>.
         /// </summary>
         /// <param name="target">The object.</param>
         /// <param name="property">The property to bind.</param>
@@ -374,56 +331,6 @@ namespace Avalonia
             }
         }
 
-        /// <summary>
-        /// Clears a <see cref="AvaloniaProperty"/>'s local value.
-        /// </summary>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        public static void ClearValue(this IAvaloniaObject target, AvaloniaProperty property)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-
-            property.RouteClearValue(target);
-        }
-
-        /// <summary>
-        /// Clears a <see cref="AvaloniaProperty"/>'s local value.
-        /// </summary>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        public static void ClearValue<T>(this IAvaloniaObject target, AvaloniaProperty<T> property)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-
-            switch (property)
-            {
-                case StyledPropertyBase<T> styled:
-                    target.ClearValue(styled);
-                    break;
-                case DirectPropertyBase<T> direct:
-                    target.ClearValue(direct);
-                    break;
-                default:
-                    throw new NotSupportedException("Unsupported AvaloniaProperty type.");
-            }
-        }
-
-        /// <summary>
-        /// Gets a <see cref="AvaloniaProperty"/> value.
-        /// </summary>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        /// <returns>The value.</returns>
-        public static object? GetValue(this IAvaloniaObject target, AvaloniaProperty property)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-
-            return property.RouteGetValue(target);
-        }
-
         /// <summary>
         /// Gets a <see cref="AvaloniaProperty"/> value.
         /// </summary>
@@ -436,12 +343,18 @@ namespace Avalonia
             target = target ?? throw new ArgumentNullException(nameof(target));
             property = property ?? throw new ArgumentNullException(nameof(property));
 
-            return property switch
+            if (target is AvaloniaObject ao)
             {
-                StyledPropertyBase<T> styled => target.GetValue(styled),
-                DirectPropertyBase<T> direct => target.GetValue(direct),
-                _ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
-            };
+                return property switch
+                {
+                    StyledPropertyBase<T> styled => ao.GetValue(styled),
+                    DirectPropertyBase<T> direct => ao.GetValue(direct),
+                    _ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
+                };
+
+            }
+
+            throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.");
         }
 
         /// <summary>
@@ -456,7 +369,7 @@ namespace Avalonia
         /// <see cref="AvaloniaProperty.UnsetValue"/>. Note that this method does not return
         /// property values that come from inherited or default values.
         /// 
-        /// For direct properties returns <see cref="GetValue(IAvaloniaObject, AvaloniaProperty)"/>.
+        /// For direct properties returns the current value of the property.
         /// </remarks>
         public static object? GetBaseValue(
             this IAvaloniaObject target,
@@ -466,7 +379,9 @@ namespace Avalonia
             target = target ?? throw new ArgumentNullException(nameof(target));
             property = property ?? throw new ArgumentNullException(nameof(property));
 
-            return property.RouteGetBaseValue(target, maxPriority);
+            if (target is AvaloniaObject ao)
+                return property.RouteGetBaseValue(ao, maxPriority);
+            throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.");
         }
 
         /// <summary>
@@ -481,8 +396,7 @@ namespace Avalonia
         /// <see cref="Optional{T}.Empty"/>. Note that this method does not return property values
         /// that come from inherited or default values.
         /// 
-        /// For direct properties returns
-        /// <see cref="IAvaloniaObject.GetValue{T}(DirectPropertyBase{T})"/>.
+        /// For direct properties returns the current value of the property.
         /// </remarks>
         public static Optional<T> GetBaseValue<T>(
             this IAvaloniaObject target,
@@ -492,69 +406,18 @@ namespace Avalonia
             target = target ?? throw new ArgumentNullException(nameof(target));
             property = property ?? throw new ArgumentNullException(nameof(property));
 
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-
-            return property switch
+            if (target is AvaloniaObject ao)
             {
-                StyledPropertyBase<T> styled => target.GetBaseValue(styled, maxPriority),
-                DirectPropertyBase<T> direct => target.GetValue(direct),
-                _ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
-            };
-        }
-
-        /// <summary>
-        /// Sets a <see cref="AvaloniaProperty"/> value.
-        /// </summary>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="priority">The priority of the value.</param>
-        /// <returns>
-        /// An <see cref="IDisposable"/> if setting the property can be undone, otherwise null.
-        /// </returns>
-        public static IDisposable? SetValue(
-            this IAvaloniaObject target,
-            AvaloniaProperty property,
-            object? value,
-            BindingPriority priority = BindingPriority.LocalValue)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
-
-            return property.RouteSetValue(target, value, priority);
-        }
-
-        /// <summary>
-        /// Sets a <see cref="AvaloniaProperty"/> value.
-        /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
-        /// <param name="target">The object.</param>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="priority">The priority of the value.</param>
-        /// <returns>
-        /// An <see cref="IDisposable"/> if setting the property can be undone, otherwise null.
-        /// </returns>
-        public static IDisposable? SetValue<T>(
-            this IAvaloniaObject target,
-            AvaloniaProperty<T> property,
-            T value,
-            BindingPriority priority = BindingPriority.LocalValue)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-            property = property ?? throw new ArgumentNullException(nameof(property));
+                return property switch
+                {
+                    StyledPropertyBase<T> styled => ao.GetBaseValue(styled, maxPriority),
+                    DirectPropertyBase<T> direct => ao.GetValue(direct),
+                    _ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
+                };
 
-            switch (property)
-            {
-                case StyledPropertyBase<T> styled:
-                    return target.SetValue(styled, value, priority);
-                case DirectPropertyBase<T> direct:
-                    target.SetValue(direct, value);
-                    return null;
-                default:
-                    throw new NotSupportedException("Unsupported AvaloniaProperty type.");
             }
+
+            throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.");
         }
 
         /// <summary>
@@ -622,17 +485,6 @@ namespace Avalonia
             return observable.Subscribe(e => SubscribeAdapter(e, handler));
         }
 
-        /// <summary>
-        /// Gets a description of a property that van be used in observables.
-        /// </summary>
-        /// <param name="o">The object.</param>
-        /// <param name="property">The property</param>
-        /// <returns>The description.</returns>
-        private static string GetDescription(IAvaloniaObject o, AvaloniaProperty property)
-        {
-            return $"{o.GetType().Name}.{property.Name}";
-        }
-
         /// <summary>
         /// Observer method for <see cref="AddClassHandler{TTarget}(IObservable{AvaloniaPropertyChangedEventArgs},
         /// Func{TTarget, Action{AvaloniaPropertyChangedEventArgs}})"/>.
diff --git a/src/Avalonia.Base/AvaloniaProperty.cs b/src/Avalonia.Base/AvaloniaProperty.cs
index 3d1e898f50..fd43ced196 100644
--- a/src/Avalonia.Base/AvaloniaProperty.cs
+++ b/src/Avalonia.Base/AvaloniaProperty.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using Avalonia.Data;
 using Avalonia.Data.Core;
+using Avalonia.Styling;
 using Avalonia.Utilities;
 
 namespace Avalonia
@@ -454,33 +455,24 @@ namespace Avalonia
             return Name;
         }
 
-        /// <summary>
-        /// Uses the visitor pattern to resolve an untyped property to a typed property.
-        /// </summary>
-        /// <typeparam name="TData">The type of user data passed.</typeparam>
-        /// <param name="visitor">The visitor which will accept the typed property.</param>
-        /// <param name="data">The user data to pass.</param>
-        public abstract void Accept<TData>(IAvaloniaPropertyVisitor<TData> visitor, ref TData data)
-            where TData : struct;
-
         /// <summary>
         /// Routes an untyped ClearValue call to a typed call.
         /// </summary>
         /// <param name="o">The object instance.</param>
-        internal abstract void RouteClearValue(IAvaloniaObject o);
+        internal abstract void RouteClearValue(AvaloniaObject o);
 
         /// <summary>
         /// Routes an untyped GetValue call to a typed call.
         /// </summary>
         /// <param name="o">The object instance.</param>
-        internal abstract object? RouteGetValue(IAvaloniaObject o);
+        internal abstract object? RouteGetValue(AvaloniaObject o);
 
         /// <summary>
         /// Routes an untyped GetBaseValue call to a typed call.
         /// </summary>
         /// <param name="o">The object instance.</param>
         /// <param name="maxPriority">The maximum priority for the value.</param>
-        internal abstract object? RouteGetBaseValue(IAvaloniaObject o, BindingPriority maxPriority);
+        internal abstract object? RouteGetBaseValue(AvaloniaObject o, BindingPriority maxPriority);
 
         /// <summary>
         /// Routes an untyped SetValue call to a typed call.
@@ -492,7 +484,7 @@ namespace Avalonia
         /// An <see cref="IDisposable"/> if setting the property can be undone, otherwise null.
         /// </returns>
         internal abstract IDisposable? RouteSetValue(
-            IAvaloniaObject o,
+            AvaloniaObject o,
             object? value,
             BindingPriority priority);
 
@@ -503,11 +495,12 @@ namespace Avalonia
         /// <param name="source">The binding source.</param>
         /// <param name="priority">The priority.</param>
         internal abstract IDisposable RouteBind(
-            IAvaloniaObject o,
+            AvaloniaObject o,
             IObservable<BindingValue<object?>> source,
             BindingPriority priority);
 
-        internal abstract void RouteInheritanceParentChanged(AvaloniaObject o, IAvaloniaObject? oldParent);
+        internal abstract void RouteInheritanceParentChanged(AvaloniaObject o, AvaloniaObject? oldParent);
+        internal abstract ISetterInstance CreateSetterInstance(IStyleable target, object? value);
 
         /// <summary>
         /// Overrides the metadata for the property on the specified type.
diff --git a/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs b/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs
index 445f35aad2..45c67b9f48 100644
--- a/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs
+++ b/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs
@@ -55,7 +55,7 @@ namespace Avalonia
         /// </summary>
         /// <remarks>
         /// This will usually be true, except in
-        /// <see cref="AvaloniaObject.OnPropertyChangedCore{T}(AvaloniaPropertyChangedEventArgs{T})"/>
+        /// <see cref="AvaloniaObject.OnPropertyChangedCore(AvaloniaPropertyChangedEventArgs)"/>
         /// which receives notifications for all changes to property values, whether a value with a higher
         /// priority is present or not. When this property is false, the change that is being signaled
         /// has not resulted in a change to the property value on the object.
diff --git a/src/Avalonia.Base/AvaloniaPropertyChangedExtensions.cs b/src/Avalonia.Base/AvaloniaPropertyChangedExtensions.cs
new file mode 100644
index 0000000000..a52d6d15ab
--- /dev/null
+++ b/src/Avalonia.Base/AvaloniaPropertyChangedExtensions.cs
@@ -0,0 +1,43 @@
+namespace Avalonia
+{
+    /// <summary>
+    /// Provides extensions for <see cref="AvaloniaPropertyChangedEventArgs"/>.
+    /// </summary>
+    public static class AvaloniaPropertyChangedExtensions
+    {
+        /// <summary>
+        /// Gets a typed value from <see cref="AvaloniaPropertyChangedEventArgs.OldValue"/>.
+        /// </summary>
+        /// <typeparam name="T">The value type.</typeparam>
+        /// <param name="e">The event args.</param>
+        /// <returns>The value.</returns>
+        public static T GetOldValue<T>(this AvaloniaPropertyChangedEventArgs e)
+        {
+            return ((AvaloniaPropertyChangedEventArgs<T>)e).OldValue.GetValueOrDefault()!;
+        }
+
+        /// <summary>
+        /// Gets a typed value from <see cref="AvaloniaPropertyChangedEventArgs.NewValue"/>.
+        /// </summary>
+        /// <typeparam name="T">The value type.</typeparam>
+        /// <param name="e">The event args.</param>
+        /// <returns>The value.</returns>
+        public static T GetNewValue<T>(this AvaloniaPropertyChangedEventArgs e)
+        {
+            return ((AvaloniaPropertyChangedEventArgs<T>)e).NewValue.GetValueOrDefault()!;
+        }
+
+        /// <summary>
+        /// Gets a typed value from <see cref="AvaloniaPropertyChangedEventArgs.OldValue"/> and
+        /// <see cref="AvaloniaPropertyChangedEventArgs.NewValue"/>.
+        /// </summary>
+        /// <typeparam name="T">The value type.</typeparam>
+        /// <param name="e">The event args.</param>
+        /// <returns>The value.</returns>
+        public static (T oldValue, T newValue) GetOldAndNewValue<T>(this AvaloniaPropertyChangedEventArgs e)
+        {
+            var ev = (AvaloniaPropertyChangedEventArgs<T>)e;
+            return (ev.OldValue.GetValueOrDefault()!, ev.NewValue.GetValueOrDefault()!);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/AvaloniaPropertyExtensions.cs b/src/Avalonia.Base/AvaloniaPropertyExtensions.cs
similarity index 100%
rename from src/Avalonia.Visuals/AvaloniaPropertyExtensions.cs
rename to src/Avalonia.Base/AvaloniaPropertyExtensions.cs
diff --git a/src/Avalonia.Styling/ClassBindingManager.cs b/src/Avalonia.Base/ClassBindingManager.cs
similarity index 100%
rename from src/Avalonia.Styling/ClassBindingManager.cs
rename to src/Avalonia.Base/ClassBindingManager.cs
diff --git a/src/Avalonia.Base/Collections/AvaloniaDictionary.cs b/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
index 2fe68e824d..750fb263f5 100644
--- a/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
@@ -123,7 +123,7 @@ namespace Avalonia.Collections
             {
                 var e = new NotifyCollectionChangedEventArgs(
                     NotifyCollectionChangedAction.Remove,
-                    old.ToList(),
+                    old.ToArray(),
                     -1);
                 CollectionChanged(this, e);
             }
diff --git a/src/Avalonia.Base/Collections/AvaloniaList.cs b/src/Avalonia.Base/Collections/AvaloniaList.cs
index 6414328e90..a05c9c5da3 100644
--- a/src/Avalonia.Base/Collections/AvaloniaList.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaList.cs
@@ -222,7 +222,7 @@ namespace Avalonia.Collections
                 {
                     var e = ResetBehavior == ResetBehavior.Reset ?
                         EventArgsCache.ResetCollectionChanged :
-                        new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, _inner.ToList(), 0);
+                        new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, _inner.ToArray(), 0);
 
                     _inner.Clear();
 
@@ -394,7 +394,13 @@ namespace Avalonia.Collections
                         } while (en.MoveNext());
 
                         if (notificationItems is not null)
+                        {
                             NotifyAdd(notificationItems, index);
+                        }
+                        else
+                        {
+                            NotifyCountChanged();
+                        }
                     }
                 }
             }
diff --git a/src/Avalonia.Base/Collections/Pooled/PooledList.cs b/src/Avalonia.Base/Collections/Pooled/PooledList.cs
index 200a52fb0d..803b8d60dc 100644
--- a/src/Avalonia.Base/Collections/Pooled/PooledList.cs
+++ b/src/Avalonia.Base/Collections/Pooled/PooledList.cs
@@ -587,7 +587,7 @@ namespace Avalonia.Collections.Pooled
             if (size > 0 && _clearOnFree)
             {
                 // Clear the elements so that the gc can reclaim the references.
-                Array.Clear(_items, 0, _size);
+                Array.Clear(_items, 0, size);
             }
         }
 
diff --git a/src/Avalonia.Visuals/Media/CombinedGeometry.cs b/src/Avalonia.Base/CombinedGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/CombinedGeometry.cs
rename to src/Avalonia.Base/CombinedGeometry.cs
diff --git a/src/Avalonia.Base/Controls/ChildNameScope.cs b/src/Avalonia.Base/Controls/ChildNameScope.cs
new file mode 100644
index 0000000000..1ceaff924c
--- /dev/null
+++ b/src/Avalonia.Base/Controls/ChildNameScope.cs
@@ -0,0 +1,73 @@
+using System.Threading.Tasks;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    public class ChildNameScope : INameScope
+    {
+        private readonly INameScope _parentScope;
+        private readonly NameScope _inner = new NameScope();
+
+        public ChildNameScope(INameScope parentScope)
+        {
+            _parentScope = parentScope;
+        }
+        
+        public void Register(string name, object element) => _inner.Register(name, element);
+
+        public SynchronousCompletionAsyncResult<object?> FindAsync(string name)
+        {
+            var found = Find(name);
+            if (found != null)
+                return new SynchronousCompletionAsyncResult<object?>(found);
+            // Not found and both current and parent scope are in completed state
+            if(IsCompleted)
+                return new SynchronousCompletionAsyncResult<object?>((object?)null);
+            return DoFindAsync(name);
+        }
+
+        public SynchronousCompletionAsyncResult<object?> DoFindAsync(string name)
+        {
+            var src = new SynchronousCompletionAsyncResultSource<object?>();
+
+            void ParentSearch()
+            {
+                var parentSearch = _parentScope.FindAsync(name);
+                if (parentSearch.IsCompleted)
+                    src.SetResult(parentSearch.GetResult());
+                else
+                    parentSearch.OnCompleted(() => src.SetResult(parentSearch.GetResult()));
+            }
+            if (!_inner.IsCompleted)
+            {
+                // Guaranteed to be incomplete at this point
+                var innerSearch = _inner.FindAsync(name);
+                innerSearch.OnCompleted(() =>
+                {
+                    var value = innerSearch.GetResult();
+                    if (value != null)
+                        src.SetResult(value);
+                    else ParentSearch();
+                });
+            }
+            else
+                ParentSearch();
+
+            return src.AsyncResult;
+        }
+
+        public object? Find(string name)
+        {
+            var found = _inner.Find(name);
+            if (found != null)
+                return found;
+            if (_inner.IsCompleted)
+                return _parentScope.Find(name);
+            return null;
+        }
+
+        public void Complete() => _inner.Complete();
+
+        public bool IsCompleted => _inner.IsCompleted && _parentScope.IsCompleted;
+    }
+}
diff --git a/src/Avalonia.Styling/Controls/Classes.cs b/src/Avalonia.Base/Controls/Classes.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/Classes.cs
rename to src/Avalonia.Base/Controls/Classes.cs
diff --git a/src/Avalonia.Base/Controls/INameScope.cs b/src/Avalonia.Base/Controls/INameScope.cs
new file mode 100644
index 0000000000..a12e88c055
--- /dev/null
+++ b/src/Avalonia.Base/Controls/INameScope.cs
@@ -0,0 +1,46 @@
+using Avalonia.Metadata;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines a name scope.
+    /// </summary>
+    [NotClientImplementable]
+    public interface INameScope
+    {
+        /// <summary>
+        /// Registers an element in the name scope.
+        /// </summary>
+        /// <param name="name">The element name.</param>
+        /// <param name="element">The element.</param>
+        void Register(string name, object element);
+
+        /// <summary>
+        /// Finds a named element in the name scope, waits for the scope to be completely populated before returning null
+        /// Returned task is configured to run any continuations synchronously.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>The element, or null if the name was not found.</returns>
+        SynchronousCompletionAsyncResult<object?> FindAsync(string name);
+        
+        /// <summary>
+        /// Finds a named element in the name scope, returns immediately, doesn't traverse the name scope stack
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>The element, or null if the name was not found.</returns>
+        object? Find(string name);
+
+        /// <summary>
+        /// Marks the name scope as completed, no further registrations will be allowed
+        /// </summary>
+        void Complete();
+        
+        /// <summary>
+        /// Returns whether further registrations are allowed on the scope
+        /// </summary>
+        bool IsCompleted { get; }
+
+
+    }
+}
diff --git a/src/Avalonia.Base/Controls/IPseudoClasses.cs b/src/Avalonia.Base/Controls/IPseudoClasses.cs
new file mode 100644
index 0000000000..eda521727f
--- /dev/null
+++ b/src/Avalonia.Base/Controls/IPseudoClasses.cs
@@ -0,0 +1,23 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Exposes an interface for setting pseudoclasses on a <see cref="Classes"/> collection.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IPseudoClasses
+    {
+        /// <summary>
+        /// Adds a pseudoclass to the collection.
+        /// </summary>
+        /// <param name="name">The pseudoclass name.</param>
+        void Add(string name);
+
+        /// <summary>
+        /// Removes a pseudoclass from the collection.
+        /// </summary>
+        /// <param name="name">The pseudoclass name.</param>
+        bool Remove(string name);
+    }
+}
diff --git a/src/Avalonia.Styling/Controls/IResourceDictionary.cs b/src/Avalonia.Base/Controls/IResourceDictionary.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/IResourceDictionary.cs
rename to src/Avalonia.Base/Controls/IResourceDictionary.cs
diff --git a/src/Avalonia.Base/Controls/IResourceHost.cs b/src/Avalonia.Base/Controls/IResourceHost.cs
new file mode 100644
index 0000000000..286f0e36ef
--- /dev/null
+++ b/src/Avalonia.Base/Controls/IResourceHost.cs
@@ -0,0 +1,32 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Represents an element which hosts resources.
+    /// </summary>
+    /// <remarks>
+    /// This interface is implemented by <see cref="StyledElement"/> and `Application`.
+    /// </remarks>
+    [NotClientImplementable]
+    public interface IResourceHost : IResourceNode
+    {
+        /// <summary>
+        /// Raised when the resources change on the element or an ancestor of the element.
+        /// </summary>
+        event EventHandler<ResourcesChangedEventArgs>? ResourcesChanged;
+
+        /// <summary>
+        /// Notifies the resource host that one or more of its hosted resources has changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        /// <remarks>
+        /// This method will be called automatically by the framework, you should not need to call
+        /// this method yourself. It is called when the resources hosted by this element have
+        /// changed, and is usually called by a resource dictionary or style hosted by the element
+        /// in response to a resource being added or removed.
+        /// </remarks>
+        void NotifyHostedResourcesChanged(ResourcesChangedEventArgs e);
+    }
+}
diff --git a/src/Avalonia.Base/Controls/IResourceNode.cs b/src/Avalonia.Base/Controls/IResourceNode.cs
new file mode 100644
index 0000000000..d6c900f97f
--- /dev/null
+++ b/src/Avalonia.Base/Controls/IResourceNode.cs
@@ -0,0 +1,35 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Represents an object that can be queried for resources.
+    /// </summary>
+    /// <remarks>
+    /// The interface represents a common interface for both controls that host resources
+    /// (<see cref="IResourceHost"/>) and resource providers such as <see cref="ResourceDictionary"/>
+    /// (see <see cref="IResourceProvider"/>).
+    /// </remarks>
+    [NotClientImplementable]
+    public interface IResourceNode
+    {
+        /// <summary>
+        /// Gets a value indicating whether the object has resources.
+        /// </summary>
+        bool HasResources { get; }
+
+        /// <summary>
+        /// Tries to find a resource within the object.
+        /// </summary>
+        /// <param name="key">The resource key.</param>
+        /// <param name="value">
+        /// When this method returns, contains the value associated with the specified key,
+        /// if the key is found; otherwise, null.
+        /// </param>
+        /// <returns>
+        /// True if the resource if found, otherwise false.
+        /// </returns>
+        bool TryGetResource(object key, out object? value);
+    }
+}
diff --git a/src/Avalonia.Styling/Controls/IResourceProvider.cs b/src/Avalonia.Base/Controls/IResourceProvider.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/IResourceProvider.cs
rename to src/Avalonia.Base/Controls/IResourceProvider.cs
diff --git a/src/Avalonia.Base/Controls/ISetInheritanceParent.cs b/src/Avalonia.Base/Controls/ISetInheritanceParent.cs
new file mode 100644
index 0000000000..e85e025005
--- /dev/null
+++ b/src/Avalonia.Base/Controls/ISetInheritanceParent.cs
@@ -0,0 +1,22 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines an interface through which a <see cref="StyledElement"/>'s inheritance parent can be set.
+    /// </summary>
+    /// <remarks>
+    /// You should not usually need to use this interface - it is for advanced scenarios only.
+    /// Additionally, <see cref="ISetLogicalParent"/> also sets the inheritance parent; this
+    /// interface is only needed where the logical and inheritance parents differ.
+    /// </remarks>
+    [NotClientImplementable]
+    public interface ISetInheritanceParent
+    {
+        /// <summary>
+        /// Sets the control's inheritance parent.
+        /// </summary>
+        /// <param name="parent">The parent.</param>
+        void SetParent(IAvaloniaObject? parent);
+    }
+}
diff --git a/src/Avalonia.Base/Controls/ISetLogicalParent.cs b/src/Avalonia.Base/Controls/ISetLogicalParent.cs
new file mode 100644
index 0000000000..7f1b4b5d87
--- /dev/null
+++ b/src/Avalonia.Base/Controls/ISetLogicalParent.cs
@@ -0,0 +1,21 @@
+using Avalonia.LogicalTree;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines an interface through which a <see cref="StyledElement"/>'s logical parent can be set.
+    /// </summary>
+    /// <remarks>
+    /// You should not usually need to use this interface - it is for advanced scenarios only.
+    /// </remarks>
+    [NotClientImplementable]
+    public interface ISetLogicalParent
+    {
+        /// <summary>
+        /// Sets the control's parent.
+        /// </summary>
+        /// <param name="parent">The parent.</param>
+        void SetParent(ILogical? parent);
+    }
+}
diff --git a/src/Avalonia.Base/Controls/Metadata/PseudoClassesAttribute.cs b/src/Avalonia.Base/Controls/Metadata/PseudoClassesAttribute.cs
new file mode 100644
index 0000000000..30e8661e89
--- /dev/null
+++ b/src/Avalonia.Base/Controls/Metadata/PseudoClassesAttribute.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+
+#nullable enable
+
+namespace Avalonia.Controls.Metadata
+{
+    /// <summary>
+    /// Defines all pseudoclasses by name referenced and implemented by a control.
+    /// </summary>
+    /// <remarks>
+    /// This is currently used for code-completion in certain IDEs.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+    public sealed class PseudoClassesAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PseudoClassesAttribute"/> class.
+        /// </summary>
+        /// <param name="pseudoClasses">The list of pseudoclass names.</param>
+        public PseudoClassesAttribute(params string[] pseudoClasses)
+        {
+            PseudoClasses = pseudoClasses;
+        }
+
+        /// <summary>
+        /// Gets the list of pseudoclass names.
+        /// </summary>
+        public IReadOnlyList<string> PseudoClasses { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Controls/Metadata/TemplatePartAttribute.cs b/src/Avalonia.Base/Controls/Metadata/TemplatePartAttribute.cs
new file mode 100644
index 0000000000..3b8f971713
--- /dev/null
+++ b/src/Avalonia.Base/Controls/Metadata/TemplatePartAttribute.cs
@@ -0,0 +1,55 @@
+// This source file is adapted from the Windows Presentation Foundation project. 
+// (https://github.com/dotnet/wpf/) 
+// 
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+
+#nullable enable
+
+namespace Avalonia.Controls.Metadata
+{
+    /// <summary>
+    /// Defines a control template part referenced by name in code.
+    /// Template part names should begin with the "PART_" prefix.
+    /// </summary>
+    /// <remarks>
+    /// Style authors should be able to identify the part type used for styling the specific control.
+    /// The part is usually required in the style and should have a specific predefined name.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+    public sealed class TemplatePartAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TemplatePartAttribute"/> class.
+        /// </summary>
+        public TemplatePartAttribute()
+        {
+            Name = string.Empty;
+            Type = typeof(object);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TemplatePartAttribute"/> class.
+        /// </summary>
+        /// <param name="name">The part name used by the class to identify a required element in the style.</param>
+        /// <param name="type">The type of the element that should be used as a part with name.</param>
+        public TemplatePartAttribute(string name, Type type)
+        {
+            Name = name;
+            Type = type;
+        }
+
+        /// <summary>
+        /// Gets or sets the part name used by the class to identify a required element in the style.
+        /// Template part names should begin with the "PART_" prefix.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the element that should be used as a part with name specified
+        /// in <see cref="Name"/>.
+        /// </summary>
+        public Type Type { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Controls/NameScope.cs b/src/Avalonia.Base/Controls/NameScope.cs
new file mode 100644
index 0000000000..952401c00c
--- /dev/null
+++ b/src/Avalonia.Base/Controls/NameScope.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.LogicalTree;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Implements a name scope.
+    /// </summary>
+    public class NameScope : INameScope
+    {
+        /// <summary>
+        /// Defines the NameScope attached property.
+        /// </summary>
+        public static readonly AttachedProperty<INameScope> NameScopeProperty =
+            AvaloniaProperty.RegisterAttached<NameScope, StyledElement, INameScope>("NameScope");
+
+        /// <inheritdoc/>
+        public bool IsCompleted { get; private set; }
+        
+        private readonly Dictionary<string, object> _inner = new Dictionary<string, object>();
+
+        private readonly Dictionary<string, SynchronousCompletionAsyncResultSource<object?>> _pendingSearches =
+            new Dictionary<string, SynchronousCompletionAsyncResultSource<object?>>();
+        
+        /// <summary>
+        /// Gets the value of the attached <see cref="NameScopeProperty"/> on a styled element.
+        /// </summary>
+        /// <param name="styled">The styled element.</param>
+        /// <returns>The value of the NameScope attached property.</returns>
+        public static INameScope GetNameScope(StyledElement styled)
+        {
+            _ = styled ?? throw new ArgumentNullException(nameof(styled));
+
+            return styled.GetValue(NameScopeProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="NameScopeProperty"/> on a styled element.
+        /// </summary>
+        /// <param name="styled">The styled element.</param>
+        /// <param name="value">The value to set.</param>
+        public static void SetNameScope(StyledElement styled, INameScope value)
+        {
+            _ = styled ?? throw new ArgumentNullException(nameof(styled));
+
+            styled.SetValue(NameScopeProperty, value);
+        }
+
+        /// <inheritdoc />
+        public void Register(string name, object element)
+        {
+            if (IsCompleted)
+                throw new InvalidOperationException("NameScope is completed, no further registrations are allowed");
+
+            _ = name ?? throw new ArgumentNullException(nameof(name));
+            _ = element ?? throw new ArgumentNullException(nameof(element));
+
+            if (_inner.TryGetValue(name, out var existing))
+            {
+                if (existing != element)
+                {
+                    throw new ArgumentException($"Control with the name '{name}' already registered.");
+                }
+            }
+            else
+            {
+                _inner.Add(name, element);
+                if (_pendingSearches.TryGetValue(name, out var tcs))
+                {
+                    _pendingSearches.Remove(name);
+                    tcs.SetResult(element);
+                }
+            }
+        }
+
+        public SynchronousCompletionAsyncResult<object?> FindAsync(string name)
+        {
+            var found = Find(name);
+            if (found != null)
+                return new SynchronousCompletionAsyncResult<object?>(found);
+            if (IsCompleted)
+                return new SynchronousCompletionAsyncResult<object?>((object?)null);
+            if (!_pendingSearches.TryGetValue(name, out var tcs))
+                // We are intentionally running continuations synchronously here
+                _pendingSearches[name] = tcs = new SynchronousCompletionAsyncResultSource<object?>();
+
+            return tcs.AsyncResult;
+        }
+
+        /// <inheritdoc />
+        public object? Find(string name)
+        {
+            _ = name ?? throw new ArgumentNullException(nameof(name));
+
+            _inner.TryGetValue(name, out var result);
+            return result;
+        }
+
+        public void Complete()
+        {
+            IsCompleted = true;
+            foreach (var kp in _pendingSearches)
+                kp.Value.TrySetResult(null);
+            _pendingSearches.Clear();
+        }
+
+        
+    }
+}
diff --git a/src/Avalonia.Styling/Controls/NameScopeEventArgs.cs b/src/Avalonia.Base/Controls/NameScopeEventArgs.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/NameScopeEventArgs.cs
rename to src/Avalonia.Base/Controls/NameScopeEventArgs.cs
diff --git a/src/Avalonia.Styling/Controls/NameScopeExtensions.cs b/src/Avalonia.Base/Controls/NameScopeExtensions.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/NameScopeExtensions.cs
rename to src/Avalonia.Base/Controls/NameScopeExtensions.cs
diff --git a/src/Avalonia.Styling/Controls/NameScopeLocator.cs b/src/Avalonia.Base/Controls/NameScopeLocator.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/NameScopeLocator.cs
rename to src/Avalonia.Base/Controls/NameScopeLocator.cs
diff --git a/src/Avalonia.Styling/Controls/PseudoClassesExtensions.cs b/src/Avalonia.Base/Controls/PseudoClassesExtensions.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/PseudoClassesExtensions.cs
rename to src/Avalonia.Base/Controls/PseudoClassesExtensions.cs
diff --git a/src/Avalonia.Styling/Controls/ResourceDictionary.cs b/src/Avalonia.Base/Controls/ResourceDictionary.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/ResourceDictionary.cs
rename to src/Avalonia.Base/Controls/ResourceDictionary.cs
diff --git a/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs b/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs
new file mode 100644
index 0000000000..1758c45650
--- /dev/null
+++ b/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs
@@ -0,0 +1,184 @@
+using System;
+using Avalonia.Data.Converters;
+using Avalonia.LogicalTree;
+using Avalonia.Reactive;
+
+#nullable enable
+
+namespace Avalonia.Controls
+{
+    public static class ResourceNodeExtensions
+    {
+        /// <summary>
+        /// Finds the specified resource by searching up the logical tree and then global styles.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="key">The resource key.</param>
+        /// <returns>The resource, or <see cref="AvaloniaProperty.UnsetValue"/> if not found.</returns>
+        public static object? FindResource(this IResourceHost control, object key)
+        {
+            control = control ?? throw new ArgumentNullException(nameof(control));
+            key = key ?? throw new ArgumentNullException(nameof(key));
+
+            if (control.TryFindResource(key, out var value))
+            {
+                return value;
+            }
+
+            return AvaloniaProperty.UnsetValue;
+        }
+
+        /// <summary>
+        /// Tries to the specified resource by searching up the logical tree and then global styles.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="key">The resource key.</param>
+        /// <param name="value">On return, contains the resource if found, otherwise null.</param>
+        /// <returns>True if the resource was found; otherwise false.</returns>
+        public static bool TryFindResource(this IResourceHost control, object key, out object? value)
+        {
+            control = control ?? throw new ArgumentNullException(nameof(control));
+            key = key ?? throw new ArgumentNullException(nameof(key));
+
+            IResourceNode? current = control;
+
+            while (current != null)
+            {
+                if (current.TryGetResource(key, out value))
+                {
+                    return true;
+                }
+
+                current = (current as IStyledElement)?.StylingParent as IResourceNode;
+            }
+
+            value = null;
+            return false;
+        }
+
+        public static IObservable<object?> GetResourceObservable(
+            this IResourceHost control,
+            object key,
+            Func<object?, object?>? converter = null)
+        {
+            control = control ?? throw new ArgumentNullException(nameof(control));
+            key = key ?? throw new ArgumentNullException(nameof(key));
+
+            return new ResourceObservable(control, key, converter);
+        }
+
+        public static IObservable<object?> GetResourceObservable(
+            this IResourceProvider resourceProvider,
+            object key,
+            Func<object?, object?>? converter = null)
+        {
+            resourceProvider = resourceProvider ?? throw new ArgumentNullException(nameof(resourceProvider));
+            key = key ?? throw new ArgumentNullException(nameof(key));
+
+            return new FloatingResourceObservable(resourceProvider, key, converter);
+        }
+
+        private class ResourceObservable : LightweightObservableBase<object?>
+        {
+            private readonly IResourceHost _target;
+            private readonly object _key;
+            private readonly Func<object?, object?>? _converter;
+
+            public ResourceObservable(IResourceHost target, object key, Func<object?, object?>? converter)
+            {
+                _target = target;
+                _key = key;
+                _converter = converter;
+            }
+
+            protected override void Initialize()
+            {
+                _target.ResourcesChanged += ResourcesChanged;
+            }
+
+            protected override void Deinitialize()
+            {
+                _target.ResourcesChanged -= ResourcesChanged;
+            }
+
+            protected override void Subscribed(IObserver<object?> observer, bool first)
+            {
+                observer.OnNext(Convert(_target.FindResource(_key)));
+            }
+
+            private void ResourcesChanged(object? sender, ResourcesChangedEventArgs e)
+            {
+                PublishNext(Convert(_target.FindResource(_key)));
+            }
+
+            private object? Convert(object? value) => _converter?.Invoke(value) ?? value;
+        }
+
+        private class FloatingResourceObservable : LightweightObservableBase<object?>
+        {
+            private readonly IResourceProvider _target;
+            private readonly object _key;
+            private readonly Func<object?, object?>? _converter;
+            private IResourceHost? _owner;
+
+            public FloatingResourceObservable(IResourceProvider target, object key, Func<object?, object?>? converter)
+            {
+                _target = target;
+                _key = key;
+                _converter = converter;
+            }
+
+            protected override void Initialize()
+            {
+                _target.OwnerChanged += OwnerChanged;
+                _owner = _target.Owner;
+            }
+
+            protected override void Deinitialize()
+            {
+                _target.OwnerChanged -= OwnerChanged;
+                _owner = null;
+            }
+
+            protected override void Subscribed(IObserver<object?> observer, bool first)
+            {
+                if (_target.Owner is object)
+                {
+                    observer.OnNext(Convert(_target.Owner.FindResource(_key)));
+                }
+            }
+
+            private void PublishNext()
+            {
+                if (_target.Owner is object)
+                {
+                    PublishNext(Convert(_target.Owner.FindResource(_key)));
+                }
+            }
+
+            private void OwnerChanged(object? sender, EventArgs e)
+            {
+                if (_owner is object)
+                {
+                    _owner.ResourcesChanged -= ResourcesChanged;
+                }
+
+                _owner = _target.Owner;
+
+                if (_owner is object)
+                {
+                    _owner.ResourcesChanged += ResourcesChanged;
+                }
+
+                PublishNext();
+            }
+
+            private void ResourcesChanged(object? sender, ResourcesChangedEventArgs e)
+            {
+                PublishNext();
+            }
+
+            private object? Convert(object? value) => _converter?.Invoke(value) ?? value;
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Controls/ResourcesChangedEventArgs.cs b/src/Avalonia.Base/Controls/ResourcesChangedEventArgs.cs
similarity index 100%
rename from src/Avalonia.Styling/Controls/ResourcesChangedEventArgs.cs
rename to src/Avalonia.Base/Controls/ResourcesChangedEventArgs.cs
diff --git a/src/Avalonia.Visuals/CornerRadius.cs b/src/Avalonia.Base/CornerRadius.cs
similarity index 100%
rename from src/Avalonia.Visuals/CornerRadius.cs
rename to src/Avalonia.Base/CornerRadius.cs
diff --git a/src/Avalonia.Base/Data/BindingOperations.cs b/src/Avalonia.Base/Data/BindingOperations.cs
index 5353e8175d..4e47a720f0 100644
--- a/src/Avalonia.Base/Data/BindingOperations.cs
+++ b/src/Avalonia.Base/Data/BindingOperations.cs
@@ -99,14 +99,15 @@ namespace Avalonia.Data
 
         private sealed class TwoWayBindingDisposable : IDisposable
         {
-            private readonly IDisposable _first;
-            private readonly IDisposable _second;
+            private readonly IDisposable _toTargetSubscription;
+            private readonly IDisposable _fromTargetSubsription;
+
             private bool _isDisposed;
 
-            public TwoWayBindingDisposable(IDisposable first, IDisposable second)
+            public TwoWayBindingDisposable(IDisposable toTargetSubscription, IDisposable fromTargetSubsription)
             {
-                _first = first;
-                _second = second;
+                _toTargetSubscription = toTargetSubscription;
+                _fromTargetSubsription = fromTargetSubsription;
             }
 
             public void Dispose()
@@ -116,8 +117,8 @@ namespace Avalonia.Data
                     return;
                 }
 
-                _first.Dispose();
-                _second.Dispose();
+                _fromTargetSubsription.Dispose();
+                _toTargetSubscription.Dispose();
 
                 _isDisposed = true;
             }
diff --git a/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs b/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
index 11d50afe93..c4f4362537 100644
--- a/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
@@ -33,7 +33,14 @@ namespace Avalonia.Data.Converters
 
             if (typeof(ICommand).IsAssignableFrom(targetType) && value is Delegate d && d.Method.GetParameters().Length <= 1)
             {
-                return new MethodToCommandConverter(d);
+                if (d.Method.IsPrivate == false)
+                {
+                    return new MethodToCommandConverter(d);
+                }
+                else
+                {
+                    return new BindingNotification(new InvalidCastException("You can't bind to private methods!"), BindingErrorType.Error);
+                }
             }
 
             if (TypeUtilities.TryConvert(targetType, value, culture, out var result))
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNode.cs
index 54785f18e8..4f755ff140 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNode.cs
@@ -98,36 +98,36 @@ namespace Avalonia.Data.Core
 
         private void ValueChanged(object? value, bool notify)
         {
-            if (_subscriber is null)
-                return;
-
-            var notification = value as BindingNotification;
-
-            if (notification == null)
+            if (_subscriber is { } subscriber)
             {
-                LastValue = value != null ? new WeakReference<object?>(value) : NullReference;
+                var notification = value as BindingNotification;
+                var next = Next;
 
-                if (Next != null)
+                if (notification == null)
                 {
-                    Next.Target = LastValue;
+                    LastValue = value != null ? new WeakReference<object?>(value) : NullReference;
+                    if (next != null)
+                    {
+                        next.Target = LastValue;
+                    }
+                    else if (notify)
+                    {
+                        subscriber(value);
+                    }
                 }
-                else if (notify)
+                else
                 {
-                    _subscriber(value);
-                }
-            }
-            else
-            {
-                LastValue = notification.Value != null ? new WeakReference<object?>(notification.Value) : NullReference;
+                    LastValue = notification.Value != null ? new WeakReference<object?>(notification.Value) : NullReference;
 
-                if (Next != null)
-                {
-                    Next.Target = LastValue;
-                }
+                    if (next != null)
+                    {
+                        next.Target = LastValue;
+                    }
 
-                if (Next == null || notification.Error != null)
-                {
-                    _subscriber(value);
+                    if (next == null || notification.Error != null)
+                    {
+                        subscriber(value);
+                    }
                 }
             }
         }
diff --git a/src/Avalonia.Base/Data/Core/IPropertyInfo.cs b/src/Avalonia.Base/Data/Core/IPropertyInfo.cs
index 4d80feb4ba..0cb8a937cc 100644
--- a/src/Avalonia.Base/Data/Core/IPropertyInfo.cs
+++ b/src/Avalonia.Base/Data/Core/IPropertyInfo.cs
@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Data.Core
 {
+    [NotClientImplementable]
     public interface IPropertyInfo
     {
         string Name { get; }
diff --git a/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
index 3c4120ad0b..cc6d92ceb7 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.ExceptionServices;
+using Avalonia.Utilities;
 
 namespace Avalonia.Data.Core.Plugins
 {
@@ -60,11 +61,10 @@ namespace Avalonia.Data.Core.Plugins
             return AvaloniaPropertyRegistry.Instance.FindRegistered(o, propertyName);
         }
 
-        private class Accessor : PropertyAccessorBase, IObserver<object?>
+        private class Accessor : PropertyAccessorBase, IWeakEventSubscriber<AvaloniaPropertyChangedEventArgs>
         {
             private readonly WeakReference<AvaloniaObject> _reference;
             private readonly AvaloniaProperty _property;
-            private IDisposable? _subscription;
 
             public Accessor(WeakReference<AvaloniaObject> reference, AvaloniaProperty property)
             {
@@ -95,29 +95,45 @@ namespace Avalonia.Data.Core.Plugins
                 return false;
             }
 
-            protected override void SubscribeCore()
+            void IWeakEventSubscriber<AvaloniaPropertyChangedEventArgs>.
+                OnEvent(object? notifyPropertyChanged, WeakEvent ev, AvaloniaPropertyChangedEventArgs e)
             {
-                _subscription = Instance?.GetObservable(_property).Subscribe(this);
+                if (e.Property == _property)
+                {
+                    SendCurrentValue();
+                }
             }
 
-            protected override void UnsubscribeCore()
+            protected override void SubscribeCore()
             {
-                _subscription?.Dispose();
-                _subscription = null;
+                SubscribeToChanges();
+                SendCurrentValue();
             }
 
-            void IObserver<object?>.OnCompleted()
+            protected override void UnsubscribeCore()
             {
+                var instance = Instance;
+
+                if (instance != null)
+                    WeakEvents.AvaloniaPropertyChanged.Unsubscribe(instance, this);
             }
 
-            void IObserver<object?>.OnError(Exception error)
+            private void SendCurrentValue()
             {
-                ExceptionDispatchInfo.Capture(error).Throw();
+                try
+                {
+                    var value = Value;
+                    PublishValue(value);
+                }
+                catch { }
             }
 
-            void IObserver<object?>.OnNext(object? value)
+            private void SubscribeToChanges()
             {
-                PublishValue(value);
+                var instance = Instance;
+
+                if (instance != null)
+                    WeakEvents.AvaloniaPropertyChanged.Subscribe(instance, this);
             }
         }
     }
diff --git a/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
index 33cecd10a7..b93bf87fdf 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
@@ -17,7 +17,7 @@ namespace Avalonia.Data.Core.Plugins
             new Dictionary<(Type, string), PropertyInfo?>();
 
         /// <inheritdoc/>
-        public bool Match(object obj, string propertyName) => GetFirstPropertyWithName(obj.GetType(), propertyName) != null;
+        public bool Match(object obj, string propertyName) => GetFirstPropertyWithName(obj, propertyName) != null;
 
         /// <summary>
         /// Starts monitoring the value of a property on an object.
@@ -36,7 +36,7 @@ namespace Avalonia.Data.Core.Plugins
             if (!reference.TryGetTarget(out var instance) || instance is null)
                 return null;
 
-            var p = GetFirstPropertyWithName(instance.GetType(), propertyName);
+            var p = GetFirstPropertyWithName(instance, propertyName);
 
             if (p != null)
             {
@@ -50,8 +50,16 @@ namespace Avalonia.Data.Core.Plugins
             }
         }
 
-        private PropertyInfo? GetFirstPropertyWithName(Type type, string propertyName)
+        private const BindingFlags PropertyBindingFlags =
+            BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
+        
+        private PropertyInfo? GetFirstPropertyWithName(object instance, string propertyName)
         {
+            if (instance is IReflectableType reflectableType)
+                return reflectableType.GetTypeInfo().GetProperty(propertyName, PropertyBindingFlags);
+
+            var type = instance.GetType();
+            
             var key = (type, propertyName);
 
             if (!_propertyLookup.TryGetValue(key, out var propertyInfo))
@@ -66,10 +74,7 @@ namespace Avalonia.Data.Core.Plugins
         {
             PropertyInfo? found = null;
 
-            const BindingFlags bindingFlags =
-                BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
-
-            var properties = type.GetProperties(bindingFlags);
+            var properties = type.GetProperties(PropertyBindingFlags);
 
             foreach (PropertyInfo propertyInfo in properties)
             {
diff --git a/src/Avalonia.Base/Data/Core/PropertyPath.cs b/src/Avalonia.Base/Data/Core/PropertyPath.cs
index 665953c4a1..f5b3f92353 100644
--- a/src/Avalonia.Base/Data/Core/PropertyPath.cs
+++ b/src/Avalonia.Base/Data/Core/PropertyPath.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Data.Core
 
         public PropertyPath(IEnumerable<IPropertyPathElement> elements)
         {
-            Elements = elements.ToList();
+            Elements = elements.ToArray();
         }
     }
 
diff --git a/src/Avalonia.Base/Data/IBinding.cs b/src/Avalonia.Base/Data/IBinding.cs
index 9535cf608e..7d44bf09b5 100644
--- a/src/Avalonia.Base/Data/IBinding.cs
+++ b/src/Avalonia.Base/Data/IBinding.cs
@@ -1,8 +1,11 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Data
 {
     /// <summary>
     /// Holds a binding that can be applied to a property on an object.
     /// </summary>
+    [NotClientImplementable]
     public interface IBinding
     {
         /// <summary>
diff --git a/src/Avalonia.Styling/Diagnostics/StyleDiagnostics.cs b/src/Avalonia.Base/Diagnostics/StyleDiagnostics.cs
similarity index 100%
rename from src/Avalonia.Styling/Diagnostics/StyleDiagnostics.cs
rename to src/Avalonia.Base/Diagnostics/StyleDiagnostics.cs
diff --git a/src/Avalonia.Styling/Diagnostics/StyledElementExtensions.cs b/src/Avalonia.Base/Diagnostics/StyledElementExtensions.cs
similarity index 100%
rename from src/Avalonia.Styling/Diagnostics/StyledElementExtensions.cs
rename to src/Avalonia.Base/Diagnostics/StyledElementExtensions.cs
diff --git a/src/Avalonia.Base/DirectPropertyBase.cs b/src/Avalonia.Base/DirectPropertyBase.cs
index 9c4896b96c..efcb7dfecb 100644
--- a/src/Avalonia.Base/DirectPropertyBase.cs
+++ b/src/Avalonia.Base/DirectPropertyBase.cs
@@ -1,7 +1,7 @@
 using System;
 using Avalonia.Data;
 using Avalonia.Reactive;
-using Avalonia.Utilities;
+using Avalonia.Styling;
 
 namespace Avalonia
 {
@@ -121,31 +121,25 @@ namespace Avalonia
         }
 
         /// <inheritdoc/>
-        public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> visitor, ref TData data)
-        {
-            visitor.Visit(this, ref data);
-        }
-
-        /// <inheritdoc/>
-        internal override void RouteClearValue(IAvaloniaObject o)
+        internal override void RouteClearValue(AvaloniaObject o)
         {
             o.ClearValue<TValue>(this);
         }
 
         /// <inheritdoc/>
-        internal override object? RouteGetValue(IAvaloniaObject o)
+        internal override object? RouteGetValue(AvaloniaObject o)
         {
             return o.GetValue<TValue>(this);
         }
 
-        internal override object? RouteGetBaseValue(IAvaloniaObject o, BindingPriority maxPriority)
+        internal override object? RouteGetBaseValue(AvaloniaObject o, BindingPriority maxPriority)
         {
             return o.GetValue<TValue>(this);
         }
 
         /// <inheritdoc/>
         internal override IDisposable? RouteSetValue(
-            IAvaloniaObject o,
+            AvaloniaObject o,
             object? value,
             BindingPriority priority)
         {
@@ -169,7 +163,7 @@ namespace Avalonia
 
         /// <inheritdoc/>
         internal override IDisposable RouteBind(
-            IAvaloniaObject o,
+            AvaloniaObject o,
             IObservable<BindingValue<object?>> source,
             BindingPriority priority)
         {
@@ -177,9 +171,34 @@ namespace Avalonia
             return o.Bind<TValue>(this, adapter);
         }
 
-        internal override void RouteInheritanceParentChanged(AvaloniaObject o, IAvaloniaObject? oldParent)
+        internal override void RouteInheritanceParentChanged(AvaloniaObject o, AvaloniaObject? oldParent)
         {
             throw new NotSupportedException("Direct properties do not support inheritance.");
         }
+
+        internal override ISetterInstance CreateSetterInstance(IStyleable target, object? value)
+        {
+            if (value is IBinding binding)
+            {
+                return new PropertySetterBindingInstance<TValue>(
+                    target,
+                    this,
+                    binding);
+            }
+            else if (value is ITemplate template && !typeof(ITemplate).IsAssignableFrom(PropertyType))
+            {
+                return new PropertySetterTemplateInstance<TValue>(
+                    target,
+                    this,
+                    template);
+            }
+            else
+            {
+                return new PropertySetterInstance<TValue>(
+                    target,
+                    this,
+                    (TValue)value!);
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/GeometryCollection.cs b/src/Avalonia.Base/GeometryCollection.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/GeometryCollection.cs
rename to src/Avalonia.Base/GeometryCollection.cs
diff --git a/src/Avalonia.Base/GeometryGroup.cs b/src/Avalonia.Base/GeometryGroup.cs
new file mode 100644
index 0000000000..b90c9c6d8a
--- /dev/null
+++ b/src/Avalonia.Base/GeometryGroup.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Metadata;
+using Avalonia.Platform;
+
+#nullable enable
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a composite geometry, composed of other <see cref="Geometry"/> objects.
+    /// </summary>
+    public class GeometryGroup : Geometry
+    {
+        public static readonly DirectProperty<GeometryGroup, GeometryCollection?> ChildrenProperty =
+            AvaloniaProperty.RegisterDirect<GeometryGroup, GeometryCollection?> (
+                nameof(Children),
+                o => o.Children,
+                (o, v) => o.Children = v);
+
+        public static readonly StyledProperty<FillRule> FillRuleProperty =
+            AvaloniaProperty.Register<GeometryGroup, FillRule>(nameof(FillRule));
+
+        private GeometryCollection? _children;
+        private bool _childrenSet;
+
+        /// <summary>
+        /// Gets or sets the collection that contains the child geometries.
+        /// </summary>
+        [Content]
+        public GeometryCollection? Children
+        {
+            get => _children ??= (!_childrenSet ? new GeometryCollection() : null);
+            set
+            {
+                SetAndRaise(ChildrenProperty, ref _children, value);
+                _childrenSet = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets how the intersecting areas of the objects contained in this
+        /// <see cref="GeometryGroup"/> are combined. The default is <see cref="FillRule.EvenOdd"/>.
+        /// </summary>
+        public FillRule FillRule
+        {
+            get => GetValue(FillRuleProperty);
+            set => SetValue(FillRuleProperty, value);
+        }
+
+        public override Geometry Clone()
+        {
+            var result = new GeometryGroup { FillRule = FillRule, Transform = Transform };
+            if (_children?.Count > 0)
+                result.Children = new GeometryCollection(_children);
+            return result;
+        }
+
+        protected override IGeometryImpl? CreateDefiningGeometry()
+        {
+            if (_children?.Count > 0)
+            {
+                var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
+                return factory.CreateGeometryGroup(FillRule, _children);
+            }
+
+            return null;
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ChildrenProperty || change.Property == FillRuleProperty)
+            {
+                InvalidateGeometry();
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/IAvaloniaObject.cs b/src/Avalonia.Base/IAvaloniaObject.cs
index 654528658f..3b0016903b 100644
--- a/src/Avalonia.Base/IAvaloniaObject.cs
+++ b/src/Avalonia.Base/IAvaloniaObject.cs
@@ -1,11 +1,13 @@
 using System;
 using Avalonia.Data;
+using Avalonia.Metadata;
 
 namespace Avalonia
 {
     /// <summary>
     /// Interface for getting/setting <see cref="AvaloniaProperty"/> values on an object.
     /// </summary>
+    [NotClientImplementable]
     public interface IAvaloniaObject
     {
         /// <summary>
@@ -17,42 +19,14 @@ namespace Avalonia
         /// Clears an <see cref="AvaloniaProperty"/>'s local value.
         /// </summary>
         /// <param name="property">The property.</param>
-        void ClearValue<T>(StyledPropertyBase<T> property);
-
-        /// <summary>
-        /// Clears an <see cref="AvaloniaProperty"/>'s local value.
-        /// </summary>
-        /// <param name="property">The property.</param>
-        void ClearValue<T>(DirectPropertyBase<T> property);
-
-        /// <summary>
-        /// Gets a <see cref="AvaloniaProperty"/> value.
-        /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <returns>The value.</returns>
-        T GetValue<T>(StyledPropertyBase<T> property);
+        void ClearValue(AvaloniaProperty property);
 
         /// <summary>
         /// Gets a <see cref="AvaloniaProperty"/> value.
         /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
         /// <returns>The value.</returns>
-        T GetValue<T>(DirectPropertyBase<T> property);
-
-        /// <summary>
-        /// Gets an <see cref="AvaloniaProperty"/> base value.
-        /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="maxPriority">The maximum priority for the value.</param>
-        /// <remarks>
-        /// Gets the value of the property, if set on this object with a priority equal or lower to
-        /// <paramref name="maxPriority"/>, otherwise <see cref="Optional{T}.Empty"/>. Note that
-        /// this method does not return property values that come from inherited or default values.
-        /// </remarks>
-        Optional<T> GetBaseValue<T>(StyledPropertyBase<T> property, BindingPriority maxPriority);
+        object? GetValue(AvaloniaProperty property);
 
         /// <summary>
         /// Checks whether a <see cref="AvaloniaProperty"/> is animating.
@@ -71,93 +45,35 @@ namespace Avalonia
         /// <summary>
         /// Sets a <see cref="AvaloniaProperty"/> value.
         /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
         /// <param name="value">The value.</param>
         /// <param name="priority">The priority of the value.</param>
         /// <returns>
         /// An <see cref="IDisposable"/> if setting the property can be undone, otherwise null.
         /// </returns>
-        IDisposable? SetValue<T>(
-            StyledPropertyBase<T> property,
-            T value,
+        IDisposable? SetValue(
+            AvaloniaProperty property,
+            object? value,
             BindingPriority priority = BindingPriority.LocalValue);
 
-        /// <summary>
-        /// Sets a <see cref="AvaloniaProperty"/> value.
-        /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The value.</param>
-        void SetValue<T>(DirectPropertyBase<T> property, T value);
-
         /// <summary>
         /// Binds a <see cref="AvaloniaProperty"/> to an observable.
         /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
         /// <param name="source">The observable.</param>
         /// <param name="priority">The priority of the binding.</param>
         /// <returns>
         /// A disposable which can be used to terminate the binding.
         /// </returns>
-        IDisposable Bind<T>(
-            StyledPropertyBase<T> property,
-            IObservable<BindingValue<T>> source,
+        IDisposable Bind(
+            AvaloniaProperty property,
+            IObservable<object?> source,
             BindingPriority priority = BindingPriority.LocalValue);
 
-        /// <summary>
-        /// Binds a <see cref="AvaloniaProperty"/> to an observable.
-        /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="source">The observable.</param>
-        /// <returns>
-        /// A disposable which can be used to terminate the binding.
-        /// </returns>
-        IDisposable Bind<T>(
-            DirectPropertyBase<T> property,
-            IObservable<BindingValue<T>> source);
-
         /// <summary>
         /// Coerces the specified <see cref="AvaloniaProperty"/>.
         /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
-        void CoerceValue<T>(StyledPropertyBase<T> property);
-
-        /// <summary>
-        /// Registers an object as an inheritance child.
-        /// </summary>
-        /// <param name="child">The inheritance child.</param>
-        /// <remarks>
-        /// Inheritance children will receive a call to
-        /// <see cref="InheritedPropertyChanged{T}(AvaloniaProperty{T}, Optional{T}, Optional{T})"/>
-        /// when an inheritable property value changes on the parent.
-        /// </remarks>
-        void AddInheritanceChild(IAvaloniaObject child);
-
-        /// <summary>
-        /// Unregisters an object as an inheritance child.
-        /// </summary>
-        /// <param name="child">The inheritance child.</param>
-        /// <remarks>
-        /// Removes an inheritance child that was added by a call to
-        /// <see cref="AddInheritanceChild(IAvaloniaObject)"/>.
-        /// </remarks>
-        void RemoveInheritanceChild(IAvaloniaObject child);
-
-        /// <summary>
-        /// Called when an inheritable property changes on an object registered as an inheritance
-        /// parent.
-        /// </summary>
-        /// <typeparam name="T">The type of the value.</typeparam>
-        /// <param name="property">The property that has changed.</param>
-        /// <param name="oldValue"></param>
-        /// <param name="newValue"></param>
-        void InheritedPropertyChanged<T>(
-            AvaloniaProperty<T> property,
-            Optional<T> oldValue,
-            Optional<T> newValue);
+        void CoerceValue(AvaloniaProperty property);
     }
 }
diff --git a/src/Avalonia.Base/IDataContextProvider.cs b/src/Avalonia.Base/IDataContextProvider.cs
new file mode 100644
index 0000000000..1d381cf4a5
--- /dev/null
+++ b/src/Avalonia.Base/IDataContextProvider.cs
@@ -0,0 +1,16 @@
+using Avalonia.Metadata;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Defines an element with a data context that can be used for binding.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IDataContextProvider : IAvaloniaObject
+    {
+        /// <summary>
+        /// Gets or sets the element's data context.
+        /// </summary>
+        object? DataContext { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/IDirectPropertyAccessor.cs b/src/Avalonia.Base/IDirectPropertyAccessor.cs
index e34483fa7b..476a36f372 100644
--- a/src/Avalonia.Base/IDirectPropertyAccessor.cs
+++ b/src/Avalonia.Base/IDirectPropertyAccessor.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia
 {
diff --git a/src/Avalonia.Base/IDirectPropertyMetadata.cs b/src/Avalonia.Base/IDirectPropertyMetadata.cs
index 4fd4a3a6b7..7d74470a13 100644
--- a/src/Avalonia.Base/IDirectPropertyMetadata.cs
+++ b/src/Avalonia.Base/IDirectPropertyMetadata.cs
@@ -1,8 +1,11 @@
+using Avalonia.Metadata;
+
 namespace Avalonia
 {
     /// <summary>
     /// Untyped interface to <see cref="DirectPropertyMetadata{TValue}"/>
     /// </summary>
+    [NotClientImplementable]
     public interface IDirectPropertyMetadata
     {
         /// <summary>
diff --git a/src/Avalonia.Styling/INamed.cs b/src/Avalonia.Base/INamed.cs
similarity index 100%
rename from src/Avalonia.Styling/INamed.cs
rename to src/Avalonia.Base/INamed.cs
diff --git a/src/Avalonia.Base/IStyledElement.cs b/src/Avalonia.Base/IStyledElement.cs
new file mode 100644
index 0000000000..4eed54de45
--- /dev/null
+++ b/src/Avalonia.Base/IStyledElement.cs
@@ -0,0 +1,39 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Metadata;
+using Avalonia.Styling;
+
+namespace Avalonia
+{
+    [NotClientImplementable]
+    public interface IStyledElement :
+        IStyleable,
+        IStyleHost,
+        ILogical,
+        IResourceHost,
+        IDataContextProvider,
+        ISupportInitialize
+    {
+        /// <summary>
+        /// Occurs when the control has finished initialization.
+        /// </summary>
+        event EventHandler? Initialized;
+
+        /// <summary>
+        /// Gets a value that indicates whether the element has finished initialization.
+        /// </summary>
+        bool IsInitialized { get; }
+
+        /// <summary>
+        /// Gets or sets the control's styling classes.
+        /// </summary>
+        new Classes Classes { get; set; }
+
+        /// <summary>
+        /// Gets the control's logical parent.
+        /// </summary>
+        IStyledElement? Parent { get; }
+    }
+}
diff --git a/src/Avalonia.Base/IStyledPropertyMetadata.cs b/src/Avalonia.Base/IStyledPropertyMetadata.cs
index 6b29b5f977..89990338e0 100644
--- a/src/Avalonia.Base/IStyledPropertyMetadata.cs
+++ b/src/Avalonia.Base/IStyledPropertyMetadata.cs
@@ -1,8 +1,11 @@
+using Avalonia.Metadata;
+
 namespace Avalonia
 {
     /// <summary>
     /// Untyped interface to <see cref="StyledPropertyMetadata{TValue}"/>
     /// </summary>
+    [NotClientImplementable]
     public interface IStyledPropertyMetadata
     {
         /// <summary>
diff --git a/src/Avalonia.Input/AccessKeyHandler.cs b/src/Avalonia.Base/Input/AccessKeyHandler.cs
similarity index 100%
rename from src/Avalonia.Input/AccessKeyHandler.cs
rename to src/Avalonia.Base/Input/AccessKeyHandler.cs
diff --git a/src/Avalonia.Input/Cursor.cs b/src/Avalonia.Base/Input/Cursor.cs
similarity index 100%
rename from src/Avalonia.Input/Cursor.cs
rename to src/Avalonia.Base/Input/Cursor.cs
diff --git a/src/Avalonia.Input/DataFormats.cs b/src/Avalonia.Base/Input/DataFormats.cs
similarity index 100%
rename from src/Avalonia.Input/DataFormats.cs
rename to src/Avalonia.Base/Input/DataFormats.cs
diff --git a/src/Avalonia.Input/DataObject.cs b/src/Avalonia.Base/Input/DataObject.cs
similarity index 100%
rename from src/Avalonia.Input/DataObject.cs
rename to src/Avalonia.Base/Input/DataObject.cs
diff --git a/src/Avalonia.Input/DragDrop.cs b/src/Avalonia.Base/Input/DragDrop.cs
similarity index 100%
rename from src/Avalonia.Input/DragDrop.cs
rename to src/Avalonia.Base/Input/DragDrop.cs
diff --git a/src/Avalonia.Input/DragDropDevice.cs b/src/Avalonia.Base/Input/DragDropDevice.cs
similarity index 100%
rename from src/Avalonia.Input/DragDropDevice.cs
rename to src/Avalonia.Base/Input/DragDropDevice.cs
diff --git a/src/Avalonia.Input/DragDropEffects.cs b/src/Avalonia.Base/Input/DragDropEffects.cs
similarity index 100%
rename from src/Avalonia.Input/DragDropEffects.cs
rename to src/Avalonia.Base/Input/DragDropEffects.cs
diff --git a/src/Avalonia.Input/DragEventArgs.cs b/src/Avalonia.Base/Input/DragEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/DragEventArgs.cs
rename to src/Avalonia.Base/Input/DragEventArgs.cs
diff --git a/src/Avalonia.Base/Input/FocusManager.cs b/src/Avalonia.Base/Input/FocusManager.cs
new file mode 100644
index 0000000000..c7b5b8e27f
--- /dev/null
+++ b/src/Avalonia.Base/Input/FocusManager.cs
@@ -0,0 +1,244 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Manages focus for the application.
+    /// </summary>
+    public class FocusManager : IFocusManager
+    {
+        /// <summary>
+        /// The focus scopes in which the focus is currently defined.
+        /// </summary>
+        private readonly ConditionalWeakTable<IFocusScope, IInputElement?> _focusScopes =
+            new ConditionalWeakTable<IFocusScope, IInputElement?>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FocusManager"/> class.
+        /// </summary>
+        static FocusManager()
+        {
+            InputElement.PointerPressedEvent.AddClassHandler(
+                typeof(IInputElement),
+                new EventHandler<RoutedEventArgs>(OnPreviewPointerPressed),
+                RoutingStrategies.Tunnel);
+        }
+
+        /// <summary>
+        /// Gets the instance of the <see cref="IFocusManager"/>.
+        /// </summary>
+        public static IFocusManager? Instance => AvaloniaLocator.Current.GetService<IFocusManager>();
+
+        /// <summary>
+        /// Gets the currently focused <see cref="IInputElement"/>.
+        /// </summary>
+        public IInputElement? Current => KeyboardDevice.Instance?.FocusedElement;
+
+        /// <summary>
+        /// Gets the current focus scope.
+        /// </summary>
+        public IFocusScope? Scope
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Focuses a control.
+        /// </summary>
+        /// <param name="control">The control to focus.</param>
+        /// <param name="method">The method by which focus was changed.</param>
+        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
+        public void Focus(
+            IInputElement? control, 
+            NavigationMethod method = NavigationMethod.Unspecified,
+            KeyModifiers keyModifiers = KeyModifiers.None)
+        {
+            if (control != null)
+            {
+                var scope = GetFocusScopeAncestors(control)
+                    .FirstOrDefault();
+
+                if (scope != null)
+                {
+                    Scope = scope;
+                    SetFocusedElement(scope, control, method, keyModifiers);
+                }
+            }
+            else if (Current != null)
+            {
+                // If control is null, set focus to the topmost focus scope.
+                foreach (var scope in GetFocusScopeAncestors(Current).Reverse().ToArray())
+                {
+                    if (scope != Scope &&
+                        _focusScopes.TryGetValue(scope, out var element) &&
+                        element != null)
+                    {
+                        Focus(element, method);
+                        return;
+                    }
+                }
+
+                if (Scope is object)
+                {
+                    // Couldn't find a focus scope, clear focus.
+                    SetFocusedElement(Scope, null);
+                }
+            }
+        }
+
+        public IInputElement? GetFocusedElement(IInputElement e)
+        {
+            if (e is IFocusScope scope)
+            {
+                _focusScopes.TryGetValue(scope, out var result);
+                return result;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Sets the currently focused element in the specified scope.
+        /// </summary>
+        /// <param name="scope">The focus scope.</param>
+        /// <param name="element">The element to focus. May be null.</param>
+        /// <param name="method">The method by which focus was changed.</param>
+        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
+        /// <remarks>
+        /// If the specified scope is the current <see cref="Scope"/> then the keyboard focus
+        /// will change.
+        /// </remarks>
+        public void SetFocusedElement(
+            IFocusScope scope,
+            IInputElement? element,
+            NavigationMethod method = NavigationMethod.Unspecified,
+            KeyModifiers keyModifiers = KeyModifiers.None)
+        {
+            scope = scope ?? throw new ArgumentNullException(nameof(scope));
+
+            if (_focusScopes.TryGetValue(scope, out var existingElement))
+            {
+                if (element != existingElement)
+                {
+                    _focusScopes.Remove(scope);
+                    _focusScopes.Add(scope, element);
+                }
+            }
+            else
+            {
+                _focusScopes.Add(scope, element);
+            }
+
+            if (Scope == scope)
+            {
+                KeyboardDevice.Instance?.SetFocusedElement(element, method, keyModifiers);
+            }
+        }
+
+        /// <summary>
+        /// Notifies the focus manager of a change in focus scope.
+        /// </summary>
+        /// <param name="scope">The new focus scope.</param>
+        public void SetFocusScope(IFocusScope scope)
+        {
+            scope = scope ?? throw new ArgumentNullException(nameof(scope));
+
+            if (!_focusScopes.TryGetValue(scope, out var e))
+            {
+                // TODO: Make this do something useful, i.e. select the first focusable
+                // control, select a control that the user has specified to have default
+                // focus etc.
+                e = scope as IInputElement;
+                _focusScopes.Add(scope, e);
+            }
+
+            Scope = scope;
+            Focus(e);
+        }
+
+        public void RemoveFocusScope(IFocusScope scope)
+        {
+            scope = scope ?? throw new ArgumentNullException(nameof(scope));
+            
+            if (_focusScopes.TryGetValue(scope, out _))
+            {
+                SetFocusedElement(scope, null);
+                _focusScopes.Remove(scope);
+            }
+
+            if (Scope == scope)
+            {
+                Scope = null;
+            }
+        }
+
+        public static bool GetIsFocusScope(IInputElement e) => e is IFocusScope;
+
+        /// <summary>
+        /// Checks if the specified element can be focused.
+        /// </summary>
+        /// <param name="e">The element.</param>
+        /// <returns>True if the element can be focused.</returns>
+        private static bool CanFocus(IInputElement e) => e.Focusable && e.IsEffectivelyEnabled && e.IsVisible;
+
+        /// <summary>
+        /// Gets the focus scope ancestors of the specified control, traversing popups.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The focus scopes.</returns>
+        private static IEnumerable<IFocusScope> GetFocusScopeAncestors(IInputElement control)
+        {
+            IInputElement? c = control;
+
+            while (c != null)
+            {
+                var scope = c as IFocusScope;
+
+                if (scope != null && c.VisualRoot?.IsVisible == true)
+                {
+                    yield return scope;
+                }
+
+                c = c.GetVisualParent<IInputElement>() ??
+                    ((c as IHostedVisualTreeRoot)?.Host as IInputElement);
+            }
+        }
+
+        /// <summary>
+        /// Global handler for pointer pressed events.
+        /// </summary>
+        /// <param name="sender">The event sender.</param>
+        /// <param name="e">The event args.</param>
+        private static void OnPreviewPointerPressed(object? sender, RoutedEventArgs e)
+        {
+            if (sender is null)
+                return;
+
+            var ev = (PointerPressedEventArgs)e;
+            var visual = (IVisual)sender;
+
+            if (sender == e.Source && ev.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
+            {
+                IVisual? element = ev.Pointer?.Captured ?? e.Source as IInputElement;
+
+                while (element != null)
+                {
+                    if (element is IInputElement inputElement && CanFocus(inputElement))
+                    {
+                        Instance?.Focus(inputElement, NavigationMethod.Pointer, ev.KeyModifiers);
+
+                        break;
+                    }
+                    
+                    element = element.VisualParent;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Input/GestureRecognizers/GestureRecognizerCollection.cs b/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizerCollection.cs
similarity index 100%
rename from src/Avalonia.Input/GestureRecognizers/GestureRecognizerCollection.cs
rename to src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizerCollection.cs
diff --git a/src/Avalonia.Input/GestureRecognizers/IGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/IGestureRecognizer.cs
similarity index 100%
rename from src/Avalonia.Input/GestureRecognizers/IGestureRecognizer.cs
rename to src/Avalonia.Base/Input/GestureRecognizers/IGestureRecognizer.cs
diff --git a/src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
similarity index 100%
rename from src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs
rename to src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
diff --git a/src/Avalonia.Base/Input/Gestures.cs b/src/Avalonia.Base/Input/Gestures.cs
new file mode 100644
index 0000000000..4349fca7db
--- /dev/null
+++ b/src/Avalonia.Base/Input/Gestures.cs
@@ -0,0 +1,142 @@
+using System;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    public static class Gestures
+    {
+        private static bool s_isDoubleTapped = false;
+        public static readonly RoutedEvent<TappedEventArgs> TappedEvent = RoutedEvent.Register<TappedEventArgs>(
+            "Tapped",
+            RoutingStrategies.Bubble,
+            typeof(Gestures));
+
+        public static readonly RoutedEvent<TappedEventArgs> DoubleTappedEvent = RoutedEvent.Register<TappedEventArgs>(
+            "DoubleTapped",
+            RoutingStrategies.Bubble,
+            typeof(Gestures));
+
+        public static readonly RoutedEvent<TappedEventArgs> RightTappedEvent = RoutedEvent.Register<TappedEventArgs>(
+            "RightTapped",
+            RoutingStrategies.Bubble,
+            typeof(Gestures));
+
+        public static readonly RoutedEvent<ScrollGestureEventArgs> ScrollGestureEvent =
+            RoutedEvent.Register<ScrollGestureEventArgs>(
+                "ScrollGesture", RoutingStrategies.Bubble, typeof(Gestures));
+
+        public static readonly RoutedEvent<ScrollGestureEndedEventArgs> ScrollGestureEndedEvent =
+            RoutedEvent.Register<ScrollGestureEndedEventArgs>(
+                "ScrollGestureEnded", RoutingStrategies.Bubble, typeof(Gestures));
+        
+        public static readonly RoutedEvent<PointerDeltaEventArgs> PointerTouchPadGestureMagnifyEvent =
+            RoutedEvent.Register<PointerDeltaEventArgs>(
+                "PointerMagnifyGesture", RoutingStrategies.Bubble, typeof(Gestures));
+        
+        public static readonly RoutedEvent<PointerDeltaEventArgs> PointerTouchPadGestureRotateEvent =
+            RoutedEvent.Register<PointerDeltaEventArgs>(
+                "PointerRotateGesture", RoutingStrategies.Bubble, typeof(Gestures));
+        
+        public static readonly RoutedEvent<PointerDeltaEventArgs> PointerTouchPadGestureSwipeEvent =
+            RoutedEvent.Register<PointerDeltaEventArgs>(
+                "PointerSwipeGesture", RoutingStrategies.Bubble, typeof(Gestures));
+
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+        private static readonly WeakReference<IInteractive> s_lastPress = new WeakReference<IInteractive>(null);
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+
+        static Gestures()
+        {
+            InputElement.PointerPressedEvent.RouteFinished.Subscribe(PointerPressed);
+            InputElement.PointerReleasedEvent.RouteFinished.Subscribe(PointerReleased);
+        }
+
+        public static void AddTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
+        {
+            element.AddHandler(TappedEvent, handler);
+        }
+
+        public static void AddDoubleTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
+        {
+            element.AddHandler(DoubleTappedEvent, handler);
+        }
+
+        public static void AddRightTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
+        {
+            element.AddHandler(RightTappedEvent, handler);
+        }
+
+        public static void RemoveTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
+        {
+            element.RemoveHandler(TappedEvent, handler);
+        }
+
+        public static void RemoveDoubleTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
+        {
+            element.RemoveHandler(DoubleTappedEvent, handler);
+        }
+
+        public static void RemoveRightTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
+        {
+            element.RemoveHandler(RightTappedEvent, handler);
+        }
+
+        private static void PointerPressed(RoutedEventArgs ev)
+        {
+            if (ev.Source is null)
+            {
+                return;
+            }
+
+            if (ev.Route == RoutingStrategies.Bubble)
+            {
+                var e = (PointerPressedEventArgs)ev;
+                var visual = (IVisual)ev.Source;
+
+                if (e.ClickCount <= 1)
+                {
+                    s_isDoubleTapped = false;
+                    s_lastPress.SetTarget(ev.Source);
+                }
+                else if (e.ClickCount % 2 == 0 && e.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
+                {
+                    if (s_lastPress.TryGetTarget(out var target) && target == e.Source)
+                    {
+                        s_isDoubleTapped = true;
+                        e.Source.RaiseEvent(new TappedEventArgs(DoubleTappedEvent, e));
+                    }
+                }
+                else
+                {
+                    s_isDoubleTapped = false;
+                }
+            }
+        }
+
+        private static void PointerReleased(RoutedEventArgs ev)
+        {
+            if (ev.Route == RoutingStrategies.Bubble)
+            {
+                var e = (PointerReleasedEventArgs)ev;
+
+                if (s_lastPress.TryGetTarget(out var target) && target == e.Source)
+                {
+                    if (e.InitialPressMouseButton == MouseButton.Left || e.InitialPressMouseButton == MouseButton.Right)
+                    {
+                        if (e.InitialPressMouseButton == MouseButton.Right)
+                        {
+                            e.Source.RaiseEvent(new TappedEventArgs(RightTappedEvent, e));
+                        }
+                        //s_isDoubleTapped needed here to prevent invoking Tapped event when DoubleTapped is called.
+                        //This behaviour matches UWP behaviour.
+                        else if (s_isDoubleTapped == false)
+                        {
+                            e.Source.RaiseEvent(new TappedEventArgs(TappedEvent, e));
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Input/GotFocusEventArgs.cs b/src/Avalonia.Base/Input/GotFocusEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/GotFocusEventArgs.cs
rename to src/Avalonia.Base/Input/GotFocusEventArgs.cs
diff --git a/src/Avalonia.Base/Input/IAccessKeyHandler.cs b/src/Avalonia.Base/Input/IAccessKeyHandler.cs
new file mode 100644
index 0000000000..93a50968e2
--- /dev/null
+++ b/src/Avalonia.Base/Input/IAccessKeyHandler.cs
@@ -0,0 +1,38 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines the interface for classes that handle access keys for a window.
+    /// </summary>
+    [Unstable]
+    public interface IAccessKeyHandler
+    {
+        /// <summary>
+        /// Gets or sets the window's main menu.
+        /// </summary>
+        IMainMenu? MainMenu { get; set; }
+
+        /// <summary>
+        /// Sets the owner of the access key handler.
+        /// </summary>
+        /// <param name="owner">The owner.</param>
+        /// <remarks>
+        /// This method can only be called once, typically by the owner itself on creation.
+        /// </remarks>
+        void SetOwner(IInputRoot owner);
+
+        /// <summary>
+        /// Registers an input element to be associated with an access key.
+        /// </summary>
+        /// <param name="accessKey">The access key.</param>
+        /// <param name="element">The input element.</param>
+        void Register(char accessKey, IInputElement element);
+
+        /// <summary>
+        /// Unregisters the access keys associated with the input element.
+        /// </summary>
+        /// <param name="element">The input element.</param>
+        void Unregister(IInputElement element);
+    }
+}
diff --git a/src/Avalonia.Base/Input/IClickableControl.cs b/src/Avalonia.Base/Input/IClickableControl.cs
new file mode 100644
index 0000000000..d6d887520b
--- /dev/null
+++ b/src/Avalonia.Base/Input/IClickableControl.cs
@@ -0,0 +1,18 @@
+using System;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    internal interface IClickableControl
+    {
+        event EventHandler<RoutedEventArgs> Click;
+        void RaiseClick();
+        /// <summary>
+        /// Gets a value indicating whether this control and all its parents are enabled.
+        /// </summary>
+        bool IsEffectivelyEnabled { get; }
+    }
+}
diff --git a/src/Avalonia.Input/ICloseable.cs b/src/Avalonia.Base/Input/ICloseable.cs
similarity index 100%
rename from src/Avalonia.Input/ICloseable.cs
rename to src/Avalonia.Base/Input/ICloseable.cs
diff --git a/src/Avalonia.Input/ICommandSource.cs b/src/Avalonia.Base/Input/ICommandSource.cs
similarity index 100%
rename from src/Avalonia.Input/ICommandSource.cs
rename to src/Avalonia.Base/Input/ICommandSource.cs
diff --git a/src/Avalonia.Input/ICustomKeyboardNavigation.cs b/src/Avalonia.Base/Input/ICustomKeyboardNavigation.cs
similarity index 100%
rename from src/Avalonia.Input/ICustomKeyboardNavigation.cs
rename to src/Avalonia.Base/Input/ICustomKeyboardNavigation.cs
diff --git a/src/Avalonia.Input/IDataObject.cs b/src/Avalonia.Base/Input/IDataObject.cs
similarity index 100%
rename from src/Avalonia.Input/IDataObject.cs
rename to src/Avalonia.Base/Input/IDataObject.cs
diff --git a/src/Avalonia.Base/Input/IFocusManager.cs b/src/Avalonia.Base/Input/IFocusManager.cs
new file mode 100644
index 0000000000..0c85cad2f7
--- /dev/null
+++ b/src/Avalonia.Base/Input/IFocusManager.cs
@@ -0,0 +1,50 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Manages focus for the application.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IFocusManager
+    {
+        /// <summary>
+        /// Gets the currently focused <see cref="IInputElement"/>.
+        /// </summary>
+        IInputElement? Current { get; }
+
+        /// <summary>
+        /// Gets the current focus scope.
+        /// </summary>
+        IFocusScope? Scope { get; }
+
+        /// <summary>
+        /// Focuses a control.
+        /// </summary>
+        /// <param name="control">The control to focus.</param>
+        /// <param name="method">The method by which focus was changed.</param>
+        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
+        void Focus(
+            IInputElement? control,
+            NavigationMethod method = NavigationMethod.Unspecified,
+            KeyModifiers keyModifiers = KeyModifiers.None);
+
+        /// <summary>
+        /// Notifies the focus manager of a change in focus scope.
+        /// </summary>
+        /// <param name="scope">The new focus scope.</param>
+        /// <remarks>
+        /// This should not be called by client code. It is called by an <see cref="IFocusScope"/>
+        /// when it activates, e.g. when a Window is activated.
+        /// </remarks>
+        void SetFocusScope(IFocusScope scope);
+
+        /// <summary>
+        /// Notifies the focus manager that a focus scope has been removed.
+        /// </summary>
+        /// <param name="scope">The focus scope to be removed.</param>
+        /// This should not be called by client code. It is called by an <see cref="IFocusScope"/>
+        /// when it deactivates or closes, e.g. when a Window is closed.
+        void RemoveFocusScope(IFocusScope scope);
+    }
+}
diff --git a/src/Avalonia.Input/IFocusScope.cs b/src/Avalonia.Base/Input/IFocusScope.cs
similarity index 100%
rename from src/Avalonia.Input/IFocusScope.cs
rename to src/Avalonia.Base/Input/IFocusScope.cs
diff --git a/src/Avalonia.Base/Input/IInputDevice.cs b/src/Avalonia.Base/Input/IInputDevice.cs
new file mode 100644
index 0000000000..fe4f584f18
--- /dev/null
+++ b/src/Avalonia.Base/Input/IInputDevice.cs
@@ -0,0 +1,15 @@
+using Avalonia.Input.Raw;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    [NotClientImplementable]
+    public interface IInputDevice
+    {
+        /// <summary>
+        /// Processes raw event. Is called after preprocessing by InputManager
+        /// </summary>
+        /// <param name="ev"></param>
+        void ProcessRawEvent(RawInputEventArgs ev);
+    }
+}
diff --git a/src/Avalonia.Base/Input/IInputElement.cs b/src/Avalonia.Base/Input/IInputElement.cs
new file mode 100644
index 0000000000..78001143d7
--- /dev/null
+++ b/src/Avalonia.Base/Input/IInputElement.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Interactivity;
+using Avalonia.Metadata;
+using Avalonia.VisualTree;
+
+#nullable enable
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines input-related functionality for a control.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IInputElement : IInteractive, IVisual
+    {
+        /// <summary>
+        /// Occurs when the control receives focus.
+        /// </summary>
+        event EventHandler<GotFocusEventArgs>? GotFocus;
+
+        /// <summary>
+        /// Occurs when the control loses focus.
+        /// </summary>
+        event EventHandler<RoutedEventArgs>? LostFocus;
+
+        /// <summary>
+        /// Occurs when a key is pressed while the control has focus.
+        /// </summary>
+        event EventHandler<KeyEventArgs>? KeyDown;
+
+        /// <summary>
+        /// Occurs when a key is released while the control has focus.
+        /// </summary>
+        event EventHandler<KeyEventArgs>? KeyUp;
+
+        /// <summary>
+        /// Occurs when a user typed some text while the control has focus.
+        /// </summary>
+        event EventHandler<TextInputEventArgs>? TextInput;
+
+        /// <summary>
+        /// Occurs when the pointer enters the control.
+        /// </summary>
+        event EventHandler<PointerEventArgs>? PointerEnter;
+
+        /// <summary>
+        /// Occurs when the pointer leaves the control.
+        /// </summary>
+        event EventHandler<PointerEventArgs>? PointerLeave;
+
+        /// <summary>
+        /// Occurs when the pointer is pressed over the control.
+        /// </summary>
+        event EventHandler<PointerPressedEventArgs>? PointerPressed;
+
+        /// <summary>
+        /// Occurs when the pointer moves over the control.
+        /// </summary>
+        event EventHandler<PointerEventArgs>? PointerMoved;
+
+        /// <summary>
+        /// Occurs when the pointer is released over the control.
+        /// </summary>
+        event EventHandler<PointerReleasedEventArgs>? PointerReleased;
+
+        /// <summary>
+        /// Occurs when the mouse wheel is scrolled over the control.
+        /// </summary>
+        event EventHandler<PointerWheelEventArgs>? PointerWheelChanged;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control can receive keyboard focus.
+        /// </summary>
+        bool Focusable { get; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is enabled for user interaction.
+        /// </summary>
+        bool IsEnabled { get; }
+
+        /// <summary>
+        /// Gets or sets the associated mouse cursor.
+        /// </summary>
+        Cursor? Cursor { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this control and all its parents are enabled.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="IsEnabled"/> property is used to toggle the enabled state for individual
+        /// controls. The <see cref="IsEffectivelyEnabled"/> property takes into account the
+        /// <see cref="IsEnabled"/> value of this control and its parent controls.
+        /// </remarks>
+        bool IsEffectivelyEnabled { get; }
+        
+        /// <summary>
+        /// Gets a value indicating whether keyboard focus is anywhere within the element or its visual tree child elements.
+        /// </summary>
+        bool IsKeyboardFocusWithin { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the control is focused.
+        /// </summary>
+        bool IsFocused { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the control is considered for hit testing.
+        /// </summary>
+        bool IsHitTestVisible { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the pointer is currently over the control.
+        /// </summary>
+        bool IsPointerOver { get; }
+
+        /// <summary>
+        /// Focuses the control.
+        /// </summary>
+        void Focus();
+
+        /// <summary>
+        /// Gets the key bindings for the element.
+        /// </summary>
+        List<KeyBinding> KeyBindings { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Input/IInputManager.cs b/src/Avalonia.Base/Input/IInputManager.cs
new file mode 100644
index 0000000000..658226a519
--- /dev/null
+++ b/src/Avalonia.Base/Input/IInputManager.cs
@@ -0,0 +1,37 @@
+using System;
+using Avalonia.Input.Raw;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Receives input from the windowing subsystem and dispatches it to interested parties
+    /// for processing.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IInputManager
+    {
+        /// <summary>
+        /// Gets an observable that notifies on each input event received before
+        /// <see cref="Process"/>.
+        /// </summary>
+        IObservable<RawInputEventArgs> PreProcess { get; }
+
+        /// <summary>
+        /// Gets an observable that notifies on each input event received.
+        /// </summary>
+        IObservable<RawInputEventArgs> Process { get; }
+
+        /// <summary>
+        /// Gets an observable that notifies on each input event received after
+        /// <see cref="Process"/>.
+        /// </summary>
+        IObservable<RawInputEventArgs> PostProcess { get; }
+
+        /// <summary>
+        /// Processes a raw input event.
+        /// </summary>
+        /// <param name="e">The raw input event.</param>
+        void ProcessInput(RawInputEventArgs e);
+    }
+}
diff --git a/src/Avalonia.Base/Input/IInputRoot.cs b/src/Avalonia.Base/Input/IInputRoot.cs
new file mode 100644
index 0000000000..7edc69df52
--- /dev/null
+++ b/src/Avalonia.Base/Input/IInputRoot.cs
@@ -0,0 +1,36 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines the interface for top-level input elements.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IInputRoot : IInputElement
+    {
+        /// <summary>
+        /// Gets or sets the access key handler.
+        /// </summary>
+        IAccessKeyHandler AccessKeyHandler { get; }
+
+        /// <summary>
+        /// Gets or sets the keyboard navigation handler.
+        /// </summary>
+        IKeyboardNavigationHandler KeyboardNavigationHandler { get; }
+
+        /// <summary>
+        /// Gets or sets the input element that the pointer is currently over.
+        /// </summary>
+        IInputElement? PointerOverElement { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether access keys are shown in the window.
+        /// </summary>
+        bool ShowAccessKeys { get; set; }
+
+        /// <summary>
+        /// Gets associated mouse device
+        /// </summary>
+        IMouseDevice? MouseDevice { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Input/IKeyboardDevice.cs b/src/Avalonia.Base/Input/IKeyboardDevice.cs
new file mode 100644
index 0000000000..c8db8bf16f
--- /dev/null
+++ b/src/Avalonia.Base/Input/IKeyboardDevice.cs
@@ -0,0 +1,64 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    [Flags, Obsolete("Use KeyModifiers and PointerPointProperties")]
+    public enum InputModifiers
+    {
+        None = 0,
+        Alt = 1,
+        Control = 2,
+        Shift = 4,
+        Windows = 8,
+        LeftMouseButton = 16,
+        RightMouseButton = 32,
+        MiddleMouseButton = 64
+    }
+
+    [Flags]
+    public enum KeyModifiers
+    {
+        None = 0,
+        Alt = 1,
+        Control = 2,
+        Shift = 4,
+        Meta = 8,
+    }
+
+    [Flags]
+    public enum KeyStates
+    {
+        None = 0,
+        Down = 1,
+        Toggled = 2,
+    }
+
+    [Flags]
+    public enum RawInputModifiers
+    {
+        None = 0,
+        Alt = 1,
+        Control = 2,
+        Shift = 4,
+        Meta = 8,
+        LeftMouseButton = 16,
+        RightMouseButton = 32,
+        MiddleMouseButton = 64,
+        XButton1MouseButton = 128,
+        XButton2MouseButton = 256,
+        KeyboardMask = Alt | Control | Shift | Meta
+    }
+
+    [NotClientImplementable]
+    public interface IKeyboardDevice : IInputDevice, INotifyPropertyChanged
+    {
+        IInputElement? FocusedElement { get; }
+
+        void SetFocusedElement(
+            IInputElement? element, 
+            NavigationMethod method,
+            KeyModifiers modifiers);
+    }
+}
diff --git a/src/Avalonia.Base/Input/IKeyboardNavigationHandler.cs b/src/Avalonia.Base/Input/IKeyboardNavigationHandler.cs
new file mode 100644
index 0000000000..3bcd6d6206
--- /dev/null
+++ b/src/Avalonia.Base/Input/IKeyboardNavigationHandler.cs
@@ -0,0 +1,31 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines the interface for classes that handle keyboard navigation for a window.
+    /// </summary>
+    [Unstable]
+    public interface IKeyboardNavigationHandler
+    {
+        /// <summary>
+        /// Sets the owner of the keyboard navigation handler.
+        /// </summary>
+        /// <param name="owner">The owner.</param>
+        /// <remarks>
+        /// This method can only be called once, typically by the owner itself on creation.
+        /// </remarks>
+        void SetOwner(IInputRoot owner);
+
+        /// <summary>
+        /// Moves the focus in the specified direction.
+        /// </summary>
+        /// <param name="element">The current element.</param>
+        /// <param name="direction">The direction to move.</param>
+        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
+        void Move(
+            IInputElement element, 
+            NavigationDirection direction,
+            KeyModifiers keyModifiers = KeyModifiers.None);
+    }
+}
diff --git a/src/Avalonia.Base/Input/IMainMenu.cs b/src/Avalonia.Base/Input/IMainMenu.cs
new file mode 100644
index 0000000000..213a979c28
--- /dev/null
+++ b/src/Avalonia.Base/Input/IMainMenu.cs
@@ -0,0 +1,34 @@
+using System;
+using Avalonia.Interactivity;
+using Avalonia.Metadata;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines the interface for a window's main menu.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IMainMenu : IVisual
+    {
+        /// <summary>
+        /// Gets a value indicating whether the menu is open.
+        /// </summary>
+        bool IsOpen { get; }
+
+        /// <summary>
+        /// Closes the menu.
+        /// </summary>
+        void Close();
+
+        /// <summary>
+        /// Opens the menu in response to the Alt/F10 key.
+        /// </summary>
+        void Open();
+
+        /// <summary>
+        /// Occurs when the main menu closes.
+        /// </summary>
+        event EventHandler<RoutedEventArgs>? MenuClosed;
+    }
+}
diff --git a/src/Avalonia.Base/Input/IMouseDevice.cs b/src/Avalonia.Base/Input/IMouseDevice.cs
new file mode 100644
index 0000000000..2d66397d63
--- /dev/null
+++ b/src/Avalonia.Base/Input/IMouseDevice.cs
@@ -0,0 +1,24 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Represents a mouse device.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IMouseDevice : IPointerDevice
+    {
+        /// <summary>
+        /// Gets the mouse position, in screen coordinates.
+        /// </summary>
+        [Obsolete("Use PointerEventArgs.GetPosition")]
+        PixelPoint Position { get; }
+
+        [Obsolete]
+        void TopLevelClosed(IInputRoot root);
+
+        [Obsolete]
+        void SceneInvalidated(IInputRoot root, Rect rect);
+    }
+}
diff --git a/src/Avalonia.Input/INavigableContainer.cs b/src/Avalonia.Base/Input/INavigableContainer.cs
similarity index 100%
rename from src/Avalonia.Input/INavigableContainer.cs
rename to src/Avalonia.Base/Input/INavigableContainer.cs
diff --git a/src/Avalonia.Base/Input/IPointer.cs b/src/Avalonia.Base/Input/IPointer.cs
new file mode 100644
index 0000000000..66aeacadc9
--- /dev/null
+++ b/src/Avalonia.Base/Input/IPointer.cs
@@ -0,0 +1,21 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    [NotClientImplementable]
+    public interface IPointer
+    {
+        int Id { get; }
+        void Capture(IInputElement? control);
+        IInputElement? Captured { get; }
+        PointerType Type { get; }
+        bool IsPrimary { get; }
+        
+    }
+
+    public enum PointerType
+    {
+        Mouse,
+        Touch
+    }
+}
diff --git a/src/Avalonia.Base/Input/IPointerDevice.cs b/src/Avalonia.Base/Input/IPointerDevice.cs
new file mode 100644
index 0000000000..0993835feb
--- /dev/null
+++ b/src/Avalonia.Base/Input/IPointerDevice.cs
@@ -0,0 +1,33 @@
+using System;
+using Avalonia.VisualTree;
+using Avalonia.Input.Raw;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input
+{
+    [NotClientImplementable]
+    public interface IPointerDevice : IInputDevice
+    {
+        /// <inheritdoc cref="IPointer.Captured" />
+        [Obsolete("Use IPointer")]
+        IInputElement? Captured { get; }
+
+        /// <inheritdoc cref="IPointer.Capture(IInputElement?)" />
+        [Obsolete("Use IPointer")]
+        void Capture(IInputElement? control);
+
+        /// <inheritdoc cref="PointerEventArgs.GetPosition(IVisual?)" />
+        [Obsolete("Use PointerEventArgs.GetPosition")]
+        Point GetPosition(IVisual relativeTo);
+
+        /// <summary>
+        /// Gets a pointer for specific event args.
+        /// </summary>
+        /// <remarks>
+        /// If pointer doesn't exist or wasn't yet created this method will return null.
+        /// </remarks>
+        /// <param name="ev">Raw pointer event args associated with the pointer.</param>
+        /// <returns>The pointer.</returns>
+        IPointer? TryGetPointer(RawPointerEventArgs ev);
+    }
+}
diff --git a/src/Avalonia.Base/Input/InputElement.cs b/src/Avalonia.Base/Input/InputElement.cs
new file mode 100644
index 0000000000..f4e25ebada
--- /dev/null
+++ b/src/Avalonia.Base/Input/InputElement.cs
@@ -0,0 +1,693 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Data;
+using Avalonia.Input.GestureRecognizers;
+using Avalonia.Input.TextInput;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+#nullable enable
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Implements input-related functionality for a control.
+    /// </summary>
+    [PseudoClasses(":disabled", ":focus", ":focus-visible", ":focus-within", ":pointerover")]
+    public class InputElement : Interactive, IInputElement
+    {
+        /// <summary>
+        /// Defines the <see cref="Focusable"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> FocusableProperty =
+            AvaloniaProperty.Register<InputElement, bool>(nameof(Focusable));
+
+        /// <summary>
+        /// Defines the <see cref="IsEnabled"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsEnabledProperty =
+            AvaloniaProperty.Register<InputElement, bool>(nameof(IsEnabled), true);
+
+        /// <summary>
+        /// Defines the <see cref="IsEffectivelyEnabled"/> property.
+        /// </summary>
+        public static readonly DirectProperty<InputElement, bool> IsEffectivelyEnabledProperty =
+            AvaloniaProperty.RegisterDirect<InputElement, bool>(
+                nameof(IsEffectivelyEnabled),
+                o => o.IsEffectivelyEnabled);
+
+        /// <summary>
+        /// Gets or sets associated mouse cursor.
+        /// </summary>
+        public static readonly StyledProperty<Cursor?> CursorProperty =
+            AvaloniaProperty.Register<InputElement, Cursor?>(nameof(Cursor), null, true);
+
+        /// <summary>
+        /// Defines the <see cref="IsKeyboardFocusWithin"/> property.
+        /// </summary>
+        public static readonly DirectProperty<InputElement, bool> IsKeyboardFocusWithinProperty =
+            AvaloniaProperty.RegisterDirect<InputElement, bool>(
+                nameof(IsKeyboardFocusWithin),
+                o => o.IsKeyboardFocusWithin);
+        
+        /// <summary>
+        /// Defines the <see cref="IsFocused"/> property.
+        /// </summary>
+        public static readonly DirectProperty<InputElement, bool> IsFocusedProperty =
+            AvaloniaProperty.RegisterDirect<InputElement, bool>(nameof(IsFocused), o => o.IsFocused);
+
+        /// <summary>
+        /// Defines the <see cref="IsHitTestVisible"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsHitTestVisibleProperty =
+            AvaloniaProperty.Register<InputElement, bool>(nameof(IsHitTestVisible), true);
+
+        /// <summary>
+        /// Defines the <see cref="IsPointerOver"/> property.
+        /// </summary>
+        public static readonly DirectProperty<InputElement, bool> IsPointerOverProperty =
+            AvaloniaProperty.RegisterDirect<InputElement, bool>(nameof(IsPointerOver), o => o.IsPointerOver);
+
+        /// <summary>
+        /// Defines the <see cref="IsTabStop"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsTabStopProperty =
+            KeyboardNavigation.IsTabStopProperty.AddOwner<InputElement>();
+
+        /// <summary>
+        /// Defines the <see cref="GotFocus"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<GotFocusEventArgs> GotFocusEvent =
+            RoutedEvent.Register<InputElement, GotFocusEventArgs>(nameof(GotFocus), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="LostFocus"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> LostFocusEvent =
+            RoutedEvent.Register<InputElement, RoutedEventArgs>(nameof(LostFocus), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="KeyDown"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<KeyEventArgs> KeyDownEvent =
+            RoutedEvent.Register<InputElement, KeyEventArgs>(
+                nameof(KeyDown),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="KeyUp"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<KeyEventArgs> KeyUpEvent =
+            RoutedEvent.Register<InputElement, KeyEventArgs>(
+                nameof(KeyUp),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="TabIndex"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> TabIndexProperty =
+            KeyboardNavigation.TabIndexProperty.AddOwner<InputElement>();
+
+        /// <summary>
+        /// Defines the <see cref="TextInput"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<TextInputEventArgs> TextInputEvent =
+            RoutedEvent.Register<InputElement, TextInputEventArgs>(
+                nameof(TextInput),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+        
+        /// <summary>
+        /// Defines the <see cref="TextInputMethodClientRequested"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<TextInputMethodClientRequestedEventArgs> TextInputMethodClientRequestedEvent =
+            RoutedEvent.Register<InputElement, TextInputMethodClientRequestedEventArgs>(
+                nameof(TextInputMethodClientRequested),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="PointerEnter"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerEventArgs> PointerEnterEvent =
+            RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerEnter), RoutingStrategies.Direct);
+
+        /// <summary>
+        /// Defines the <see cref="PointerLeave"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerEventArgs> PointerLeaveEvent =
+            RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerLeave), RoutingStrategies.Direct);
+
+        /// <summary>
+        /// Defines the <see cref="PointerMoved"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerEventArgs> PointerMovedEvent =
+            RoutedEvent.Register<InputElement, PointerEventArgs>(
+                nameof(PointerMoved),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="PointerPressed"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerPressedEventArgs> PointerPressedEvent =
+            RoutedEvent.Register<InputElement, PointerPressedEventArgs>(
+                nameof(PointerPressed),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="PointerReleased"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerReleasedEventArgs> PointerReleasedEvent =
+            RoutedEvent.Register<InputElement, PointerReleasedEventArgs>(
+                nameof(PointerReleased),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+        
+        /// <summary>
+        /// Defines the <see cref="PointerCaptureLost"/> routed event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerCaptureLostEventArgs> PointerCaptureLostEvent =
+            RoutedEvent.Register<InputElement, PointerCaptureLostEventArgs>(
+                nameof(PointerCaptureLost), 
+                RoutingStrategies.Direct);
+
+        /// <summary>
+        /// Defines the <see cref="PointerWheelChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<PointerWheelEventArgs> PointerWheelChangedEvent =
+            RoutedEvent.Register<InputElement, PointerWheelEventArgs>(
+                nameof(PointerWheelChanged),
+                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="Tapped"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<TappedEventArgs> TappedEvent = Gestures.TappedEvent;
+
+        /// <summary>
+        /// Defines the <see cref="DoubleTapped"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<TappedEventArgs> DoubleTappedEvent = Gestures.DoubleTappedEvent;
+        
+        private bool _isEffectivelyEnabled = true;
+        private bool _isFocused;
+        private bool _isKeyboardFocusWithin;
+        private bool _isFocusVisible;
+        private bool _isPointerOver;
+        private GestureRecognizerCollection? _gestureRecognizers;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="InputElement"/> class.
+        /// </summary>
+        static InputElement()
+        {
+            IsEnabledProperty.Changed.Subscribe(IsEnabledChanged);
+
+            GotFocusEvent.AddClassHandler<InputElement>((x, e) => x.OnGotFocus(e));
+            LostFocusEvent.AddClassHandler<InputElement>((x, e) => x.OnLostFocus(e));
+            KeyDownEvent.AddClassHandler<InputElement>((x, e) => x.OnKeyDown(e));
+            KeyUpEvent.AddClassHandler<InputElement>((x, e) => x.OnKeyUp(e));
+            TextInputEvent.AddClassHandler<InputElement>((x, e) => x.OnTextInput(e));
+            PointerEnterEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerEnterCore(e));
+            PointerLeaveEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerLeaveCore(e));
+            PointerMovedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerMoved(e));
+            PointerPressedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerPressed(e));
+            PointerReleasedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerReleased(e));
+            PointerCaptureLostEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerCaptureLost(e));
+            PointerWheelChangedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerWheelChanged(e));
+        }
+
+        public InputElement()
+        {
+            UpdatePseudoClasses(IsFocused, IsPointerOver);
+        }
+
+        /// <summary>
+        /// Occurs when the control receives focus.
+        /// </summary>
+        public event EventHandler<GotFocusEventArgs>? GotFocus
+        {
+            add { AddHandler(GotFocusEvent, value); }
+            remove { RemoveHandler(GotFocusEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the control loses focus.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs>? LostFocus
+        {
+            add { AddHandler(LostFocusEvent, value); }
+            remove { RemoveHandler(LostFocusEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when a key is pressed while the control has focus.
+        /// </summary>
+        public event EventHandler<KeyEventArgs>? KeyDown
+        {
+            add { AddHandler(KeyDownEvent, value); }
+            remove { RemoveHandler(KeyDownEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when a key is released while the control has focus.
+        /// </summary>
+        public event EventHandler<KeyEventArgs>? KeyUp
+        {
+            add { AddHandler(KeyUpEvent, value); }
+            remove { RemoveHandler(KeyUpEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when a user typed some text while the control has focus.
+        /// </summary>
+        public event EventHandler<TextInputEventArgs>? TextInput
+        {
+            add { AddHandler(TextInputEvent, value); }
+            remove { RemoveHandler(TextInputEvent, value); }
+        }
+        
+        /// <summary>
+        /// Occurs when an input element gains input focus and input method is looking for the corresponding client
+        /// </summary>
+        public event EventHandler<TextInputMethodClientRequestedEventArgs>? TextInputMethodClientRequested
+        {
+            add { AddHandler(TextInputMethodClientRequestedEvent, value); }
+            remove { RemoveHandler(TextInputMethodClientRequestedEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the pointer enters the control.
+        /// </summary>
+        public event EventHandler<PointerEventArgs>? PointerEnter
+        {
+            add { AddHandler(PointerEnterEvent, value); }
+            remove { RemoveHandler(PointerEnterEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the pointer leaves the control.
+        /// </summary>
+        public event EventHandler<PointerEventArgs>? PointerLeave
+        {
+            add { AddHandler(PointerLeaveEvent, value); }
+            remove { RemoveHandler(PointerLeaveEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the pointer moves over the control.
+        /// </summary>
+        public event EventHandler<PointerEventArgs>? PointerMoved
+        {
+            add { AddHandler(PointerMovedEvent, value); }
+            remove { RemoveHandler(PointerMovedEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the pointer is pressed over the control.
+        /// </summary>
+        public event EventHandler<PointerPressedEventArgs>? PointerPressed
+        {
+            add { AddHandler(PointerPressedEvent, value); }
+            remove { RemoveHandler(PointerPressedEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the pointer is released over the control.
+        /// </summary>
+        public event EventHandler<PointerReleasedEventArgs>? PointerReleased
+        {
+            add { AddHandler(PointerReleasedEvent, value); }
+            remove { RemoveHandler(PointerReleasedEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the control or its child control loses the pointer capture for any reason,
+        /// event will not be triggered for a parent control if capture was transferred to another child of that parent control
+        /// </summary>
+        public event EventHandler<PointerCaptureLostEventArgs>? PointerCaptureLost
+        {
+            add => AddHandler(PointerCaptureLostEvent, value);
+            remove => RemoveHandler(PointerCaptureLostEvent, value);
+        }
+        
+        /// <summary>
+        /// Occurs when the mouse is scrolled over the control.
+        /// </summary>
+        public event EventHandler<PointerWheelEventArgs>? PointerWheelChanged
+        {
+            add { AddHandler(PointerWheelChangedEvent, value); }
+            remove { RemoveHandler(PointerWheelChangedEvent, value); }
+        }
+        
+        /// <summary>
+        /// Occurs when a tap gesture occurs on the control.
+        /// </summary>
+        public event EventHandler<TappedEventArgs>? Tapped
+        {
+            add { AddHandler(TappedEvent, value); }
+            remove { RemoveHandler(TappedEvent, value); }
+        }
+
+        /// <summary>
+        /// Occurs when a double-tap gesture occurs on the control.
+        /// </summary>
+        public event EventHandler<TappedEventArgs>? DoubleTapped
+        {
+            add { AddHandler(DoubleTappedEvent, value); }
+            remove { RemoveHandler(DoubleTappedEvent, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control can receive focus.
+        /// </summary>
+        public bool Focusable
+        {
+            get { return GetValue(FocusableProperty); }
+            set { SetValue(FocusableProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is enabled for user interaction.
+        /// </summary>
+        public bool IsEnabled
+        {
+            get { return GetValue(IsEnabledProperty); }
+            set { SetValue(IsEnabledProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets associated mouse cursor.
+        /// </summary>
+        public Cursor? Cursor
+        {
+            get { return GetValue(CursorProperty); }
+            set { SetValue(CursorProperty, value); }
+        }
+        
+        /// <summary>
+        /// Gets a value indicating whether keyboard focus is anywhere within the element or its visual tree child elements.
+        /// </summary>
+        public bool IsKeyboardFocusWithin
+        {
+            get => _isKeyboardFocusWithin;
+            internal set => SetAndRaise(IsKeyboardFocusWithinProperty, ref _isKeyboardFocusWithin, value); 
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the control is focused.
+        /// </summary>
+        public bool IsFocused
+        {
+            get { return _isFocused; }
+            private set { SetAndRaise(IsFocusedProperty, ref _isFocused, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is considered for hit testing.
+        /// </summary>
+        public bool IsHitTestVisible
+        {
+            get { return GetValue(IsHitTestVisibleProperty); }
+            set { SetValue(IsHitTestVisibleProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the pointer is currently over the control.
+        /// </summary>
+        public bool IsPointerOver
+        {
+            get { return _isPointerOver; }
+            internal set { SetAndRaise(IsPointerOverProperty, ref _isPointerOver, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether the control is included in tab navigation.
+        /// </summary>
+        public bool IsTabStop
+        {
+            get => GetValue(IsTabStopProperty);
+            set => SetValue(IsTabStopProperty, value);
+        }
+
+        /// <inheritdoc/>
+        public bool IsEffectivelyEnabled
+        {
+            get => _isEffectivelyEnabled;
+            private set
+            {
+                SetAndRaise(IsEffectivelyEnabledProperty, ref _isEffectivelyEnabled, value);
+                PseudoClasses.Set(":disabled", !value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines the order in which elements receive focus when the
+        /// user navigates through controls by pressing the Tab key.
+        /// </summary>
+        public int TabIndex
+        {
+            get => GetValue(TabIndexProperty);
+            set => SetValue(TabIndexProperty, value);
+        }
+
+        public List<KeyBinding> KeyBindings { get; } = new List<KeyBinding>();
+
+        /// <summary>
+        /// Allows a derived class to override the enabled state of the control.
+        /// </summary>
+        /// <remarks>
+        /// Derived controls may wish to disable the enabled state of the control without overwriting the
+        /// user-supplied <see cref="IsEnabled"/> setting. This can be done by overriding this property
+        /// to return the overridden enabled state. If the value returned from <see cref="IsEnabledCore"/>
+        /// should change, then the derived control should call <see cref="UpdateIsEffectivelyEnabled()"/>.
+        /// </remarks>
+        protected virtual bool IsEnabledCore => IsEnabled;
+
+        public GestureRecognizerCollection GestureRecognizers
+            => _gestureRecognizers ?? (_gestureRecognizers = new GestureRecognizerCollection(this));
+
+        /// <summary>
+        /// Focuses the control.
+        /// </summary>
+        public void Focus()
+        {
+            FocusManager.Instance?.Focus(this);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTreeCore(e);
+
+            if (IsFocused)
+            {
+                FocusManager.Instance?.Focus(null);
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTreeCore(e);
+            UpdateIsEffectivelyEnabled();
+        }
+
+        /// <summary>
+        /// Called before the <see cref="GotFocus"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnGotFocus(GotFocusEventArgs e)
+        {
+            var isFocused = e.Source == this;
+            _isFocusVisible = isFocused && (e.NavigationMethod == NavigationMethod.Directional || e.NavigationMethod == NavigationMethod.Tab);
+            IsFocused = isFocused;
+        }
+
+        /// <summary>
+        /// Called before the <see cref="LostFocus"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnLostFocus(RoutedEventArgs e)
+        {
+            _isFocusVisible = false;
+            IsFocused = false;
+        }
+
+        /// <summary>
+        /// Called before the <see cref="KeyDown"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnKeyDown(KeyEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called before the <see cref="KeyUp"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnKeyUp(KeyEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called before the <see cref="TextInput"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnTextInput(TextInputEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerEnter"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerEnter(PointerEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerLeave"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerLeave(PointerEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerMoved"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerMoved(PointerEventArgs e)
+        {
+            if (_gestureRecognizers?.HandlePointerMoved(e) == true)
+                e.Handled = true;
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerPressed"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerPressed(PointerPressedEventArgs e)
+        {
+            if (_gestureRecognizers?.HandlePointerPressed(e) == true)
+                e.Handled = true;
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerReleased"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerReleased(PointerReleasedEventArgs e)
+        {
+            if (_gestureRecognizers?.HandlePointerReleased(e) == true)
+                e.Handled = true;
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerCaptureLost"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
+        {
+            _gestureRecognizers?.HandlePointerCaptureLost(e);
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerWheelChanged"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnPointerWheelChanged(PointerWheelEventArgs e)
+        {
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == IsFocusedProperty)
+            {
+                UpdatePseudoClasses(change.GetNewValue<bool>(), null);
+            }
+            else if (change.Property == IsPointerOverProperty)
+            {
+                UpdatePseudoClasses(null, change.GetNewValue<bool>());
+            }
+            else if (change.Property == IsKeyboardFocusWithinProperty)
+            {
+                PseudoClasses.Set(":focus-within", change.GetNewValue<bool>());
+            }
+        }
+
+        /// <summary>
+        /// Updates the <see cref="IsEffectivelyEnabled"/> property value according to the parent
+        /// control's enabled state and <see cref="IsEnabledCore"/>.
+        /// </summary>
+        protected void UpdateIsEffectivelyEnabled()
+        {
+            UpdateIsEffectivelyEnabled(this.GetVisualParent<InputElement>());
+        }
+
+        private static void IsEnabledChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            ((InputElement)e.Sender).UpdateIsEffectivelyEnabled();
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerEnter"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private void OnPointerEnterCore(PointerEventArgs e)
+        {
+            IsPointerOver = true;
+            OnPointerEnter(e);
+        }
+
+        /// <summary>
+        /// Called before the <see cref="PointerLeave"/> event occurs.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private void OnPointerLeaveCore(PointerEventArgs e)
+        {
+            IsPointerOver = false;
+            OnPointerLeave(e);
+        }
+
+        /// <summary>
+        /// Updates the <see cref="IsEffectivelyEnabled"/> property based on the parent's
+        /// <see cref="IsEffectivelyEnabled"/>.
+        /// </summary>
+        /// <param name="parent">The parent control.</param>
+        private void UpdateIsEffectivelyEnabled(InputElement? parent)
+        {
+            IsEffectivelyEnabled = IsEnabledCore && (parent?.IsEffectivelyEnabled ?? true);
+
+            // PERF-SENSITIVE: This is called on entire hierarchy and using foreach or LINQ
+            // will cause extra allocations and overhead.
+            
+            var children = VisualChildren;
+
+            // ReSharper disable once ForCanBeConvertedToForeach
+            for (int i = 0; i < children.Count; ++i)
+            {
+                var child = children[i] as InputElement;
+
+                child?.UpdateIsEffectivelyEnabled(this);
+            }
+        }
+
+        private void UpdatePseudoClasses(bool? isFocused, bool? isPointerOver)
+        {
+            if (isFocused.HasValue)
+            {
+                PseudoClasses.Set(":focus", isFocused.Value);
+                PseudoClasses.Set(":focus-visible", _isFocusVisible);
+            }
+            
+            if (isPointerOver.HasValue)
+            {
+                PseudoClasses.Set(":pointerover", isPointerOver.Value);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Input/InputExtensions.cs b/src/Avalonia.Base/Input/InputExtensions.cs
similarity index 100%
rename from src/Avalonia.Input/InputExtensions.cs
rename to src/Avalonia.Base/Input/InputExtensions.cs
diff --git a/src/Avalonia.Input/InputManager.cs b/src/Avalonia.Base/Input/InputManager.cs
similarity index 100%
rename from src/Avalonia.Input/InputManager.cs
rename to src/Avalonia.Base/Input/InputManager.cs
diff --git a/src/Avalonia.Input/InputMethod.cs b/src/Avalonia.Base/Input/InputMethod.cs
similarity index 100%
rename from src/Avalonia.Input/InputMethod.cs
rename to src/Avalonia.Base/Input/InputMethod.cs
diff --git a/src/Avalonia.Input/Key.cs b/src/Avalonia.Base/Input/Key.cs
similarity index 100%
rename from src/Avalonia.Input/Key.cs
rename to src/Avalonia.Base/Input/Key.cs
diff --git a/src/Avalonia.Input/KeyBinding.cs b/src/Avalonia.Base/Input/KeyBinding.cs
similarity index 100%
rename from src/Avalonia.Input/KeyBinding.cs
rename to src/Avalonia.Base/Input/KeyBinding.cs
diff --git a/src/Avalonia.Input/KeyEventArgs.cs b/src/Avalonia.Base/Input/KeyEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/KeyEventArgs.cs
rename to src/Avalonia.Base/Input/KeyEventArgs.cs
diff --git a/src/Avalonia.Base/Input/KeyGesture.cs b/src/Avalonia.Base/Input/KeyGesture.cs
new file mode 100644
index 0000000000..3b7a828b86
--- /dev/null
+++ b/src/Avalonia.Base/Input/KeyGesture.cs
@@ -0,0 +1,194 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Utilities;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines a keyboard input combination.
+    /// </summary>
+    public sealed class KeyGesture : IEquatable<KeyGesture>
+    {
+        private static readonly Dictionary<string, Key> s_keySynonyms = new Dictionary<string, Key>
+        {
+            { "+", Key.OemPlus }, { "-", Key.OemMinus }, { ".", Key.OemPeriod }, { ",", Key.OemComma }
+        };
+
+        [Obsolete("Use constructor taking KeyModifiers")]
+        public KeyGesture(Key key, InputModifiers modifiers)
+        {
+            Key = key;
+            KeyModifiers = (KeyModifiers)(((int)modifiers) & 0xf);
+        }
+
+        public KeyGesture(Key key, KeyModifiers modifiers = KeyModifiers.None)
+        {
+            Key = key;
+            KeyModifiers = modifiers;
+        }
+
+        public bool Equals(KeyGesture? other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return Key == other.Key && KeyModifiers == other.KeyModifiers;
+        }
+
+        public override bool Equals(object? obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+
+            return obj is KeyGesture gesture && Equals(gesture);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return ((int)Key * 397) ^ (int)KeyModifiers;
+            }
+        }
+
+        public static bool operator ==(KeyGesture? left, KeyGesture? right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(KeyGesture? left, KeyGesture? right)
+        {
+            return !Equals(left, right);
+        }
+
+        public Key Key { get; }
+
+        [Obsolete("Use KeyModifiers")]
+        public InputModifiers Modifiers => (InputModifiers)KeyModifiers;
+
+        public KeyModifiers KeyModifiers { get; }
+
+        public static KeyGesture Parse(string gesture)
+        {
+            // string.Split can't be used here because "Ctrl++" is a perfectly valid key gesture
+
+            var key = Key.None;
+            var keyModifiers = KeyModifiers.None;
+
+            var cstart = 0;
+
+            for (var c = 0; c <= gesture.Length; c++)
+            {
+                var ch = c == gesture.Length ? '\0' : gesture[c];
+                bool isLast = c == gesture.Length;
+
+                if (isLast || (ch == '+' && cstart != c))
+                {
+                    var partSpan = gesture.AsSpan(cstart, c - cstart).Trim();
+
+                    if (isLast)
+                    {
+                        key = ParseKey(partSpan.ToString());
+                    }
+                    else
+                    {
+                        keyModifiers |= ParseModifier(partSpan);
+                    }
+
+                    cstart = c + 1;
+                }
+            }
+
+
+            return new KeyGesture(key, keyModifiers);
+        }
+
+        public override string ToString()
+        {
+            var s = new StringBuilder();
+
+            static void Plus(StringBuilder s)
+            {
+                if (s.Length > 0)
+                {
+                    s.Append("+");
+                }
+            }
+
+            if (KeyModifiers.HasAllFlags(KeyModifiers.Control))
+            {
+                s.Append("Ctrl");
+            }
+
+            if (KeyModifiers.HasAllFlags(KeyModifiers.Shift))
+            {
+                Plus(s);
+                s.Append("Shift");
+            }
+
+            if (KeyModifiers.HasAllFlags(KeyModifiers.Alt))
+            {
+                Plus(s);
+                s.Append("Alt");
+            }
+
+            if (KeyModifiers.HasAllFlags(KeyModifiers.Meta))
+            {
+                Plus(s);
+                s.Append("Cmd");
+            }
+
+            Plus(s);
+            s.Append(Key);
+
+            return s.ToString();
+        }
+
+        public bool Matches(KeyEventArgs keyEvent) =>
+            keyEvent != null &&
+            keyEvent.KeyModifiers == KeyModifiers &&
+            ResolveNumPadOperationKey(keyEvent.Key) == ResolveNumPadOperationKey(Key);
+
+        // TODO: Move that to external key parser
+        private static Key ParseKey(string key)
+        {
+            if (s_keySynonyms.TryGetValue(key.ToLower(), out Key rv))
+                return rv;
+
+            return EnumHelper.Parse<Key>(key, true);
+        }
+
+        private static KeyModifiers ParseModifier(ReadOnlySpan<char> modifier)
+        {
+            if (modifier.Equals("ctrl".AsSpan(), StringComparison.OrdinalIgnoreCase))
+            {
+                return KeyModifiers.Control;
+            }
+
+            if (modifier.Equals("cmd".AsSpan(), StringComparison.OrdinalIgnoreCase) ||
+                modifier.Equals("win".AsSpan(), StringComparison.OrdinalIgnoreCase) ||
+                modifier.Equals("⌘".AsSpan(), StringComparison.OrdinalIgnoreCase))
+            {
+                return KeyModifiers.Meta;
+            }
+
+            return EnumHelper.Parse<KeyModifiers>(modifier.ToString(), true);
+        }
+
+        private Key ResolveNumPadOperationKey(Key key)
+        {
+            switch (key)
+            {
+                case Key.Add:
+                    return Key.OemPlus;
+                case Key.Subtract:
+                    return Key.OemMinus;
+                case Key.Decimal:
+                    return Key.OemPeriod;
+                default:
+                    return key;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/KeyboardDevice.cs b/src/Avalonia.Base/Input/KeyboardDevice.cs
new file mode 100644
index 0000000000..0600b54618
--- /dev/null
+++ b/src/Avalonia.Base/Input/KeyboardDevice.cs
@@ -0,0 +1,249 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using Avalonia.Input.Raw;
+using Avalonia.Input.TextInput;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    public class KeyboardDevice : IKeyboardDevice, INotifyPropertyChanged
+    {
+        private IInputElement? _focusedElement;
+        private IInputRoot? _focusedRoot;
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        public static IKeyboardDevice? Instance => AvaloniaLocator.Current.GetService<IKeyboardDevice>();
+
+        public IInputManager? InputManager => AvaloniaLocator.Current.GetService<IInputManager>();
+
+        public IFocusManager? FocusManager => AvaloniaLocator.Current.GetService<IFocusManager>();
+        
+        // This should live in the FocusManager, but with the current outdated architecture
+        // the source of truth about the input focus is in KeyboardDevice
+        private readonly TextInputMethodManager _textInputManager = new TextInputMethodManager();
+
+        public IInputElement? FocusedElement => _focusedElement;
+
+        private void ClearFocusWithinAncestors(IInputElement? element)
+        {
+            var el = element;
+            
+            while (el != null)
+            {
+                if (el is InputElement ie)
+                {
+                    ie.IsKeyboardFocusWithin = false;
+                }
+
+                el = (IInputElement?)el.VisualParent;
+            }
+        }
+        
+        private void ClearFocusWithin(IInputElement element, bool clearRoot)
+        {
+            foreach (var visual in element.VisualChildren)
+            {
+                if (visual is IInputElement el && el.IsKeyboardFocusWithin)
+                {
+                    ClearFocusWithin(el, true);
+                    break;
+                }
+            }
+            
+            if (clearRoot)
+            {
+                if (element is InputElement ie)
+                {
+                    ie.IsKeyboardFocusWithin = false;
+                }
+            }
+        }
+
+        private void SetIsFocusWithin(IInputElement? oldElement, IInputElement? newElement)
+        {
+            if (newElement == null && oldElement != null)
+            {
+                ClearFocusWithinAncestors(oldElement);
+                return;
+            }
+            
+            IInputElement? branch = null;
+
+            var el = newElement;
+
+            while (el != null)
+            {
+                if (el.IsKeyboardFocusWithin)
+                {
+                    branch = el;
+                    break;
+                }
+
+                el = el.VisualParent as IInputElement;
+            }
+
+            el = oldElement;
+
+            if (el != null && branch != null)
+            {
+                ClearFocusWithin(branch, false);
+            }
+
+            el = newElement;
+            
+            while (el != null && el != branch)
+            {
+                if (el is InputElement ie)
+                {
+                    ie.IsKeyboardFocusWithin = true;
+                }
+
+                el = el.VisualParent as IInputElement;
+            }
+        }
+        
+        private void ClearChildrenFocusWithin(IInputElement element, bool clearRoot)
+        {
+            foreach (var visual in element.VisualChildren)
+            {
+                if (visual is IInputElement el && el.IsKeyboardFocusWithin)
+                {
+                    ClearChildrenFocusWithin(el, true);
+                    break;
+                }
+            }
+            
+            if (clearRoot && element is InputElement ie)
+            {
+                ie.IsKeyboardFocusWithin = false;
+            }
+        }
+
+        public void SetFocusedElement(
+            IInputElement? element, 
+            NavigationMethod method,
+            KeyModifiers keyModifiers)
+        {
+            if (element != FocusedElement)
+            {
+                var interactive = FocusedElement as IInteractive;
+
+                if (FocusedElement != null && 
+                    (!FocusedElement.IsAttachedToVisualTree ||
+                     _focusedRoot != element?.VisualRoot as IInputRoot) &&
+                    _focusedRoot != null)
+                {
+                    ClearChildrenFocusWithin(_focusedRoot, true);
+                }
+                
+                SetIsFocusWithin(FocusedElement, element);
+                _focusedElement = element;
+                _focusedRoot = _focusedElement?.VisualRoot as IInputRoot;
+
+                interactive?.RaiseEvent(new RoutedEventArgs
+                {
+                    RoutedEvent = InputElement.LostFocusEvent,
+                });
+
+                interactive = element as IInteractive;
+
+                interactive?.RaiseEvent(new GotFocusEventArgs
+                {
+                    RoutedEvent = InputElement.GotFocusEvent,
+                    NavigationMethod = method,
+                    KeyModifiers = keyModifiers,
+                });
+
+                _textInputManager.SetFocusedElement(element);
+                RaisePropertyChanged(nameof(FocusedElement));
+            }
+        }
+
+        protected void RaisePropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        public void ProcessRawEvent(RawInputEventArgs e)
+        {
+            if(e.Handled)
+                return;
+
+            var element = FocusedElement ?? e.Root;
+
+            if (e is RawKeyEventArgs keyInput)
+            {
+                switch (keyInput.Type)
+                {
+                    case RawKeyEventType.KeyDown:
+                    case RawKeyEventType.KeyUp:
+                        var routedEvent = keyInput.Type == RawKeyEventType.KeyDown
+                            ? InputElement.KeyDownEvent
+                            : InputElement.KeyUpEvent;
+
+                        KeyEventArgs ev = new KeyEventArgs
+                        {
+                            RoutedEvent = routedEvent,
+                            Device = this,
+                            Key = keyInput.Key,
+                            KeyModifiers = keyInput.Modifiers.ToKeyModifiers(),
+                            Source = element,
+                        };
+
+                        IVisual? currentHandler = element;
+                        while (currentHandler != null && !ev.Handled && keyInput.Type == RawKeyEventType.KeyDown)
+                        {
+                            var bindings = (currentHandler as IInputElement)?.KeyBindings;
+                            if (bindings != null)
+                            {
+                                KeyBinding[]? bindingsCopy = null;
+
+                                // Create a copy of the KeyBindings list if there's a binding which matches the event.
+                                // If we don't do this the foreach loop will throw an InvalidOperationException when the KeyBindings list is changed.
+                                // This can happen when a new view is loaded which adds its own KeyBindings to the handler.
+                                foreach (var binding in bindings)
+                                {
+                                    if (binding.Gesture?.Matches(ev) == true)
+                                    {
+                                        bindingsCopy = bindings.ToArray();
+                                        break;
+                                    }
+                                }
+
+                                if (bindingsCopy is object)
+                                {
+                                    foreach (var binding in bindingsCopy)
+                                    {
+                                        if (ev.Handled)
+                                            break;
+                                        binding.TryHandle(ev);
+                                    }
+                                }
+                            }
+                            currentHandler = currentHandler.VisualParent;
+                        }
+
+                        element.RaiseEvent(ev);
+                        e.Handled = ev.Handled;
+                        break;
+                }
+            }
+
+            if (e is RawTextInputEventArgs text)
+            {
+                var ev = new TextInputEventArgs()
+                {
+                    Device = this,
+                    Text = text.Text,
+                    Source = element,
+                    RoutedEvent = InputElement.TextInputEvent
+                };
+
+                element.RaiseEvent(ev);
+                e.Handled = ev.Handled;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/KeyboardNavigation.cs b/src/Avalonia.Base/Input/KeyboardNavigation.cs
new file mode 100644
index 0000000000..042a9adf5f
--- /dev/null
+++ b/src/Avalonia.Base/Input/KeyboardNavigation.cs
@@ -0,0 +1,134 @@
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Defines attached properties that control keyboard navigation behaviour for a container.
+    /// </summary>
+    public static class KeyboardNavigation
+    {
+        /// <summary>
+        /// Defines the TabIndex attached property.
+        /// </summary>
+        public static readonly AttachedProperty<int> TabIndexProperty =
+            AvaloniaProperty.RegisterAttached<StyledElement, int>(
+                "TabIndex",
+                typeof(KeyboardNavigation),
+                int.MaxValue);
+
+        /// <summary>
+        /// Defines the TabNavigation attached property.
+        /// </summary>
+        /// <remarks>
+        /// The TabNavigation attached property defines how pressing the Tab key causes focus to
+        /// be navigated between the children of the container.
+        /// </remarks>
+        public static readonly AttachedProperty<KeyboardNavigationMode> TabNavigationProperty =
+            AvaloniaProperty.RegisterAttached<InputElement, KeyboardNavigationMode>(
+                "TabNavigation",
+                typeof(KeyboardNavigation));
+
+        /// <summary>
+        /// Defines the TabOnceActiveElement attached property.
+        /// </summary>
+        /// <remarks>
+        /// When focus enters a container which has its <see cref="TabNavigationProperty"/>
+        /// attached property set to <see cref="KeyboardNavigationMode.Once"/>, this property
+        /// defines to which child the focus should move.
+        /// </remarks>
+        public static readonly AttachedProperty<IInputElement?> TabOnceActiveElementProperty =
+            AvaloniaProperty.RegisterAttached<InputElement, IInputElement?>(
+                "TabOnceActiveElement",
+                typeof(KeyboardNavigation));
+
+        /// <summary>
+        /// Defines the IsTabStop attached property.
+        /// </summary>
+        /// <remarks>
+        /// The IsTabStop attached property determines whether the control is focusable by tab navigation. 
+        /// </remarks>
+        public static readonly AttachedProperty<bool> IsTabStopProperty =
+            AvaloniaProperty.RegisterAttached<InputElement, bool>(
+                "IsTabStop",
+                typeof(KeyboardNavigation), 
+                true);
+
+        /// <summary>
+        /// Gets the <see cref="TabIndexProperty"/> for an element.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <returns>The <see cref="KeyboardNavigationMode"/> for the container.</returns>
+        public static int GetTabIndex(IInputElement element)
+        {
+            return ((AvaloniaObject)element).GetValue(TabIndexProperty);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="TabIndexProperty"/> for an element.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <param name="value">The tab index.</param>
+        public static void SetTabIndex(IInputElement element, int value)
+        {
+            ((IAvaloniaObject)element).SetValue(TabIndexProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="TabNavigationProperty"/> for a container.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <returns>The <see cref="KeyboardNavigationMode"/> for the container.</returns>
+        public static KeyboardNavigationMode GetTabNavigation(InputElement element)
+        {
+            return element.GetValue(TabNavigationProperty);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="TabNavigationProperty"/> for a container.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <param name="value">The <see cref="KeyboardNavigationMode"/> for the container.</param>
+        public static void SetTabNavigation(InputElement element, KeyboardNavigationMode value)
+        {
+            element.SetValue(TabNavigationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="TabOnceActiveElementProperty"/> for a container.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <returns>The active element for the container.</returns>
+        public static IInputElement? GetTabOnceActiveElement(InputElement element)
+        {
+            return element.GetValue(TabOnceActiveElementProperty);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="TabOnceActiveElementProperty"/> for a container.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <param name="value">The active element for the container.</param>
+        public static void SetTabOnceActiveElement(InputElement element, IInputElement? value)
+        {
+            element.SetValue(TabOnceActiveElementProperty, value);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="IsTabStopProperty"/> for an element.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <param name="value">Value indicating whether the container is a tab stop.</param>
+        public static void SetIsTabStop(InputElement element, bool value)
+        {
+            element.SetValue(IsTabStopProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IsTabStopProperty"/> for an element.
+        /// </summary>
+        /// <param name="element">The container.</param>
+        /// <returns>Whether the container is a tab stop.</returns>
+        public static bool GetIsTabStop(InputElement element)
+        {
+            return element.GetValue(IsTabStopProperty);
+        }
+    }
+}
diff --git a/src/Avalonia.Input/KeyboardNavigationHandler.cs b/src/Avalonia.Base/Input/KeyboardNavigationHandler.cs
similarity index 100%
rename from src/Avalonia.Input/KeyboardNavigationHandler.cs
rename to src/Avalonia.Base/Input/KeyboardNavigationHandler.cs
diff --git a/src/Avalonia.Input/KeyboardNavigationMode.cs b/src/Avalonia.Base/Input/KeyboardNavigationMode.cs
similarity index 100%
rename from src/Avalonia.Input/KeyboardNavigationMode.cs
rename to src/Avalonia.Base/Input/KeyboardNavigationMode.cs
diff --git a/src/Avalonia.Base/Input/MouseDevice.cs b/src/Avalonia.Base/Input/MouseDevice.cs
new file mode 100644
index 0000000000..5f8ab24b79
--- /dev/null
+++ b/src/Avalonia.Base/Input/MouseDevice.cs
@@ -0,0 +1,345 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using Avalonia.Input.Raw;
+using Avalonia.Interactivity;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Represents a mouse device.
+    /// </summary>
+    public class MouseDevice : IMouseDevice, IDisposable
+    {
+        private int _clickCount;
+        private Rect _lastClickRect;
+        private ulong _lastClickTime;
+
+        private readonly Pointer _pointer;
+        private bool _disposed;
+        private PixelPoint? _position;
+        private MouseButton _lastMouseDownButton;
+
+        public MouseDevice(Pointer? pointer = null)
+        {
+            _pointer = pointer ?? new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
+        }
+
+        [Obsolete("Use IPointer instead")]
+        public IInputElement? Captured => _pointer.Captured;
+
+        [Obsolete("Use events instead")]
+        public PixelPoint Position
+        {
+            get => _position ?? new PixelPoint(-1, -1);
+            protected set => _position = value;
+        }
+
+        [Obsolete("Use IPointer instead")]
+        public void Capture(IInputElement? control)
+        {
+            _pointer.Capture(control);
+        }
+
+        /// <summary>
+        /// Gets the mouse position relative to a control.
+        /// </summary>
+        /// <param name="relativeTo">The control.</param>
+        /// <returns>The mouse position in the control's coordinates.</returns>
+        public Point GetPosition(IVisual relativeTo)
+        {
+            relativeTo = relativeTo ?? throw new ArgumentNullException(nameof(relativeTo));
+
+            if (relativeTo.VisualRoot == null)
+            {
+                throw new InvalidOperationException("Control is not attached to visual tree.");
+            }
+
+#pragma warning disable CS0618 // Type or member is obsolete
+            var rootPoint = relativeTo.VisualRoot.PointToClient(Position);
+#pragma warning restore CS0618 // Type or member is obsolete
+            var transform = relativeTo.VisualRoot.TransformToVisual(relativeTo);
+            return rootPoint * transform!.Value;
+        }
+
+        public void ProcessRawEvent(RawInputEventArgs e)
+        {
+            if (!e.Handled && e is RawPointerEventArgs margs)
+                ProcessRawEvent(margs);
+        }
+
+        int ButtonCount(PointerPointProperties props)
+        {
+            var rv = 0;
+            if (props.IsLeftButtonPressed)
+                rv++;
+            if (props.IsMiddleButtonPressed)
+                rv++;
+            if (props.IsRightButtonPressed)
+                rv++;
+            if (props.IsXButton1Pressed)
+                rv++;
+            if (props.IsXButton2Pressed)
+                rv++;
+            return rv;
+        }
+
+        private void ProcessRawEvent(RawPointerEventArgs e)
+        {
+            e = e ?? throw new ArgumentNullException(nameof(e));
+
+            var mouse = (MouseDevice)e.Device;
+            if(mouse._disposed)
+                return;
+
+            _position = e.Root.PointToScreen(e.Position);
+            var props = CreateProperties(e);
+            var keyModifiers = e.InputModifiers.ToKeyModifiers();
+            switch (e.Type)
+            {
+                case RawPointerEventType.LeaveWindow:
+                case RawPointerEventType.NonClientLeftButtonDown:
+                    LeaveWindow();
+                    break;
+                case RawPointerEventType.LeftButtonDown:
+                case RawPointerEventType.RightButtonDown:
+                case RawPointerEventType.MiddleButtonDown:
+                case RawPointerEventType.XButton1Down:
+                case RawPointerEventType.XButton2Down:
+                    if (ButtonCount(props) > 1)
+                        e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints, e.InputHitTestResult);
+                    else
+                        e.Handled = MouseDown(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.LeftButtonUp:
+                case RawPointerEventType.RightButtonUp:
+                case RawPointerEventType.MiddleButtonUp:
+                case RawPointerEventType.XButton1Up:
+                case RawPointerEventType.XButton2Up:
+                    if (ButtonCount(props) != 0)
+                        e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints, e.InputHitTestResult);
+                    else
+                        e.Handled = MouseUp(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.Move:
+                    e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.Wheel:
+                    e.Handled = MouseWheel(mouse, e.Timestamp, e.Root, e.Position, props, ((RawMouseWheelEventArgs)e).Delta, keyModifiers, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.Magnify:
+                    e.Handled = GestureMagnify(mouse, e.Timestamp, e.Root, e.Position, props, ((RawPointerGestureEventArgs)e).Delta, keyModifiers, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.Rotate:
+                    e.Handled = GestureRotate(mouse, e.Timestamp, e.Root, e.Position, props, ((RawPointerGestureEventArgs)e).Delta, keyModifiers, e.InputHitTestResult);
+                    break;
+                case RawPointerEventType.Swipe:
+                    e.Handled = GestureSwipe(mouse, e.Timestamp, e.Root, e.Position, props, ((RawPointerGestureEventArgs)e).Delta, keyModifiers, e.InputHitTestResult);
+                    break;
+            }
+        }
+
+        private void LeaveWindow()
+        {
+            _position = null;
+        }
+
+        PointerPointProperties CreateProperties(RawPointerEventArgs args)
+        {
+            return new PointerPointProperties(args.InputModifiers, args.Type.ToUpdateKind());
+        }
+
+        private bool MouseDown(IMouseDevice device, ulong timestamp, IInputElement root, Point p,
+            PointerPointProperties properties,
+            KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? root.InputHitTest(p);
+
+            if (source != null)
+            {
+                _pointer.Capture(source);
+                if (source != null)
+                {
+                    var settings = AvaloniaLocator.Current.GetService<IPlatformSettings>();
+                    var doubleClickTime = settings?.DoubleClickTime.TotalMilliseconds ?? 500;
+                    var doubleClickSize = settings?.DoubleClickSize ?? new Size(4, 4);
+
+                    if (!_lastClickRect.Contains(p) || timestamp - _lastClickTime > doubleClickTime)
+                    {
+                        _clickCount = 0;
+                    }
+
+                    ++_clickCount;
+                    _lastClickTime = timestamp;
+                    _lastClickRect = new Rect(p, new Size())
+                        .Inflate(new Thickness(doubleClickSize.Width / 2, doubleClickSize.Height / 2));
+                    _lastMouseDownButton = properties.PointerUpdateKind.GetMouseButton();
+                    var e = new PointerPressedEventArgs(source, _pointer, root, p, timestamp, properties, inputModifiers, _clickCount);
+                    source.RaiseEvent(e);
+                    return e.Handled;
+                }
+            }
+
+            return false;
+        }
+
+        private bool MouseMove(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
+            PointerPointProperties properties, KeyModifiers inputModifiers, Lazy<IReadOnlyList<RawPointerPoint>?>? intermediatePoints,
+            IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? hitTest;
+
+            if (source is object)
+            {
+                var e = new PointerEventArgs(InputElement.PointerMovedEvent, source, _pointer, root,
+                    p, timestamp, properties, inputModifiers, intermediatePoints);
+
+                source.RaiseEvent(e);
+                return e.Handled;
+            }
+
+            return false;
+        }
+
+        private bool MouseUp(IMouseDevice device, ulong timestamp, IInputRoot root, Point p, PointerPointProperties props,
+            KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? hitTest;
+
+            if (source is not null)
+            {
+                var e = new PointerReleasedEventArgs(source, _pointer, root, p, timestamp, props, inputModifiers,
+                    _lastMouseDownButton);
+
+                source?.RaiseEvent(e);
+                _pointer.Capture(null);
+                return e.Handled;
+            }
+
+            return false;
+        }
+
+        private bool MouseWheel(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
+            PointerPointProperties props,
+            Vector delta, KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? hitTest;
+
+            // KeyModifiers.Shift should scroll in horizontal direction. This does not work on every platform. 
+            // If Shift-Key is pressed and X is close to 0 we swap the Vector.
+            if (inputModifiers == KeyModifiers.Shift && MathUtilities.IsZero(delta.X))
+            {
+                delta = new Vector(delta.Y, delta.X);
+            }
+
+            if (source is not null)
+            {
+                var e = new PointerWheelEventArgs(source, _pointer, root, p, timestamp, props, inputModifiers, delta);
+
+                source?.RaiseEvent(e);
+                return e.Handled;
+            }
+
+            return false;
+        }
+        
+        private bool GestureMagnify(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
+            PointerPointProperties props, Vector delta, KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? hitTest;
+
+            if (source != null)
+            {
+                var e = new PointerDeltaEventArgs(Gestures.PointerTouchPadGestureMagnifyEvent, source,
+                    _pointer, root, p, timestamp, props, inputModifiers, delta);
+
+                source?.RaiseEvent(e);
+                return e.Handled;
+            }
+
+            return false;
+        }
+        
+        private bool GestureRotate(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
+            PointerPointProperties props, Vector delta, KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? hitTest;
+
+            if (source != null)
+            {
+                var e = new PointerDeltaEventArgs(Gestures.PointerTouchPadGestureRotateEvent, source,
+                    _pointer, root, p, timestamp, props, inputModifiers, delta);
+
+                source?.RaiseEvent(e);
+                return e.Handled;
+            }
+
+            return false;
+        }
+        
+        private bool GestureSwipe(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
+            PointerPointProperties props, Vector delta, KeyModifiers inputModifiers, IInputElement? hitTest)
+        {
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
+
+            var source = _pointer.Captured ?? hitTest;
+
+            if (source != null)
+            {
+                var e = new PointerDeltaEventArgs(Gestures.PointerTouchPadGestureSwipeEvent, source, 
+                    _pointer, root, p, timestamp, props, inputModifiers, delta);
+
+                source?.RaiseEvent(e);
+                return e.Handled;
+            }
+
+            return false;
+        }
+
+        public void Dispose()
+        {
+            _disposed = true;
+            _pointer?.Dispose();
+        }
+
+        [Obsolete]
+        public void TopLevelClosed(IInputRoot root)
+        {
+            // no-op
+        }
+
+        [Obsolete]
+        public void SceneInvalidated(IInputRoot root, Rect rect)
+        {
+            // no-op
+        }
+
+        public IPointer? TryGetPointer(RawPointerEventArgs ev)
+        {
+            return _pointer;
+        }
+    }
+}
diff --git a/src/Avalonia.Input/Navigation/FocusExtensions.cs b/src/Avalonia.Base/Input/Navigation/FocusExtensions.cs
similarity index 100%
rename from src/Avalonia.Input/Navigation/FocusExtensions.cs
rename to src/Avalonia.Base/Input/Navigation/FocusExtensions.cs
diff --git a/src/Avalonia.Base/Input/Navigation/TabNavigation.cs b/src/Avalonia.Base/Input/Navigation/TabNavigation.cs
new file mode 100644
index 0000000000..cfd45f8262
--- /dev/null
+++ b/src/Avalonia.Base/Input/Navigation/TabNavigation.cs
@@ -0,0 +1,674 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input.Navigation
+{
+    /// <summary>
+    /// The implementation for default tab navigation.
+    /// </summary>
+    internal static class TabNavigation
+    {
+        public static IInputElement? GetNextTab(IInputElement e, bool goDownOnly)
+        {
+            return GetNextTab(e, GetGroupParent(e), goDownOnly);
+        }
+
+        public static IInputElement? GetNextTab(IInputElement? e, IInputElement container, bool goDownOnly)
+        {
+            var tabbingType = GetKeyNavigationMode(container);
+
+            if (e == null)
+            {
+                if (IsTabStop(container))
+                    return container;
+
+                // Using ActiveElement if set
+                var activeElement = GetActiveElement(container);
+                if (activeElement != null)
+                    return GetNextTab(null, activeElement, true);
+            }
+            else
+            {
+                if (tabbingType == KeyboardNavigationMode.Once || tabbingType == KeyboardNavigationMode.None)
+                {
+                    if (container != e)
+                    {
+                        if (goDownOnly)
+                            return null;
+                        var parentContainer = GetGroupParent(container);
+                        return GetNextTab(container, parentContainer, goDownOnly);
+                    }
+                }
+            }
+
+            // All groups
+            IInputElement? loopStartElement = null;
+            var nextTabElement = e;
+            var currentTabbingType = tabbingType;
+
+            // Search down inside the container
+            while ((nextTabElement = GetNextTabInGroup(nextTabElement, container, currentTabbingType)) != null)
+            {
+                // Avoid the endless loop here for Cycle groups
+                if (loopStartElement == nextTabElement)
+                    break;
+                if (loopStartElement == null)
+                    loopStartElement = nextTabElement;
+
+                var firstTabElementInside = GetNextTab(null, nextTabElement, true);
+                if (firstTabElementInside != null)
+                    return firstTabElementInside;
+
+                // If we want to continue searching inside the Once groups, we should change the navigation mode
+                if (currentTabbingType == KeyboardNavigationMode.Once)
+                    currentTabbingType = KeyboardNavigationMode.Contained;
+            }
+
+            // If there is no next element in the group (nextTabElement == null)
+
+            // Search up in the tree if allowed
+            // consider: Use original tabbingType instead of currentTabbingType
+            if (!goDownOnly && currentTabbingType != KeyboardNavigationMode.Contained && GetParent(container) != null)
+            {
+                return GetNextTab(container, GetGroupParent(container), false);
+            }
+
+            return null;
+        }
+
+        public static IInputElement? GetNextTabOutside(ICustomKeyboardNavigation e)
+        {
+            if (e is IInputElement container)
+            {
+                var last = GetLastInTree(container);
+
+                if (last is object)
+                    return GetNextTab(last, false);
+            }
+
+            return null;
+        }
+
+        public static IInputElement? GetPrevTab(IInputElement? e, IInputElement? container, bool goDownOnly)
+        {
+            if (e is null && container is null)
+                throw new InvalidOperationException("Either 'e' or 'container' must be non-null.");
+
+            if (container is null)
+                container = GetGroupParent(e!);
+
+            KeyboardNavigationMode tabbingType = GetKeyNavigationMode(container);
+
+            if (e == null)
+            {
+                // Using ActiveElement if set
+                var activeElement = GetActiveElement(container);
+                if (activeElement != null)
+                    return GetPrevTab(null, activeElement, true);
+                else
+                {
+                    // If we Shift+Tab on a container with KeyboardNavigationMode=Once, and ActiveElement is null
+                    // then we want to go to the first item (not last) within the container
+                    if (tabbingType == KeyboardNavigationMode.Once)
+                    {
+                        var firstTabElement = GetNextTabInGroup(null, container, tabbingType);
+                        if (firstTabElement == null)
+                        {
+                            if (IsTabStop(container))
+                                return container;
+                            if (goDownOnly)
+                                return null;
+
+                            return GetPrevTab(container, null, false);
+                        }
+                        else
+                        {
+                            return GetPrevTab(null, firstTabElement, true);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                if (tabbingType == KeyboardNavigationMode.Once || tabbingType == KeyboardNavigationMode.None)
+                {
+                    if (goDownOnly || container == e)
+                        return null;
+
+                    // FocusedElement should not be e otherwise we will delegate focus to the same element
+                    if (IsTabStop(container))
+                        return container;
+
+                    return GetPrevTab(container, null, false);
+                }
+            }
+
+            // All groups (except Once) - continue
+            IInputElement? loopStartElement = null;
+            IInputElement? nextTabElement = e;
+
+            // Look for element with the same TabIndex before the current element
+            while ((nextTabElement = GetPrevTabInGroup(nextTabElement, container, tabbingType)) != null)
+            {
+                if (nextTabElement == container && tabbingType == KeyboardNavigationMode.Local)
+                    break;
+
+                // At this point nextTabElement is TabStop or TabGroup
+                // In case it is a TabStop only return the element
+                if (IsTabStop(nextTabElement) && !IsGroup(nextTabElement))
+                    return nextTabElement;
+
+                // Avoid the endless loop here
+                if (loopStartElement == nextTabElement)
+                    break;
+                if (loopStartElement == null)
+                    loopStartElement = nextTabElement;
+
+                // At this point nextTabElement is TabGroup
+                var lastTabElementInside = GetPrevTab(null, nextTabElement, true);
+                if (lastTabElementInside != null)
+                    return lastTabElementInside;
+            }
+
+            if (tabbingType == KeyboardNavigationMode.Contained)
+                return null;
+
+            if (e != container && IsTabStop(container))
+                return container;
+
+            // If end of the subtree is reached or there no other elements above
+            if (!goDownOnly && GetParent(container) != null)
+            {
+                return GetPrevTab(container, null, false);
+            }
+
+            return null;
+        }
+
+        public static IInputElement? GetPrevTabOutside(ICustomKeyboardNavigation e)
+        {
+            if (e is IInputElement container)
+            {
+                var first = GetFirstChild(container);
+
+                if (first is object)
+                    return GetPrevTab(first, null, false);
+            }
+
+            return null;
+        }
+
+        private static IInputElement? FocusedElement(IInputElement e)
+        {
+            var iie = e;
+            // Focus delegation is enabled only if keyboard focus is outside the container
+            if (iie != null && !iie.IsKeyboardFocusWithin)
+            {
+                var focusedElement = (FocusManager.Instance as FocusManager)?.GetFocusedElement(e);
+                if (focusedElement != null)
+                {
+                    if (!IsFocusScope(e))
+                    {
+                        // Verify if focusedElement is a visual descendant of e
+                        if (focusedElement is IVisual visualFocusedElement &&
+                            visualFocusedElement != e &&
+                            e.IsVisualAncestorOf(visualFocusedElement))
+                        {
+                            return focusedElement;
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private static IInputElement? GetFirstChild(IInputElement e)
+        {
+            // If the element has a FocusedElement it should be its first child
+            if (FocusedElement(e) is IInputElement focusedElement)
+                return focusedElement;
+
+            // Return the first visible element.
+            var uiElement = e as InputElement;
+
+            if (uiElement is null || IsVisibleAndEnabled(uiElement))
+            {
+                if (e is IVisual elementAsVisual)
+                {
+                    var children = elementAsVisual.VisualChildren;
+                    var count = children.Count;
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        if (children[i] is InputElement ie)
+                        {
+                            if (IsVisibleAndEnabled(ie))
+                                return ie;
+                            else
+                            {
+                                var firstChild = GetFirstChild(ie);
+                                if (firstChild != null)
+                                    return firstChild;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private static IInputElement? GetLastChild(IInputElement e)
+        {
+            // If the element has a FocusedElement it should be its last child
+            if (FocusedElement(e) is IInputElement focusedElement)
+                return focusedElement;
+
+            // Return the last visible element.
+            var uiElement = e as InputElement;
+
+            if (uiElement == null || IsVisibleAndEnabled(uiElement))
+            {
+                var elementAsVisual = e as IVisual;
+
+                if (elementAsVisual != null)
+                {
+                    var children = elementAsVisual.VisualChildren;
+                    var count = children.Count;
+
+                    for (int i = count - 1; i >= 0; i--)
+                    {
+                        if (children[i] is InputElement ie)
+                        {
+                            if (IsVisibleAndEnabled(ie))
+                                return ie;
+                            else
+                            {
+                                var lastChild = GetLastChild(ie);
+                                if (lastChild != null)
+                                    return lastChild;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private static IInputElement? GetFirstTabInGroup(IInputElement container)
+        {
+            IInputElement? firstTabElement = null;
+            int minIndexFirstTab = int.MinValue;
+
+            var currElement = container;
+            while ((currElement = GetNextInTree(currElement, container)) != null)
+            {
+                if (IsTabStopOrGroup(currElement))
+                {
+                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
+
+                    if (currPriority < minIndexFirstTab || firstTabElement == null)
+                    {
+                        minIndexFirstTab = currPriority;
+                        firstTabElement = currElement;
+                    }
+                }
+            }
+            return firstTabElement;
+        }
+
+        private static IInputElement? GetLastInTree(IInputElement container)
+        {
+            IInputElement? result;
+            IInputElement? c = container;
+
+            do
+            {
+                result = c;
+                c = GetLastChild(c);
+            } while (c != null && !IsGroup(c));
+
+            if (c != null)
+                return c;
+
+            return result;
+        }
+
+        private static IInputElement? GetLastTabInGroup(IInputElement container)
+        {
+            IInputElement? lastTabElement = null;
+            int maxIndexFirstTab = int.MaxValue;
+            var currElement = GetLastInTree(container);
+            while (currElement != null && currElement != container)
+            {
+                if (IsTabStopOrGroup(currElement))
+                {
+                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
+
+                    if (currPriority > maxIndexFirstTab || lastTabElement == null)
+                    {
+                        maxIndexFirstTab = currPriority;
+                        lastTabElement = currElement;
+                    }
+                }
+                currElement = GetPreviousInTree(currElement, container);
+            }
+            return lastTabElement;
+        }
+
+        private static IInputElement? GetNextInTree(IInputElement e, IInputElement container)
+        {
+            IInputElement? result = null;
+
+            if (e == container || !IsGroup(e))
+                result = GetFirstChild(e);
+
+            if (result != null || e == container)
+                return result;
+
+            IInputElement? parent = e;
+            do
+            {
+                var sibling = GetNextSibling(parent);
+                if (sibling != null)
+                    return sibling;
+
+                parent = GetParent(parent);
+            } while (parent != null && parent != container);
+
+            return null;
+        }
+
+        private static IInputElement? GetNextSibling(IInputElement e)
+        {
+            if (GetParent(e) is IVisual parentAsVisual && e is IVisual elementAsVisual)
+            {
+                var children = parentAsVisual.VisualChildren;
+                var count = children.Count;
+                var i = 0;
+
+                //go till itself
+                for (; i < count; i++)
+                {
+                    var vchild = children[i];
+                    if (vchild == elementAsVisual)
+                        break;
+                }
+                i++;
+                //search ahead
+                for (; i < count; i++)
+                {
+                    var visual = children[i];
+                    if (visual is IInputElement ie)
+                        return ie;
+                }
+            }
+
+            return null;
+        }
+
+        private static IInputElement? GetNextTabInGroup(IInputElement? e, IInputElement container, KeyboardNavigationMode tabbingType)
+        {
+            // None groups: Tab navigation is not supported
+            if (tabbingType == KeyboardNavigationMode.None)
+                return null;
+
+            // e == null or e == container -> return the first TabStopOrGroup
+            if (e == null || e == container)
+            {
+                return GetFirstTabInGroup(container);
+            }
+
+            if (tabbingType == KeyboardNavigationMode.Once)
+                return null;
+
+            var nextTabElement = GetNextTabWithSameIndex(e, container);
+            if (nextTabElement != null)
+                return nextTabElement;
+
+            return GetNextTabWithNextIndex(e, container, tabbingType);
+        }
+
+        private static IInputElement? GetNextTabWithSameIndex(IInputElement e, IInputElement container)
+        {
+            var elementTabPriority = KeyboardNavigation.GetTabIndex(e);
+            var currElement = e;
+            while ((currElement = GetNextInTree(currElement, container)) != null)
+            {
+                if (IsTabStopOrGroup(currElement) && KeyboardNavigation.GetTabIndex(currElement) == elementTabPriority)
+                {
+                    return currElement;
+                }
+            }
+
+            return null;
+        }
+
+        private static IInputElement? GetNextTabWithNextIndex(IInputElement e, IInputElement container, KeyboardNavigationMode tabbingType)
+        {
+            // Find the next min index in the tree
+            // min (index>currentTabIndex)
+            IInputElement? nextTabElement = null;
+            IInputElement? firstTabElement = null;
+            int minIndexFirstTab = int.MinValue;
+            int minIndex = int.MinValue;
+            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
+
+            IInputElement? currElement = container;
+            while ((currElement = GetNextInTree(currElement, container)) != null)
+            {
+                if (IsTabStopOrGroup(currElement))
+                {
+                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
+                    if (currPriority > elementTabPriority)
+                    {
+                        if (currPriority < minIndex || nextTabElement == null)
+                        {
+                            minIndex = currPriority;
+                            nextTabElement = currElement;
+                        }
+                    }
+
+                    if (currPriority < minIndexFirstTab || firstTabElement == null)
+                    {
+                        minIndexFirstTab = currPriority;
+                        firstTabElement = currElement;
+                    }
+                }
+            }
+
+            // Cycle groups: if not found - return first element
+            if (tabbingType == KeyboardNavigationMode.Cycle && nextTabElement == null)
+                nextTabElement = firstTabElement;
+
+            return nextTabElement;
+        }
+
+        private static IInputElement? GetPrevTabInGroup(IInputElement? e, IInputElement container, KeyboardNavigationMode tabbingType)
+        {
+            // None groups: Tab navigation is not supported
+            if (tabbingType == KeyboardNavigationMode.None)
+                return null;
+
+            // Search the last index inside the group
+            if (e == null)
+            {
+                return GetLastTabInGroup(container);
+            }
+
+            if (tabbingType == KeyboardNavigationMode.Once)
+                return null;
+
+            if (e == container)
+                return null;
+
+            var nextTabElement = GetPrevTabWithSameIndex(e, container);
+            if (nextTabElement != null)
+                return nextTabElement;
+
+            return GetPrevTabWithPrevIndex(e, container, tabbingType);
+        }
+
+        private static IInputElement? GetPrevTabWithSameIndex(IInputElement e, IInputElement container)
+        {
+            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
+            var currElement = GetPreviousInTree(e, container);
+            while (currElement != null)
+            {
+                if (IsTabStopOrGroup(currElement) && KeyboardNavigation.GetTabIndex(currElement) == elementTabPriority && currElement != container)
+                {
+                    return currElement;
+                }
+                currElement = GetPreviousInTree(currElement, container);
+            }
+            return null;
+        }
+
+        private static IInputElement? GetPrevTabWithPrevIndex(IInputElement e, IInputElement container, KeyboardNavigationMode tabbingType)
+        {
+            // Find the next max index in the tree
+            // max (index<currentTabIndex)
+            IInputElement? lastTabElement = null;
+            IInputElement? nextTabElement = null;
+            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
+            int maxIndexFirstTab = Int32.MaxValue;
+            int maxIndex = Int32.MaxValue;
+            var currElement = GetLastInTree(container);
+            while (currElement != null)
+            {
+                if (IsTabStopOrGroup(currElement) && currElement != container)
+                {
+                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
+                    if (currPriority < elementTabPriority)
+                    {
+                        if (currPriority > maxIndex || nextTabElement == null)
+                        {
+                            maxIndex = currPriority;
+                            nextTabElement = currElement;
+                        }
+                    }
+
+                    if (currPriority > maxIndexFirstTab || lastTabElement == null)
+                    {
+                        maxIndexFirstTab = currPriority;
+                        lastTabElement = currElement;
+                    }
+                }
+
+                currElement = GetPreviousInTree(currElement, container);
+            }
+
+            // Cycle groups: if not found - return first element
+            if (tabbingType == KeyboardNavigationMode.Cycle && nextTabElement == null)
+                nextTabElement = lastTabElement;
+
+            return nextTabElement;
+        }
+
+        private static IInputElement? GetPreviousInTree(IInputElement e, IInputElement container)
+        {
+            if (e == container)
+                return null;
+
+            var result = GetPreviousSibling(e);
+
+            if (result != null)
+            {
+                if (IsGroup(result))
+                    return result;
+                else
+                    return GetLastInTree(result);
+            }
+            else
+                return GetParent(e);
+        }
+
+        private static IInputElement? GetPreviousSibling(IInputElement e)
+        {
+            if (GetParent(e) is IVisual parentAsVisual && e is IVisual elementAsVisual)
+            {
+                var children = parentAsVisual.VisualChildren;
+                var count = children.Count;
+                IInputElement? prev = null;
+                
+                for (int i = 0; i < count; i++)
+                {
+                    var vchild = children[i];
+                    if (vchild == elementAsVisual)
+                        break;
+                    if (vchild is IInputElement ie && IsVisibleAndEnabled(ie))
+                        prev = ie;
+                }
+                return prev;
+            }
+            return null;
+        }
+
+        private static IInputElement? GetActiveElement(IInputElement e)
+        {
+            return ((AvaloniaObject)e).GetValue(KeyboardNavigation.TabOnceActiveElementProperty);
+        }
+
+        private static IInputElement GetGroupParent(IInputElement e) => GetGroupParent(e, false);
+
+        private static IInputElement GetGroupParent(IInputElement element, bool includeCurrent)
+        {
+            var result = element; // Keep the last non null element
+            var e = element;
+
+            // If we don't want to include the current element,
+            // start at the parent of the element.  If the element
+            // is the root, then just return it as the group parent.
+            if (!includeCurrent)
+            {
+                result = e;
+                e = GetParent(e);
+                if (e == null)
+                    return result;
+            }
+
+            while (e != null)
+            {
+                if (IsGroup(e))
+                    return e;
+
+                result = e;
+                e = GetParent(e);
+            }
+
+            return result;
+        }
+
+        private static IInputElement? GetParent(IInputElement e)
+        {
+            // For Visual - go up the visual parent chain until we find Visual.
+            if (e is IVisual v)
+                return v.FindAncestorOfType<IInputElement>();
+
+            // This will need to be implemented when we have non-visual input elements.
+            throw new NotSupportedException();
+        }
+
+        private static KeyboardNavigationMode GetKeyNavigationMode(IInputElement e)
+        {
+            return ((AvaloniaObject)e).GetValue(KeyboardNavigation.TabNavigationProperty);
+        }
+
+        private static bool IsFocusScope(IInputElement e) => FocusManager.GetIsFocusScope(e) || GetParent(e) == null;
+        private static bool IsGroup(IInputElement e) => GetKeyNavigationMode(e) != KeyboardNavigationMode.Continue;
+
+        private static bool IsTabStop(IInputElement e)
+        {
+            if (e is InputElement ie)
+                return ie.Focusable && KeyboardNavigation.GetIsTabStop(ie) && ie.IsVisible && ie.IsEnabled;
+            return false;
+        }
+
+        private static bool IsTabStopOrGroup(IInputElement e) => IsTabStop(e) || IsGroup(e);
+        private static bool IsVisibleAndEnabled(IInputElement e) => e.IsVisible && e.IsEnabled;
+    }
+}
diff --git a/src/Avalonia.Input/NavigationDirection.cs b/src/Avalonia.Base/Input/NavigationDirection.cs
similarity index 100%
rename from src/Avalonia.Input/NavigationDirection.cs
rename to src/Avalonia.Base/Input/NavigationDirection.cs
diff --git a/src/Avalonia.Input/NavigationMethod.cs b/src/Avalonia.Base/Input/NavigationMethod.cs
similarity index 100%
rename from src/Avalonia.Input/NavigationMethod.cs
rename to src/Avalonia.Base/Input/NavigationMethod.cs
diff --git a/src/Avalonia.Base/Input/Platform/IClipboard.cs b/src/Avalonia.Base/Input/Platform/IClipboard.cs
new file mode 100644
index 0000000000..bf2a5a8602
--- /dev/null
+++ b/src/Avalonia.Base/Input/Platform/IClipboard.cs
@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input.Platform
+{
+    [NotClientImplementable]
+    public interface IClipboard
+    {
+        Task<string> GetTextAsync();
+
+        Task SetTextAsync(string text);
+
+        Task ClearAsync();
+
+        Task SetDataObjectAsync(IDataObject data);
+        
+        Task<string[]> GetFormatsAsync();
+        
+        Task<object> GetDataAsync(string format);
+    }
+}
diff --git a/src/Avalonia.Base/Input/Platform/IPlatformDragSource.cs b/src/Avalonia.Base/Input/Platform/IPlatformDragSource.cs
new file mode 100644
index 0000000000..8d1b93087e
--- /dev/null
+++ b/src/Avalonia.Base/Input/Platform/IPlatformDragSource.cs
@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input.Platform
+{
+    [Unstable]
+    public interface IPlatformDragSource
+    {
+        Task<DragDropEffects> DoDragDrop(PointerEventArgs triggerEvent, IDataObject data, DragDropEffects allowedEffects);
+    }
+}
diff --git a/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs b/src/Avalonia.Base/Input/Platform/PlatformHotkeyConfiguration.cs
similarity index 100%
rename from src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs
rename to src/Avalonia.Base/Input/Platform/PlatformHotkeyConfiguration.cs
diff --git a/src/Avalonia.Input/Pointer.cs b/src/Avalonia.Base/Input/Pointer.cs
similarity index 100%
rename from src/Avalonia.Input/Pointer.cs
rename to src/Avalonia.Base/Input/Pointer.cs
diff --git a/src/Avalonia.Input/PointerDeltaEventArgs.cs b/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/PointerDeltaEventArgs.cs
rename to src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
diff --git a/src/Avalonia.Base/Input/PointerEventArgs.cs b/src/Avalonia.Base/Input/PointerEventArgs.cs
new file mode 100644
index 0000000000..5495802920
--- /dev/null
+++ b/src/Avalonia.Base/Input/PointerEventArgs.cs
@@ -0,0 +1,212 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Input.Raw;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    public class PointerEventArgs : RoutedEventArgs
+    {
+        private readonly IVisual? _rootVisual;
+        private readonly Point _rootVisualPosition;
+        private readonly PointerPointProperties _properties;
+        private Lazy<IReadOnlyList<RawPointerPoint>?>? _previousPoints;
+
+        public PointerEventArgs(RoutedEvent routedEvent,
+            IInteractive? source,
+            IPointer pointer,
+            IVisual? rootVisual, Point rootVisualPosition,
+            ulong timestamp,
+            PointerPointProperties properties,
+            KeyModifiers modifiers)
+           : base(routedEvent)
+        {
+            Source = source;
+            _rootVisual = rootVisual;
+            _rootVisualPosition = rootVisualPosition;
+            _properties = properties;
+            Pointer = pointer;
+            Timestamp = timestamp;
+            KeyModifiers = modifiers;
+        }
+        
+        public PointerEventArgs(RoutedEvent routedEvent,
+            IInteractive? source,
+            IPointer pointer,
+            IVisual? rootVisual, Point rootVisualPosition,
+            ulong timestamp,
+            PointerPointProperties properties,
+            KeyModifiers modifiers,
+            Lazy<IReadOnlyList<RawPointerPoint>?>? previousPoints)
+            : this(routedEvent, source, pointer, rootVisual, rootVisualPosition, timestamp, properties, modifiers)
+        {
+            _previousPoints = previousPoints;
+        }
+        
+
+        class EmulatedDevice : IPointerDevice
+        {
+            private readonly PointerEventArgs _ev;
+
+            public EmulatedDevice(PointerEventArgs ev)
+            {
+                _ev = ev;
+            }
+            
+            public void ProcessRawEvent(RawInputEventArgs ev) => throw new NotSupportedException();
+
+            public IInputElement? Captured => _ev.Pointer.Captured;
+            public void Capture(IInputElement? control)
+            {
+                _ev.Pointer.Capture(control);
+            }
+
+            public Point GetPosition(IVisual relativeTo) => _ev.GetPosition(relativeTo);
+
+            public IPointer? TryGetPointer(RawPointerEventArgs ev) => _ev.Pointer;
+        }
+
+        public IPointer Pointer { get; }
+        public ulong Timestamp { get; }
+
+        private IPointerDevice? _device;
+
+        [Obsolete("Use Pointer to get pointer-specific information")]
+        public IPointerDevice Device => _device ?? (_device = new EmulatedDevice(this));
+
+        [Obsolete("Use KeyModifiers and PointerPointProperties")]
+        public InputModifiers InputModifiers 
+        {
+            get
+            {
+                var mods = (InputModifiers)KeyModifiers;
+                if (_properties.IsLeftButtonPressed)
+                    mods |= InputModifiers.LeftMouseButton;
+                if (_properties.IsMiddleButtonPressed)
+                    mods |= InputModifiers.MiddleMouseButton;
+                if (_properties.IsRightButtonPressed)
+                    mods |= InputModifiers.RightMouseButton;
+                
+                return mods;
+            }
+        }
+        
+        public KeyModifiers KeyModifiers { get; }
+
+        private Point GetPosition(Point pt, IVisual? relativeTo)
+        {
+            if (_rootVisual == null)
+                return default;
+            if (relativeTo == null)
+                return pt;
+            return pt * _rootVisual.TransformToVisual(relativeTo) ?? default;
+        }
+        
+        public Point GetPosition(IVisual? relativeTo) => GetPosition(_rootVisualPosition, relativeTo);
+
+        [Obsolete("Use GetCurrentPoint")]
+        public PointerPoint GetPointerPoint(IVisual? relativeTo) => GetCurrentPoint(relativeTo);
+        
+        /// <summary>
+        /// Returns the PointerPoint associated with the current event
+        /// </summary>
+        /// <param name="relativeTo">The visual which coordinate system to use. Pass null for toplevel coordinate system</param>
+        /// <returns></returns>
+        public PointerPoint GetCurrentPoint(IVisual? relativeTo)
+            => new PointerPoint(Pointer, GetPosition(relativeTo), _properties);
+
+        /// <summary>
+        /// Returns the PointerPoint associated with the current event
+        /// </summary>
+        /// <param name="relativeTo">The visual which coordinate system to use. Pass null for toplevel coordinate system</param>
+        /// <returns></returns>
+        public IReadOnlyList<PointerPoint> GetIntermediatePoints(IVisual? relativeTo)
+        {
+            var previousPoints = _previousPoints?.Value;            
+            if (previousPoints == null || previousPoints.Count == 0)
+                return new[] { GetCurrentPoint(relativeTo) };
+            var points = new PointerPoint[previousPoints.Count + 1];
+            for (var c = 0; c < previousPoints.Count; c++)
+            {
+                var pt = previousPoints[c];
+                points[c] = new PointerPoint(Pointer, GetPosition(pt.Position, relativeTo), _properties);
+            }
+
+            points[points.Length - 1] = GetCurrentPoint(relativeTo);
+            return points;
+        }
+
+        /// <summary>
+        /// Returns the current pointer point properties
+        /// </summary>
+        protected PointerPointProperties Properties => _properties;
+    }
+    
+    public enum MouseButton
+    {
+        None,
+        Left,
+        Right,
+        Middle,
+        XButton1,
+        XButton2
+    }
+
+    public class PointerPressedEventArgs : PointerEventArgs
+    {
+        private readonly int _clickCount;
+
+        public PointerPressedEventArgs(
+            IInteractive source,
+            IPointer pointer,
+            IVisual rootVisual, Point rootVisualPosition,
+            ulong timestamp,
+            PointerPointProperties properties,
+            KeyModifiers modifiers,
+            int clickCount = 1)
+            : base(InputElement.PointerPressedEvent, source, pointer, rootVisual, rootVisualPosition,
+                timestamp, properties, modifiers)
+        {
+            _clickCount = clickCount;
+        }
+
+        public int ClickCount => _clickCount;
+
+        [Obsolete("Use PointerPressedEventArgs.GetCurrentPoint(this).Properties")]
+        public MouseButton MouseButton => Properties.PointerUpdateKind.GetMouseButton();
+    }
+
+    public class PointerReleasedEventArgs : PointerEventArgs
+    {
+        public PointerReleasedEventArgs(
+            IInteractive source, IPointer pointer,
+            IVisual rootVisual, Point rootVisualPosition, ulong timestamp,
+            PointerPointProperties properties, KeyModifiers modifiers,
+            MouseButton initialPressMouseButton)
+            : base(InputElement.PointerReleasedEvent, source, pointer, rootVisual, rootVisualPosition,
+                timestamp, properties, modifiers)
+        {
+            InitialPressMouseButton = initialPressMouseButton;
+        }
+
+        /// <summary>
+        /// Gets the mouse button that triggered the corresponding PointerPressed event
+        /// </summary>
+        public MouseButton InitialPressMouseButton { get; }
+
+        [Obsolete("Use InitialPressMouseButton")]
+        public MouseButton MouseButton => InitialPressMouseButton;
+    }
+
+    public class PointerCaptureLostEventArgs : RoutedEventArgs
+    {
+        public IPointer Pointer { get; }
+
+        public PointerCaptureLostEventArgs(IInteractive source, IPointer pointer) : base(InputElement.PointerCaptureLostEvent)
+        {
+            Pointer = pointer;
+            Source = source;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/PointerOverPreProcessor.cs b/src/Avalonia.Base/Input/PointerOverPreProcessor.cs
new file mode 100644
index 0000000000..d22252893d
--- /dev/null
+++ b/src/Avalonia.Base/Input/PointerOverPreProcessor.cs
@@ -0,0 +1,209 @@
+using System;
+using Avalonia.Input.Raw;
+
+namespace Avalonia.Input
+{
+    internal class PointerOverPreProcessor : IObserver<RawInputEventArgs>
+    {
+        private IPointerDevice? _lastActivePointerDevice;
+        private (IPointer pointer, PixelPoint position)? _lastPointer;
+
+        private readonly IInputRoot _inputRoot;
+
+        public PointerOverPreProcessor(IInputRoot inputRoot)
+        {
+            _inputRoot = inputRoot ?? throw new ArgumentNullException(nameof(inputRoot));
+        }
+
+        public void OnCompleted()
+        {
+            ClearPointerOver();
+        }
+
+        public void OnError(Exception error)
+        {
+        }
+
+        public void OnNext(RawInputEventArgs value)
+        {
+            if (value is RawPointerEventArgs args
+                && args.Root == _inputRoot
+                && value.Device is IPointerDevice pointerDevice)
+            {
+                if (pointerDevice != _lastActivePointerDevice)
+                {
+                    ClearPointerOver();
+
+                    // Set last active device before processing input, because ClearPointerOver might be called and clear last device.
+                    _lastActivePointerDevice = pointerDevice;
+                }
+
+                if (args.Type is RawPointerEventType.LeaveWindow or RawPointerEventType.NonClientLeftButtonDown
+                    && _lastPointer is (var lastPointer, var lastPosition))
+                {
+                    _lastPointer = null;
+                    ClearPointerOver(lastPointer, args.Root, 0, args.Root.PointToClient(lastPosition),
+                        new PointerPointProperties(args.InputModifiers, args.Type.ToUpdateKind()),
+                        args.InputModifiers.ToKeyModifiers());
+                }
+                else if (pointerDevice.TryGetPointer(args) is IPointer pointer
+                    && pointer.Type != PointerType.Touch)
+                {
+                    var element = pointer.Captured ?? args.InputHitTestResult;
+
+                    SetPointerOver(pointer, args.Root, element, args.Timestamp, args.Position,
+                        new PointerPointProperties(args.InputModifiers, args.Type.ToUpdateKind()),
+                        args.InputModifiers.ToKeyModifiers());
+                }
+            }
+        }
+
+        public void SceneInvalidated(Rect dirtyRect)
+        {
+            if (_lastPointer is (var pointer, var position))
+            {
+                var clientPoint = _inputRoot.PointToClient(position);
+
+                if (dirtyRect.Contains(clientPoint))
+                {
+                    SetPointerOver(pointer, _inputRoot, _inputRoot.InputHitTest(clientPoint), 0, clientPoint, PointerPointProperties.None, KeyModifiers.None);
+                }
+                else if (!_inputRoot.Bounds.Contains(clientPoint))
+                {
+                    ClearPointerOver(pointer, _inputRoot, 0, new Point(-1, -1), PointerPointProperties.None, KeyModifiers.None);
+                }
+            }
+        }
+
+        private void ClearPointerOver()
+        {
+            if (_lastPointer is (var pointer, var _))
+            {
+                ClearPointerOver(pointer, _inputRoot, 0, new Point(-1, -1), PointerPointProperties.None, KeyModifiers.None);
+            }
+            _lastPointer = null;
+            _lastActivePointerDevice = null;
+        }
+
+        private void ClearPointerOver(IPointer pointer, IInputRoot root,
+            ulong timestamp, Point position, PointerPointProperties properties, KeyModifiers inputModifiers)
+        {
+            var element = root.PointerOverElement;
+            if (element is null)
+            {
+                return;
+            }
+
+            // Do not pass rootVisual, when we have unknown (negative) position,
+            // so GetPosition won't return invalid values.
+            var hasPosition = position.X >= 0 && position.Y >= 0;
+            var e = new PointerEventArgs(InputElement.PointerLeaveEvent, element, pointer,
+                hasPosition ? root : null, hasPosition ? position : default,
+                timestamp, properties, inputModifiers);
+
+            if (element != null && !element.IsAttachedToVisualTree)
+            {
+                // element has been removed from visual tree so do top down cleanup
+                if (root.IsPointerOver)
+                {
+                    ClearChildrenPointerOver(e, root, true);
+                }
+            }
+            while (element != null)
+            {
+                e.Source = element;
+                e.Handled = false;
+                element.RaiseEvent(e);
+                element = (IInputElement?)element.VisualParent;
+            }
+
+            root.PointerOverElement = null;
+            _lastActivePointerDevice = null;
+            _lastPointer = null;
+        }
+
+        private void ClearChildrenPointerOver(PointerEventArgs e, IInputElement element, bool clearRoot)
+        {
+            foreach (IInputElement el in element.VisualChildren)
+            {
+                if (el.IsPointerOver)
+                {
+                    ClearChildrenPointerOver(e, el, true);
+                    break;
+                }
+            }
+            if (clearRoot)
+            {
+                e.Source = element;
+                e.Handled = false;
+                element.RaiseEvent(e);
+            }
+        }
+
+        private void SetPointerOver(IPointer pointer, IInputRoot root, IInputElement? element,
+            ulong timestamp, Point position, PointerPointProperties properties, KeyModifiers inputModifiers)
+        {
+            var pointerOverElement = root.PointerOverElement;
+
+            if (element != pointerOverElement)
+            {
+                if (element != null)
+                {
+                    SetPointerOverToElement(pointer, root, element, timestamp, position, properties, inputModifiers);
+                }
+                else
+                {
+                    ClearPointerOver(pointer, root, timestamp, position, properties, inputModifiers);
+                }
+            }
+        }
+
+        private void SetPointerOverToElement(IPointer pointer, IInputRoot root, IInputElement element,
+            ulong timestamp, Point position, PointerPointProperties properties, KeyModifiers inputModifiers)
+        {
+            IInputElement? branch = null;
+
+            IInputElement? el = element;
+
+            while (el != null)
+            {
+                if (el.IsPointerOver)
+                {
+                    branch = el;
+                    break;
+                }
+                el = (IInputElement?)el.VisualParent;
+            }
+
+            el = root.PointerOverElement;
+
+            var e = new PointerEventArgs(InputElement.PointerLeaveEvent, el, pointer, root, position,
+                timestamp, properties, inputModifiers);
+            if (el != null && branch != null && !el.IsAttachedToVisualTree)
+            {
+                ClearChildrenPointerOver(e, branch, false);
+            }
+
+            while (el != null && el != branch)
+            {
+                e.Source = el;
+                e.Handled = false;
+                el.RaiseEvent(e);
+                el = (IInputElement?)el.VisualParent;
+            }
+
+            el = root.PointerOverElement = element;
+            _lastPointer = (pointer, root.PointToScreen(position));
+
+            e.RoutedEvent = InputElement.PointerEnterEvent;
+
+            while (el != null && el != branch)
+            {
+                e.Source = el;
+                e.Handled = false;
+                el.RaiseEvent(e);
+                el = (IInputElement?)el.VisualParent;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Input/PointerPoint.cs b/src/Avalonia.Base/Input/PointerPoint.cs
similarity index 100%
rename from src/Avalonia.Input/PointerPoint.cs
rename to src/Avalonia.Base/Input/PointerPoint.cs
diff --git a/src/Avalonia.Input/PointerWheelEventArgs.cs b/src/Avalonia.Base/Input/PointerWheelEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/PointerWheelEventArgs.cs
rename to src/Avalonia.Base/Input/PointerWheelEventArgs.cs
diff --git a/src/Avalonia.Base/Input/Raw/IDragDropDevice.cs b/src/Avalonia.Base/Input/Raw/IDragDropDevice.cs
new file mode 100644
index 0000000000..3bcc9fadd3
--- /dev/null
+++ b/src/Avalonia.Base/Input/Raw/IDragDropDevice.cs
@@ -0,0 +1,9 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input.Raw
+{
+    [NotClientImplementable]
+    public interface IDragDropDevice : IInputDevice
+    {
+    }
+}
diff --git a/src/Avalonia.Base/Input/Raw/RawDragEvent.cs b/src/Avalonia.Base/Input/Raw/RawDragEvent.cs
new file mode 100644
index 0000000000..652bad7115
--- /dev/null
+++ b/src/Avalonia.Base/Input/Raw/RawDragEvent.cs
@@ -0,0 +1,29 @@
+using System;
+
+namespace Avalonia.Input.Raw
+{
+    public class RawDragEvent : RawInputEventArgs
+    {
+        public Point Location { get; set; }
+        public IDataObject Data { get; }
+        public DragDropEffects Effects { get; set; }
+        public RawDragEventType Type { get; }
+        [Obsolete("Use KeyModifiers")]
+        public InputModifiers Modifiers { get; }
+        public KeyModifiers KeyModifiers { get; }
+
+        public RawDragEvent(IDragDropDevice inputDevice, RawDragEventType type, 
+            IInputRoot root, Point location, IDataObject data, DragDropEffects effects, RawInputModifiers modifiers)
+            :base(inputDevice, 0, root)
+        {
+            Type = type;
+            Location = location;
+            Data = data;
+            Effects = effects;
+            KeyModifiers = modifiers.ToKeyModifiers();
+#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.Base/Input/Raw/RawDragEventType.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawDragEventType.cs
rename to src/Avalonia.Base/Input/Raw/RawDragEventType.cs
diff --git a/src/Avalonia.Input/Raw/RawInputEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawInputEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawInputEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawInputEventArgs.cs
diff --git a/src/Avalonia.Base/Input/Raw/RawInputHelpers.cs b/src/Avalonia.Base/Input/Raw/RawInputHelpers.cs
new file mode 100644
index 0000000000..9d329bae59
--- /dev/null
+++ b/src/Avalonia.Base/Input/Raw/RawInputHelpers.cs
@@ -0,0 +1,27 @@
+using Avalonia.Input.Raw;
+
+namespace Avalonia.Input
+{
+    internal static class RawInputHelpers
+    {
+        public static KeyModifiers ToKeyModifiers(this RawInputModifiers modifiers) =>
+            (KeyModifiers)(modifiers & RawInputModifiers.KeyboardMask);
+
+        public static PointerUpdateKind ToUpdateKind(this RawPointerEventType type) => type switch
+        {
+            RawPointerEventType.LeftButtonDown => PointerUpdateKind.LeftButtonPressed,
+            RawPointerEventType.LeftButtonUp => PointerUpdateKind.LeftButtonReleased,
+            RawPointerEventType.RightButtonDown => PointerUpdateKind.RightButtonPressed,
+            RawPointerEventType.RightButtonUp => PointerUpdateKind.RightButtonReleased,
+            RawPointerEventType.MiddleButtonDown => PointerUpdateKind.MiddleButtonPressed,
+            RawPointerEventType.MiddleButtonUp => PointerUpdateKind.MiddleButtonReleased,
+            RawPointerEventType.XButton1Down => PointerUpdateKind.XButton1Pressed,
+            RawPointerEventType.XButton1Up => PointerUpdateKind.XButton1Released,
+            RawPointerEventType.XButton2Down => PointerUpdateKind.XButton2Pressed,
+            RawPointerEventType.XButton2Up => PointerUpdateKind.XButton2Released,
+            RawPointerEventType.TouchBegin => PointerUpdateKind.LeftButtonPressed,
+            RawPointerEventType.TouchEnd => PointerUpdateKind.LeftButtonReleased,
+            _ => PointerUpdateKind.Other
+        };
+    }
+}
diff --git a/src/Avalonia.Input/Raw/RawKeyEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawKeyEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawKeyEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawKeyEventArgs.cs
diff --git a/src/Avalonia.Input/Raw/RawMouseWheelEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawMouseWheelEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawMouseWheelEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawMouseWheelEventArgs.cs
diff --git a/src/Avalonia.Base/Input/Raw/RawPointerEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawPointerEventArgs.cs
new file mode 100644
index 0000000000..8b9d7c161d
--- /dev/null
+++ b/src/Avalonia.Base/Input/Raw/RawPointerEventArgs.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Input.Raw
+{
+    public enum RawPointerEventType
+    {
+        LeaveWindow,
+        LeftButtonDown,
+        LeftButtonUp,
+        RightButtonDown,
+        RightButtonUp,
+        MiddleButtonDown,
+        MiddleButtonUp,
+        XButton1Down,
+        XButton1Up,
+        XButton2Down,
+        XButton2Up,
+        Move,
+        Wheel,
+        NonClientLeftButtonDown,
+        TouchBegin,
+        TouchUpdate,
+        TouchEnd,
+        TouchCancel,
+        Magnify,
+        Rotate,
+        Swipe
+    }
+
+    /// <summary>
+    /// A raw mouse event.
+    /// </summary>
+    public class RawPointerEventArgs : RawInputEventArgs
+    {
+        private RawPointerPoint _point;
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RawPointerEventArgs"/> class.
+        /// </summary>
+        /// <param name="device">The associated device.</param>
+        /// <param name="timestamp">The event timestamp.</param>
+        /// <param name="root">The root from which the event originates.</param>
+        /// <param name="type">The type of the event.</param>
+        /// <param name="position">The mouse position, in client DIPs.</param>
+        /// <param name="inputModifiers">The input modifiers.</param>
+        public RawPointerEventArgs(
+            IInputDevice device,
+            ulong timestamp,
+            IInputRoot root,
+            RawPointerEventType type,
+            Point position, 
+            RawInputModifiers inputModifiers)
+            : base(device, timestamp, root)
+        {
+            Contract.Requires<ArgumentNullException>(device != null);
+            Contract.Requires<ArgumentNullException>(root != null);
+
+            Position = position;
+            Type = type;
+            InputModifiers = inputModifiers;
+        }
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RawPointerEventArgs"/> class.
+        /// </summary>
+        /// <param name="device">The associated device.</param>
+        /// <param name="timestamp">The event timestamp.</param>
+        /// <param name="root">The root from which the event originates.</param>
+        /// <param name="type">The type of the event.</param>
+        /// <param name="point">The point properties and position, in client DIPs.</param>
+        /// <param name="inputModifiers">The input modifiers.</param>
+        public RawPointerEventArgs(
+            IInputDevice device,
+            ulong timestamp,
+            IInputRoot root,
+            RawPointerEventType type,
+            RawPointerPoint point, 
+            RawInputModifiers inputModifiers)
+            : base(device, timestamp, root)
+        {
+            Contract.Requires<ArgumentNullException>(device != null);
+            Contract.Requires<ArgumentNullException>(root != null);
+
+            Point = point;
+            Type = type;
+            InputModifiers = inputModifiers;
+        }
+
+        /// <summary>
+        /// Gets the pointer properties and position, in client DIPs.
+        /// </summary>
+        public RawPointerPoint Point
+        {
+            get => _point;
+            set => _point = value;
+        }
+
+        /// <summary>
+        /// Gets the mouse position, in client DIPs.
+        /// </summary>
+        public Point Position
+        {
+            get => _point.Position;
+            set => _point.Position = value;
+        }
+
+        /// <summary>
+        /// Gets the type of the event.
+        /// </summary>
+        public RawPointerEventType Type { get; set; }
+
+        /// <summary>
+        /// Gets the input modifiers.
+        /// </summary>
+        public RawInputModifiers InputModifiers { get; set; }
+        
+        /// <summary>
+        /// Points that were traversed by a pointer since the previous relevant event,
+        /// only valid for Move and TouchUpdate
+        /// </summary>
+        public Lazy<IReadOnlyList<RawPointerPoint>?>? IntermediatePoints { get; set; }
+
+        internal IInputElement? InputHitTestResult { get; set; }
+    }
+
+    public struct RawPointerPoint
+    {
+        /// <summary>
+        /// Pointer position, in client DIPs.
+        /// </summary>
+        public Point Position { get; set; }
+        
+        public RawPointerPoint()
+        {
+            Position = default;
+        }
+    }
+}
diff --git a/src/Avalonia.Input/Raw/RawPointerGestureEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawPointerGestureEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawPointerGestureEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawPointerGestureEventArgs.cs
diff --git a/src/Avalonia.Input/Raw/RawSizeEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawSizeEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawSizeEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawSizeEventArgs.cs
diff --git a/src/Avalonia.Input/Raw/RawTextInputEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawTextInputEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
diff --git a/src/Avalonia.Input/Raw/RawTouchEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawTouchEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/Raw/RawTouchEventArgs.cs
rename to src/Avalonia.Base/Input/Raw/RawTouchEventArgs.cs
diff --git a/src/Avalonia.Input/ScrollGestureEventArgs.cs b/src/Avalonia.Base/Input/ScrollGestureEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/ScrollGestureEventArgs.cs
rename to src/Avalonia.Base/Input/ScrollGestureEventArgs.cs
diff --git a/src/Avalonia.Input/TappedEventArgs.cs b/src/Avalonia.Base/Input/TappedEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/TappedEventArgs.cs
rename to src/Avalonia.Base/Input/TappedEventArgs.cs
diff --git a/src/Avalonia.Input/TextInput/ITextInputMethodClient.cs b/src/Avalonia.Base/Input/TextInput/ITextInputMethodClient.cs
similarity index 100%
rename from src/Avalonia.Input/TextInput/ITextInputMethodClient.cs
rename to src/Avalonia.Base/Input/TextInput/ITextInputMethodClient.cs
diff --git a/src/Avalonia.Base/Input/TextInput/ITextInputMethodImpl.cs b/src/Avalonia.Base/Input/TextInput/ITextInputMethodImpl.cs
new file mode 100644
index 0000000000..be7ad81f81
--- /dev/null
+++ b/src/Avalonia.Base/Input/TextInput/ITextInputMethodImpl.cs
@@ -0,0 +1,19 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Input.TextInput
+{
+    [Unstable]
+    public interface ITextInputMethodImpl
+    {
+        void SetClient(ITextInputMethodClient? client);
+        void SetCursorRect(Rect rect);
+        void SetOptions(TextInputOptions options);
+        void Reset();
+    }
+    
+    [NotClientImplementable]
+    public interface ITextInputMethodRoot : IInputRoot
+    {
+        ITextInputMethodImpl? InputMethod { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Input/TextInput/InputMethodManager.cs b/src/Avalonia.Base/Input/TextInput/InputMethodManager.cs
new file mode 100644
index 0000000000..4734224da4
--- /dev/null
+++ b/src/Avalonia.Base/Input/TextInput/InputMethodManager.cs
@@ -0,0 +1,129 @@
+using System;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input.TextInput
+{
+    internal class TextInputMethodManager
+    {
+        private ITextInputMethodImpl? _im;
+        private IInputElement? _focusedElement;
+        private ITextInputMethodClient? _client;
+        private readonly TransformTrackingHelper _transformTracker = new TransformTrackingHelper();
+
+        public TextInputMethodManager()
+        {
+            _transformTracker.MatrixChanged += UpdateCursorRect;
+            InputMethod.IsInputMethodEnabledProperty.Changed.Subscribe(OnIsInputMethodEnabledChanged);
+        }
+
+        private ITextInputMethodClient? Client
+        {
+            get => _client;
+            set
+            {
+                if(_client == value)
+                    return;
+                if (_client != null)
+                {
+                    _client.CursorRectangleChanged -= OnCursorRectangleChanged;
+                    _client.TextViewVisualChanged -= OnTextViewVisualChanged;
+                }
+
+                _client = value;
+                
+                if (_client != null)
+                {
+                    _client.CursorRectangleChanged += OnCursorRectangleChanged;
+                    _client.TextViewVisualChanged += OnTextViewVisualChanged;
+
+                    _im?.Reset();
+                    
+                    if (_focusedElement is StyledElement target)
+                    {
+                        _im?.SetOptions(TextInputOptions.FromStyledElement(target));
+                    }
+                    else
+                    {
+                        _im?.SetOptions(TextInputOptions.Default);
+                    }
+
+                    _transformTracker.SetVisual(_client?.TextViewVisual);
+                    UpdateCursorRect();
+                    
+                    _im?.SetClient(_client);
+                }
+                else
+                {
+                    _im?.SetClient(null);
+                    _transformTracker.SetVisual(null);
+                }
+            }
+        }
+
+        private void OnIsInputMethodEnabledChanged(AvaloniaPropertyChangedEventArgs<bool> obj)
+        {
+            if (ReferenceEquals(obj.Sender, _focusedElement))
+            {
+                TryFindAndApplyClient();
+            }
+        }
+
+        private void OnTextViewVisualChanged(object? sender, EventArgs e) 
+            => _transformTracker.SetVisual(_client?.TextViewVisual);
+
+        private void UpdateCursorRect()
+        {
+            if (_im == null || _client == null || _focusedElement?.VisualRoot == null)
+                return;
+
+            var transform = _focusedElement.TransformToVisual(_focusedElement.VisualRoot);
+            if (transform == null)
+                _im.SetCursorRect(default);
+            else
+                _im.SetCursorRect(_client.CursorRectangle.TransformToAABB(transform.Value));
+        }
+
+        private void OnCursorRectangleChanged(object? sender, EventArgs e)
+        {
+            if (sender == _client)
+                UpdateCursorRect();
+        }
+        
+        public void SetFocusedElement(IInputElement? element)
+        {
+            if(_focusedElement == element)
+                return;
+            _focusedElement = element;
+
+            var inputMethod = (element?.VisualRoot as ITextInputMethodRoot)?.InputMethod;
+
+            if (_im != inputMethod)
+            {
+                _im?.SetClient(null);
+            }
+            
+            _im = inputMethod;
+
+            TryFindAndApplyClient();
+        }
+
+        private void TryFindAndApplyClient()
+        {
+            if (_focusedElement is not InputElement focused ||
+                _im == null ||
+                !InputMethod.GetIsInputMethodEnabled(focused))
+            {
+                Client = null;
+                return;
+            }
+
+            var clientQuery = new TextInputMethodClientRequestedEventArgs
+            {
+                RoutedEvent = InputElement.TextInputMethodClientRequestedEvent
+            };
+
+            _focusedElement.RaiseEvent(clientQuery);
+            Client = clientQuery.Client;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Input/TextInput/TextInputContentType.cs b/src/Avalonia.Base/Input/TextInput/TextInputContentType.cs
new file mode 100644
index 0000000000..02a9385354
--- /dev/null
+++ b/src/Avalonia.Base/Input/TextInput/TextInputContentType.cs
@@ -0,0 +1,62 @@
+namespace Avalonia.Input.TextInput
+{   
+    public enum TextInputContentType
+    {
+        /// <summary>
+        /// Default keyboard for the users configured input method.
+        /// </summary>
+        Normal = 0,
+        
+        /// <summary>
+        /// Display a keyboard that only has alphabetic characters.
+        /// </summary>
+        Alpha,
+        
+        /// <summary>
+        /// Display a numeric keypad only capable of numbers. i.e. Phone number
+        /// </summary>
+        Digits,
+        
+        /// <summary>
+        /// Display a numeric keypad for inputting a PIN.
+        /// </summary>
+        Pin,
+        
+        /// <summary>
+        /// Display a numeric keypad capable of inputting numbers including decimal seperator and sign.
+        /// </summary>
+        Number,
+        
+        /// <summary>
+        /// Display a keyboard for entering an email address.
+        /// </summary>
+        Email,
+        
+        /// <summary>
+        /// Display a keyboard for entering a URL.
+        /// </summary>
+        Url,
+        
+        /// <summary>
+        /// Display a keyboard for entering a persons name.
+        /// </summary>
+        Name,
+        
+        /// <summary>
+        /// Display a keyboard for entering sensitive data.
+        /// </summary>
+        Password,
+        
+        /// <summary>
+        /// Display a keyboard suitable for #tag and @mentions.
+        /// Not available on all platforms, will fallback to a suitable keyboard
+        /// when not available.
+        /// </summary>
+        Social,
+        
+        /// <summary>
+        /// Display a keyboard for entering a search keyword.
+        /// </summary>
+        Search
+    }
+}
diff --git a/src/Avalonia.Input/TextInput/TextInputMethodClientRequestedEventArgs.cs b/src/Avalonia.Base/Input/TextInput/TextInputMethodClientRequestedEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/TextInput/TextInputMethodClientRequestedEventArgs.cs
rename to src/Avalonia.Base/Input/TextInput/TextInputMethodClientRequestedEventArgs.cs
diff --git a/src/Avalonia.Base/Input/TextInput/TextInputOptions.cs b/src/Avalonia.Base/Input/TextInput/TextInputOptions.cs
new file mode 100644
index 0000000000..af5f142a25
--- /dev/null
+++ b/src/Avalonia.Base/Input/TextInput/TextInputOptions.cs
@@ -0,0 +1,220 @@
+namespace Avalonia.Input.TextInput;
+
+public class TextInputOptions
+{
+    public static TextInputOptions FromStyledElement(StyledElement avaloniaObject)
+    {
+        var result = new TextInputOptions
+        {
+            ContentType = GetContentType(avaloniaObject),
+            Multiline = GetMultiline(avaloniaObject),
+            AutoCapitalization = GetAutoCapitalization(avaloniaObject),
+            IsSensitive = GetIsSensitive(avaloniaObject),
+            Lowercase = GetLowercase(avaloniaObject),
+            Uppercase = GetUppercase(avaloniaObject)
+        };
+
+        return result;
+    }
+
+    public static readonly TextInputOptions Default = new();
+    
+    /// <summary>
+    /// Defines the <see cref="ContentType"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<TextInputContentType> ContentTypeProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, TextInputContentType>(
+            "ContentType",
+            defaultValue: TextInputContentType.Normal,
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="ContentTypeProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetContentType(StyledElement avaloniaObject, TextInputContentType value)
+    {
+        avaloniaObject.SetValue(ContentTypeProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="ContentTypeProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>TextInputContentType</returns>
+    public static TextInputContentType GetContentType(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(ContentTypeProperty);
+    }
+    
+    /// <summary>
+    /// The content type (mostly for determining the shape of the virtual keyboard)
+    /// </summary>
+    public TextInputContentType ContentType { get; set; }
+    
+    /// <summary>
+    /// Defines the <see cref="Multiline"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<bool> MultilineProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, bool>(
+            "Multiline",
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="MultilineProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetMultiline(StyledElement avaloniaObject, bool value)
+    {
+        avaloniaObject.SetValue(MultilineProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="MultilineProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>true if multiline</returns>
+    public static bool GetMultiline(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(MultilineProperty);
+    }
+        
+    /// <summary>
+    /// Text is multiline
+    /// </summary>
+    public bool Multiline { get; set; }
+    
+    /// <summary>
+    /// Defines the <see cref="Lowercase"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<bool> LowercaseProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, bool>(
+            "Lowercase",
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="LowercaseProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetLowercase(StyledElement avaloniaObject, bool value)
+    {
+        avaloniaObject.SetValue(LowercaseProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="LowercaseProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>true if Lowercase</returns>
+    public static bool GetLowercase(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(LowercaseProperty);
+    }
+        
+    /// <summary>
+    /// Text is in lower case
+    /// </summary>
+    public bool Lowercase { get; set; }
+    
+    /// <summary>
+    /// Defines the <see cref="Uppercase"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<bool> UppercaseProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, bool>(
+            "Uppercase",
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="UppercaseProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetUppercase(StyledElement avaloniaObject, bool value)
+    {
+        avaloniaObject.SetValue(UppercaseProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="UppercaseProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>true if Uppercase</returns>
+    public static bool GetUppercase(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(UppercaseProperty);
+    }
+        
+    /// <summary>
+    /// Text is in upper case
+    /// </summary>
+    public bool Uppercase { get; set; }
+        
+    /// <summary>
+    /// Defines the <see cref="AutoCapitalization"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<bool> AutoCapitalizationProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, bool>(
+            "AutoCapitalization",
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="AutoCapitalizationProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetAutoCapitalization(StyledElement avaloniaObject, bool value)
+    {
+        avaloniaObject.SetValue(AutoCapitalizationProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="AutoCapitalizationProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>true if AutoCapitalization</returns>
+    public static bool GetAutoCapitalization(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(AutoCapitalizationProperty);
+    }
+    
+    /// <summary>
+    /// Automatically capitalize letters at the start of the sentence
+    /// </summary>
+    public bool AutoCapitalization { get; set; }
+        
+    /// <summary>
+    /// Defines the <see cref="IsSensitive"/> property.
+    /// </summary>
+    public static readonly AttachedProperty<bool> IsSensitiveProperty =
+        AvaloniaProperty.RegisterAttached<TextInputOptions, StyledElement, bool>(
+            "IsSensitive",
+            inherits: true);
+    
+    /// <summary>
+    /// Sets the value of the attached <see cref="IsSensitiveProperty"/> on a control.
+    /// </summary>
+    /// <param name="avaloniaObject">The control.</param>
+    /// <param name="value">The property value to set.</param>
+    public static void SetIsSensitive(StyledElement avaloniaObject, bool value)
+    {
+        avaloniaObject.SetValue(IsSensitiveProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the value of the attached <see cref="IsSensitiveProperty"/>.
+    /// </summary>
+    /// <param name="avaloniaObject">The target.</param>
+    /// <returns>true if IsSensitive</returns>
+    public static bool GetIsSensitive(StyledElement avaloniaObject)
+    {
+        return avaloniaObject.GetValue(IsSensitiveProperty);
+    }
+    
+    /// <summary>
+    /// Text contains sensitive data like card numbers and should not be stored  
+    /// </summary>
+    public bool IsSensitive { get; set; }
+}
diff --git a/src/Avalonia.Input/TextInput/TransformTrackingHelper.cs b/src/Avalonia.Base/Input/TextInput/TransformTrackingHelper.cs
similarity index 100%
rename from src/Avalonia.Input/TextInput/TransformTrackingHelper.cs
rename to src/Avalonia.Base/Input/TextInput/TransformTrackingHelper.cs
diff --git a/src/Avalonia.Input/TextInputEventArgs.cs b/src/Avalonia.Base/Input/TextInputEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/TextInputEventArgs.cs
rename to src/Avalonia.Base/Input/TextInputEventArgs.cs
diff --git a/src/Avalonia.Base/Input/TouchDevice.cs b/src/Avalonia.Base/Input/TouchDevice.cs
new file mode 100644
index 0000000000..54dcc4051e
--- /dev/null
+++ b/src/Avalonia.Base/Input/TouchDevice.cs
@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Input.Raw;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Handles raw touch events
+    /// </summary>
+    /// <remarks>
+    /// This class is supposed to be used on per-toplevel basis, don't use a shared one
+    /// </remarks>
+    public class TouchDevice : IPointerDevice, IDisposable
+    {
+        private readonly Dictionary<long, Pointer> _pointers = new Dictionary<long, Pointer>();
+        private bool _disposed;
+        private int _clickCount;
+        private Rect _lastClickRect;
+        private ulong _lastClickTime;
+        private Pointer? _lastPointer;
+
+        IInputElement? IPointerDevice.Captured => _lastPointer?.Captured;
+
+        RawInputModifiers GetModifiers(RawInputModifiers modifiers, bool isLeftButtonDown)
+        {
+            var rv = modifiers &= RawInputModifiers.KeyboardMask;
+            if (isLeftButtonDown)
+                rv |= RawInputModifiers.LeftMouseButton;
+            return rv;
+        }
+
+        void IPointerDevice.Capture(IInputElement? control) => _lastPointer?.Capture(control);
+
+        Point IPointerDevice.GetPosition(IVisual relativeTo) => default;
+
+        public void ProcessRawEvent(RawInputEventArgs ev)
+        {
+            if (ev.Handled || _disposed)
+                return;
+            var args = (RawTouchEventArgs)ev;
+            if (!_pointers.TryGetValue(args.TouchPointId, out var pointer))
+            {
+                if (args.Type == RawPointerEventType.TouchEnd)
+                    return;
+                var hit = args.InputHitTestResult;
+
+                _pointers[args.TouchPointId] = pointer = new Pointer(Pointer.GetNextFreeId(),
+                    PointerType.Touch, _pointers.Count == 0);
+                pointer.Capture(hit);
+            }
+            _lastPointer = pointer;
+
+            var target = pointer.Captured ?? args.Root;
+            var updateKind = args.Type.ToUpdateKind();
+            var keyModifier = args.InputModifiers.ToKeyModifiers();
+
+            if (args.Type == RawPointerEventType.TouchBegin)
+            {
+                if (_pointers.Count > 1)
+                {
+                    _clickCount = 1;
+                    _lastClickTime = 0;
+                    _lastClickRect = new Rect();
+                }
+                else
+                {
+                    var settings = AvaloniaLocator.Current.GetRequiredService<IPlatformSettings>();
+
+                    if (!_lastClickRect.Contains(args.Position)
+                        || ev.Timestamp - _lastClickTime > settings.TouchDoubleClickTime.TotalMilliseconds)
+                    {
+                        _clickCount = 0;
+                    }
+                    ++_clickCount;
+                    _lastClickTime = ev.Timestamp;
+                    _lastClickRect = new Rect(args.Position, new Size())
+                        .Inflate(new Thickness(settings.TouchDoubleClickSize.Width / 2, settings.TouchDoubleClickSize.Height / 2));
+                }
+
+                target.RaiseEvent(new PointerPressedEventArgs(target, pointer,
+                    args.Root, args.Position, ev.Timestamp,
+                    new PointerPointProperties(GetModifiers(args.InputModifiers, true), updateKind),
+                    keyModifier, _clickCount));
+            }
+
+            if (args.Type == RawPointerEventType.TouchEnd)
+            {
+                _pointers.Remove(args.TouchPointId);
+                using (pointer)
+                {
+                    target.RaiseEvent(new PointerReleasedEventArgs(target, pointer,
+                        args.Root, args.Position, ev.Timestamp,
+                        new PointerPointProperties(GetModifiers(args.InputModifiers, false), updateKind),
+                        keyModifier, MouseButton.Left));
+                }
+                _lastPointer = null;
+            }
+
+            if (args.Type == RawPointerEventType.TouchCancel)
+            {
+                _pointers.Remove(args.TouchPointId);
+                using (pointer)
+                    pointer.Capture(null);
+                _lastPointer = null;
+            }
+
+            if (args.Type == RawPointerEventType.TouchUpdate)
+            {
+                target.RaiseEvent(new PointerEventArgs(InputElement.PointerMovedEvent, target, pointer, args.Root,
+                    args.Position, ev.Timestamp,
+                    new PointerPointProperties(GetModifiers(args.InputModifiers, true), updateKind),
+                    keyModifier, args.IntermediatePoints));
+            }
+        }
+
+        public void Dispose()
+        {
+            if (_disposed)
+                return;
+            var values = _pointers.Values.ToArray();
+            _pointers.Clear();
+            _disposed = true;
+            foreach (var p in values)
+                p.Dispose();
+        }
+
+        public IPointer? TryGetPointer(RawPointerEventArgs ev)
+        {
+            return ev is RawTouchEventArgs args
+                && _pointers.TryGetValue(args.TouchPointId, out var pointer)
+                ? pointer
+                : null;
+        }
+    }
+}
diff --git a/src/Avalonia.Input/VectorEventArgs.cs b/src/Avalonia.Base/Input/VectorEventArgs.cs
similarity index 100%
rename from src/Avalonia.Input/VectorEventArgs.cs
rename to src/Avalonia.Base/Input/VectorEventArgs.cs
diff --git a/src/Avalonia.Interactivity/EventRoute.cs b/src/Avalonia.Base/Interactivity/EventRoute.cs
similarity index 100%
rename from src/Avalonia.Interactivity/EventRoute.cs
rename to src/Avalonia.Base/Interactivity/EventRoute.cs
diff --git a/src/Avalonia.Base/Interactivity/IInteractive.cs b/src/Avalonia.Base/Interactivity/IInteractive.cs
new file mode 100644
index 0000000000..980bf54f1f
--- /dev/null
+++ b/src/Avalonia.Base/Interactivity/IInteractive.cs
@@ -0,0 +1,53 @@
+using System;
+using Avalonia.Metadata;
+
+#nullable enable
+
+namespace Avalonia.Interactivity
+{
+    /// <summary>
+    /// Interface for objects that raise routed events.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IInteractive
+    {
+        /// <summary>
+        /// Gets the interactive parent of the object for bubbling and tunneling events.
+        /// </summary>
+        IInteractive? InteractiveParent { get; }
+
+        /// <summary>
+        /// Adds a handler for the specified routed event.
+        /// </summary>
+        /// <param name="routedEvent">The routed event.</param>
+        /// <param name="handler">The handler.</param>
+        /// <param name="routes">The routing strategies to listen to.</param>
+        /// <param name="handledEventsToo">Whether handled events should also be listened for.</param>
+        /// <returns>A disposable that terminates the event subscription.</returns>
+        void AddHandler(
+            RoutedEvent routedEvent,
+            Delegate handler,
+            RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
+            bool handledEventsToo = false);
+
+        /// <summary>
+        /// Removes a handler for the specified routed event.
+        /// </summary>
+        /// <param name="routedEvent">The routed event.</param>
+        /// <param name="handler">The handler.</param>
+        void RemoveHandler(RoutedEvent routedEvent, Delegate handler);
+
+        /// <summary>
+        /// Adds the object's handlers for a routed event to an event route.
+        /// </summary>
+        /// <param name="routedEvent">The event.</param>
+        /// <param name="route">The event route.</param>
+        void AddToEventRoute(RoutedEvent routedEvent, EventRoute route);
+
+        /// <summary>
+        /// Raises a routed event.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        void RaiseEvent(RoutedEventArgs e);
+    }
+}
diff --git a/src/Avalonia.Interactivity/Interactive.cs b/src/Avalonia.Base/Interactivity/Interactive.cs
similarity index 100%
rename from src/Avalonia.Interactivity/Interactive.cs
rename to src/Avalonia.Base/Interactivity/Interactive.cs
diff --git a/src/Avalonia.Interactivity/InteractiveExtensions.cs b/src/Avalonia.Base/Interactivity/InteractiveExtensions.cs
similarity index 100%
rename from src/Avalonia.Interactivity/InteractiveExtensions.cs
rename to src/Avalonia.Base/Interactivity/InteractiveExtensions.cs
diff --git a/src/Avalonia.Interactivity/RoutedEvent.cs b/src/Avalonia.Base/Interactivity/RoutedEvent.cs
similarity index 100%
rename from src/Avalonia.Interactivity/RoutedEvent.cs
rename to src/Avalonia.Base/Interactivity/RoutedEvent.cs
diff --git a/src/Avalonia.Interactivity/RoutedEventArgs.cs b/src/Avalonia.Base/Interactivity/RoutedEventArgs.cs
similarity index 100%
rename from src/Avalonia.Interactivity/RoutedEventArgs.cs
rename to src/Avalonia.Base/Interactivity/RoutedEventArgs.cs
diff --git a/src/Avalonia.Interactivity/RoutedEventRegistry.cs b/src/Avalonia.Base/Interactivity/RoutedEventRegistry.cs
similarity index 100%
rename from src/Avalonia.Interactivity/RoutedEventRegistry.cs
rename to src/Avalonia.Base/Interactivity/RoutedEventRegistry.cs
diff --git a/src/Avalonia.Layout/AttachedLayout.cs b/src/Avalonia.Base/Layout/AttachedLayout.cs
similarity index 100%
rename from src/Avalonia.Layout/AttachedLayout.cs
rename to src/Avalonia.Base/Layout/AttachedLayout.cs
diff --git a/src/Avalonia.Layout/EffectiveViewportChangedEventArgs.cs b/src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs
similarity index 100%
rename from src/Avalonia.Layout/EffectiveViewportChangedEventArgs.cs
rename to src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs
diff --git a/src/Avalonia.Layout/ElementManager.cs b/src/Avalonia.Base/Layout/ElementManager.cs
similarity index 100%
rename from src/Avalonia.Layout/ElementManager.cs
rename to src/Avalonia.Base/Layout/ElementManager.cs
diff --git a/src/Avalonia.Layout/FlowLayoutAlgorithm.cs b/src/Avalonia.Base/Layout/FlowLayoutAlgorithm.cs
similarity index 100%
rename from src/Avalonia.Layout/FlowLayoutAlgorithm.cs
rename to src/Avalonia.Base/Layout/FlowLayoutAlgorithm.cs
diff --git a/src/Avalonia.Layout/IEmbeddedLayoutRoot.cs b/src/Avalonia.Base/Layout/IEmbeddedLayoutRoot.cs
similarity index 100%
rename from src/Avalonia.Layout/IEmbeddedLayoutRoot.cs
rename to src/Avalonia.Base/Layout/IEmbeddedLayoutRoot.cs
diff --git a/src/Avalonia.Layout/IFlowLayoutAlgorithmDelegates.cs b/src/Avalonia.Base/Layout/IFlowLayoutAlgorithmDelegates.cs
similarity index 100%
rename from src/Avalonia.Layout/IFlowLayoutAlgorithmDelegates.cs
rename to src/Avalonia.Base/Layout/IFlowLayoutAlgorithmDelegates.cs
diff --git a/src/Avalonia.Base/Layout/ILayoutManager.cs b/src/Avalonia.Base/Layout/ILayoutManager.cs
new file mode 100644
index 0000000000..143ce13a1b
--- /dev/null
+++ b/src/Avalonia.Base/Layout/ILayoutManager.cs
@@ -0,0 +1,70 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Manages measuring and arranging of controls.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ILayoutManager : IDisposable
+    {
+        /// <summary>
+        /// Raised when the layout manager completes a layout pass.
+        /// </summary>
+        event EventHandler LayoutUpdated;
+
+        /// <summary>
+        /// Notifies the layout manager that a control requires a measure.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        void InvalidateMeasure(ILayoutable control);
+
+        /// <summary>
+        /// Notifies the layout manager that a control requires an arrange.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        void InvalidateArrange(ILayoutable control);
+
+        /// <summary>
+        /// Executes a layout pass.
+        /// </summary>
+        /// <remarks>
+        /// You should not usually need to call this method explictly, the layout manager will
+        /// schedule layout passes itself.
+        /// </remarks>
+        void ExecuteLayoutPass();
+
+        /// <summary>
+        /// Executes the initial layout pass on a layout root.
+        /// </summary>
+        /// <remarks>
+        /// You should not usually need to call this method explictly, the layout root will call
+        /// it to carry out the initial layout of the control.
+        /// </remarks>
+        void ExecuteInitialLayoutPass();
+
+        /// <summary>
+        /// Executes the initial layout pass on a layout root.
+        /// </summary>
+        /// <param name="root">The control to lay out.</param>
+        /// <remarks>
+        /// You should not usually need to call this method explictly, the layout root will call
+        /// it to carry out the initial layout of the control.
+        /// </remarks>
+        [Obsolete("Call ExecuteInitialLayoutPass without parameter")]
+        void ExecuteInitialLayoutPass(ILayoutRoot root);
+
+        /// <summary>
+        /// Registers a control as wanting to receive effective viewport notifications.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        void RegisterEffectiveViewportListener(ILayoutable control);
+
+        /// <summary>
+        /// Registers a control as no longer wanting to receive effective viewport notifications.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        void UnregisterEffectiveViewportListener(ILayoutable control);
+    }
+}
diff --git a/src/Avalonia.Base/Layout/ILayoutRoot.cs b/src/Avalonia.Base/Layout/ILayoutRoot.cs
new file mode 100644
index 0000000000..df15fc1a1d
--- /dev/null
+++ b/src/Avalonia.Base/Layout/ILayoutRoot.cs
@@ -0,0 +1,26 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Defines the root of a layoutable tree.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ILayoutRoot : ILayoutable
+    {
+        /// <summary>
+        /// The size available to lay out the controls.
+        /// </summary>
+        Size ClientSize { get; }
+
+        /// <summary>
+        /// The scaling factor to use in layout.
+        /// </summary>
+        double LayoutScaling { get; }
+
+        /// <summary>
+        /// Associated instance of layout manager
+        /// </summary>
+        ILayoutManager LayoutManager { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Layout/ILayoutable.cs b/src/Avalonia.Base/Layout/ILayoutable.cs
new file mode 100644
index 0000000000..d8b546b04a
--- /dev/null
+++ b/src/Avalonia.Base/Layout/ILayoutable.cs
@@ -0,0 +1,122 @@
+using Avalonia.Metadata;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Defines layout-related functionality for a control.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ILayoutable : IVisual
+    {
+        /// <summary>
+        /// Gets the size that this element computed during the measure pass of the layout process.
+        /// </summary>
+        Size DesiredSize { get; }
+
+        /// <summary>
+        /// Gets the width of the element.
+        /// </summary>
+        double Width { get; }
+
+        /// <summary>
+        /// Gets the height of the element.
+        /// </summary>
+        double Height { get; }
+
+        /// <summary>
+        /// Gets the minimum width of the element.
+        /// </summary>
+        double MinWidth { get; }
+
+        /// <summary>
+        /// Gets the maximum width of the element.
+        /// </summary>
+        double MaxWidth { get; }
+
+        /// <summary>
+        /// Gets the minimum height of the element.
+        /// </summary>
+        double MinHeight { get; }
+
+        /// <summary>
+        /// Gets the maximum height of the element.
+        /// </summary>
+        double MaxHeight { get; }
+
+        /// <summary>
+        /// Gets the margin around the element.
+        /// </summary>
+        Thickness Margin { get; }
+
+        /// <summary>
+        /// Gets the element's preferred horizontal alignment in its parent.
+        /// </summary>
+        HorizontalAlignment HorizontalAlignment { get; }
+
+        /// <summary>
+        /// Gets the element's preferred vertical alignment in its parent.
+        /// </summary>
+        VerticalAlignment VerticalAlignment { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the control's layout measure is valid.
+        /// </summary>
+        bool IsMeasureValid { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the control's layouts arrange is valid.
+        /// </summary>
+        bool IsArrangeValid { get; }
+
+        /// <summary>
+        /// Gets the available size passed in the previous layout pass, if any.
+        /// </summary>
+        Size? PreviousMeasure { get; }
+
+        /// <summary>
+        /// Gets the layout rect passed in the previous layout pass, if any.
+        /// </summary>
+        Rect? PreviousArrange { get; }
+
+        /// <summary>
+        /// Creates the visual children of the control, if necessary
+        /// </summary>
+        void ApplyTemplate();
+
+        /// <summary>
+        /// Carries out a measure of the control.
+        /// </summary>
+        /// <param name="availableSize">The available size for the control.</param>
+        void Measure(Size availableSize);
+
+        /// <summary>
+        /// Arranges the control and its children.
+        /// </summary>
+        /// <param name="rect">The control's new bounds.</param>
+        void Arrange(Rect rect);
+
+        /// <summary>
+        /// Invalidates the measurement of the control and queues a new layout pass.
+        /// </summary>
+        void InvalidateMeasure();
+
+        /// <summary>
+        /// Invalidates the arrangement of the control and queues a new layout pass.
+        /// </summary>
+        void InvalidateArrange();
+
+        /// <summary>
+        /// Called when a child control's desired size changes.
+        /// </summary>
+        /// <param name="control">The child control.</param>
+        void ChildDesiredSizeChanged(ILayoutable control);
+
+        /// <summary>
+        /// Used by the <see cref="LayoutManager"/> to notify the control that its effective
+        /// viewport is changed.
+        /// </summary>
+        /// <param name="e">The viewport information.</param>
+        void EffectiveViewportChanged(EffectiveViewportChangedEventArgs e);
+    }
+}
diff --git a/src/Avalonia.Layout/LayoutContext.cs b/src/Avalonia.Base/Layout/LayoutContext.cs
similarity index 100%
rename from src/Avalonia.Layout/LayoutContext.cs
rename to src/Avalonia.Base/Layout/LayoutContext.cs
diff --git a/src/Avalonia.Layout/LayoutContextAdapter.cs b/src/Avalonia.Base/Layout/LayoutContextAdapter.cs
similarity index 100%
rename from src/Avalonia.Layout/LayoutContextAdapter.cs
rename to src/Avalonia.Base/Layout/LayoutContextAdapter.cs
diff --git a/src/Avalonia.Layout/LayoutExtensions.cs b/src/Avalonia.Base/Layout/LayoutExtensions.cs
similarity index 100%
rename from src/Avalonia.Layout/LayoutExtensions.cs
rename to src/Avalonia.Base/Layout/LayoutExtensions.cs
diff --git a/src/Avalonia.Base/Layout/LayoutHelper.cs b/src/Avalonia.Base/Layout/LayoutHelper.cs
new file mode 100644
index 0000000000..d24be57d2b
--- /dev/null
+++ b/src/Avalonia.Base/Layout/LayoutHelper.cs
@@ -0,0 +1,255 @@
+using System;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Provides helper methods needed for layout.
+    /// </summary>
+    public static class LayoutHelper
+    {
+        /// <summary>
+        /// Epsilon value used for certain layout calculations.
+        /// Based on the value in WPF LayoutDoubleUtil.
+        /// </summary>
+        public static double LayoutEpsilon { get; } = 0.00000153;
+
+        /// <summary>
+        /// Calculates a control's size based on its <see cref="ILayoutable.Width"/>,
+        /// <see cref="ILayoutable.Height"/>, <see cref="ILayoutable.MinWidth"/>,
+        /// <see cref="ILayoutable.MaxWidth"/>, <see cref="ILayoutable.MinHeight"/> and
+        /// <see cref="ILayoutable.MaxHeight"/>.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="constraints">The space available for the control.</param>
+        /// <returns>The control's size.</returns>
+        public static Size ApplyLayoutConstraints(ILayoutable control, Size constraints)
+        {
+            var minmax = new MinMax(control);
+
+            return new Size(
+                MathUtilities.Clamp(constraints.Width, minmax.MinWidth, minmax.MaxWidth),
+                MathUtilities.Clamp(constraints.Height, minmax.MinHeight, minmax.MaxHeight));
+        }
+
+        public static Size MeasureChild(ILayoutable? control, Size availableSize, Thickness padding,
+            Thickness borderThickness)
+        {
+            return MeasureChild(control, availableSize, padding + borderThickness);
+        }
+
+        public static Size MeasureChild(ILayoutable? control, Size availableSize, Thickness padding)
+        {
+            if (control != null)
+            {
+                control.Measure(availableSize.Deflate(padding));
+                return control.DesiredSize.Inflate(padding);
+            }
+
+            return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
+        }
+
+        public static Size ArrangeChild(ILayoutable? child, Size availableSize, Thickness padding, Thickness borderThickness)
+        {
+            if (IsParentLayoutRounded(child, out double scale))
+            {
+                padding = RoundLayoutThickness(padding, scale, scale);
+                borderThickness = RoundLayoutThickness(borderThickness, scale, scale);
+            }
+
+            return ArrangeChildInternal(child, availableSize, padding + borderThickness);
+        }
+
+        public static Size ArrangeChild(ILayoutable? child, Size availableSize, Thickness padding)
+        {
+            if(IsParentLayoutRounded(child, out double scale))
+                padding = RoundLayoutThickness(padding, scale, scale);
+
+            return ArrangeChildInternal(child, availableSize, padding);
+        }
+
+        private static Size ArrangeChildInternal(ILayoutable? child, Size availableSize, Thickness padding)
+        {
+            child?.Arrange(new Rect(availableSize).Deflate(padding));
+
+            return availableSize;
+        }
+
+        private static bool IsParentLayoutRounded(ILayoutable? child, out double scale)
+        {
+            var layoutableParent = (ILayoutable?)child?.GetVisualParent();
+
+            if (layoutableParent == null || !((Layoutable)layoutableParent).UseLayoutRounding)
+            {
+                scale = 1.0;
+                return false;
+            }
+
+            scale = GetLayoutScale(layoutableParent);
+            return true;
+        }
+
+        /// <summary>
+        /// Invalidates measure for given control and all visual children recursively.
+        /// </summary>
+        public static void InvalidateSelfAndChildrenMeasure(ILayoutable control)
+        {
+            void InnerInvalidateMeasure(IVisual target)
+            {
+                if (target is ILayoutable targetLayoutable)
+                {
+                    targetLayoutable.InvalidateMeasure();
+                }
+
+                var visualChildren = target.VisualChildren;
+                var visualChildrenCount = visualChildren.Count;
+
+                for (int i = 0; i < visualChildrenCount; i++)
+                {
+                    IVisual child = visualChildren[i];
+
+                    InnerInvalidateMeasure(child);
+                }
+            }
+
+            InnerInvalidateMeasure(control);
+        }
+
+        /// <summary>
+        /// Obtains layout scale of the given control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <exception cref="Exception">Thrown when control has no root or returned layout scaling is invalid.</exception>
+        public static double GetLayoutScale(ILayoutable control)
+        {
+            var visualRoot = control.VisualRoot;
+            
+            var result = (visualRoot as ILayoutRoot)?.LayoutScaling ?? 1.0;
+
+            if (result == 0 || double.IsNaN(result) || double.IsInfinity(result))
+            {
+                throw new Exception($"Invalid LayoutScaling returned from {visualRoot!.GetType()}");
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Rounds a size to integer values for layout purposes, compensating for high DPI screen
+        /// coordinates.
+        /// </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>
+        /// Rounds a thickness to integer values for layout purposes, compensating for high DPI screen
+        /// coordinates.
+        /// </summary>
+        /// <param name="thickness">Input thickness.</param>
+        /// <param name="dpiScaleX">DPI along x-dimension.</param>
+        /// <param name="dpiScaleY">DPI along y-dimension.</param>
+        /// <returns>Value of thickness that will be rounded under screen DPI.</returns>
+        /// <remarks>
+        /// This is a layout helper method. It takes DPI into account and also does not return
+        /// the rounded value if it is unacceptable for layout, e.g. Infinity or NaN. It's a helper
+        /// associated with the UseLayoutRounding property and should not be used as a general rounding
+        /// utility.
+        /// </remarks>
+        public static Thickness RoundLayoutThickness(Thickness thickness, double dpiScaleX, double dpiScaleY)
+        {
+            return new Thickness(
+                RoundLayoutValue(thickness.Left, dpiScaleX),
+                RoundLayoutValue(thickness.Top, dpiScaleY),
+                RoundLayoutValue(thickness.Right, dpiScaleX),
+                RoundLayoutValue(thickness.Bottom, dpiScaleY)
+            );
+        }
+
+
+
+        /// <summary>
+        /// Calculates the value to be used for layout rounding at high DPI.
+        /// </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.Base/Layout/LayoutManager.cs b/src/Avalonia.Base/Layout/LayoutManager.cs
new file mode 100644
index 0000000000..446f135c83
--- /dev/null
+++ b/src/Avalonia.Base/Layout/LayoutManager.cs
@@ -0,0 +1,429 @@
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Avalonia.Logging;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+#nullable enable
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Manages measuring and arranging of controls.
+    /// </summary>
+    public class LayoutManager : ILayoutManager, IDisposable
+    {
+        private const int MaxPasses = 3;
+        private readonly ILayoutRoot _owner;
+        private readonly LayoutQueue<ILayoutable> _toMeasure = new LayoutQueue<ILayoutable>(v => !v.IsMeasureValid);
+        private readonly LayoutQueue<ILayoutable> _toArrange = new LayoutQueue<ILayoutable>(v => !v.IsArrangeValid);
+        private readonly Action _executeLayoutPass;
+        private List<EffectiveViewportChangedListener>? _effectiveViewportChangedListeners;
+        private bool _disposed;
+        private bool _queued;
+        private bool _running;
+
+        public LayoutManager(ILayoutRoot owner)
+        {
+            _owner = owner ?? throw new ArgumentNullException(nameof(owner));
+            _executeLayoutPass = ExecuteQueuedLayoutPass;
+        }
+
+        public virtual event EventHandler? LayoutUpdated;
+
+        /// <inheritdoc/>
+        public virtual void InvalidateMeasure(ILayoutable control)
+        {
+            control = control ?? throw new ArgumentNullException(nameof(control));
+            Dispatcher.UIThread.VerifyAccess();
+
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (!control.IsAttachedToVisualTree)
+            {
+#if DEBUG
+                throw new AvaloniaInternalException(
+                    "LayoutManager.InvalidateMeasure called on a control that is detached from the visual tree.");
+#else
+                return;
+#endif
+            }
+
+            if (control.VisualRoot != _owner)
+            {
+                throw new ArgumentException("Attempt to call InvalidateMeasure on wrong LayoutManager.");
+            }
+
+            _toMeasure.Enqueue(control);
+            _toArrange.Enqueue(control);
+            QueueLayoutPass();
+        }
+
+        /// <inheritdoc/>
+        public virtual void InvalidateArrange(ILayoutable control)
+        {
+            control = control ?? throw new ArgumentNullException(nameof(control));
+            Dispatcher.UIThread.VerifyAccess();
+
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (!control.IsAttachedToVisualTree)
+            {
+#if DEBUG
+                throw new AvaloniaInternalException(
+                    "LayoutManager.InvalidateArrange called on a control that is detached from the visual tree.");
+#else
+                return;
+#endif
+            }
+
+            if (control.VisualRoot != _owner)
+            {
+                throw new ArgumentException("Attempt to call InvalidateArrange on wrong LayoutManager.");
+            }
+
+            _toArrange.Enqueue(control);
+            QueueLayoutPass();
+        }
+
+        private void ExecuteQueuedLayoutPass()
+        {
+            if (!_queued)
+            {
+                return;
+            }
+            
+            ExecuteLayoutPass();
+        }
+
+        /// <inheritdoc/>
+        public virtual void ExecuteLayoutPass()
+        {
+            Dispatcher.UIThread.VerifyAccess();
+
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (!_running)
+            {
+                Stopwatch? stopwatch = null;
+
+                const LogEventLevel timingLogLevel = LogEventLevel.Information;
+                bool captureTiming = Logger.IsEnabled(timingLogLevel, LogArea.Layout);
+
+                if (captureTiming)
+                {
+                    Logger.TryGet(timingLogLevel, LogArea.Layout)?.Log(
+                        this,
+                        "Started layout pass. To measure: {Measure} To arrange: {Arrange}",
+                        _toMeasure.Count,
+                        _toArrange.Count);
+
+                    stopwatch = new Stopwatch();
+                    stopwatch.Start();
+                }
+
+                _toMeasure.BeginLoop(MaxPasses);
+                _toArrange.BeginLoop(MaxPasses);
+
+                try
+                {
+                    _running = true;
+
+                    for (var pass = 0; pass < MaxPasses; ++pass)
+                    {
+                        InnerLayoutPass();
+
+                        if (!RaiseEffectiveViewportChanged())
+                        {
+                            break;
+                        }
+                    }
+                }
+                finally
+                {
+                    _running = false;
+                }
+
+                _toMeasure.EndLoop();
+                _toArrange.EndLoop();
+
+                if (captureTiming)
+                {
+                    stopwatch!.Stop();
+
+                    Logger.TryGet(timingLogLevel, LogArea.Layout)?.Log(this, "Layout pass finished in {Time}", stopwatch.Elapsed);
+                }
+            }
+
+            _queued = false;
+            LayoutUpdated?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <inheritdoc/>
+        public virtual void ExecuteInitialLayoutPass()
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            try
+            {
+                _running = true;
+                Measure(_owner);
+                Arrange(_owner);
+            }
+            finally
+            {
+                _running = false;
+            }
+
+            // Running the initial layout pass may have caused some control to be invalidated
+            // so run a full layout pass now (this usually due to scrollbars; its not known
+            // whether they will need to be shown until the layout pass has run and if the
+            // first guess was incorrect the layout will need to be updated).
+            ExecuteLayoutPass();
+        }
+
+        [Obsolete("Call ExecuteInitialLayoutPass without parameter")]
+        public void ExecuteInitialLayoutPass(ILayoutRoot root)
+        {
+            if (root != _owner)
+            {
+                throw new ArgumentException("ExecuteInitialLayoutPass called with incorrect root.");
+            }
+
+            ExecuteInitialLayoutPass();
+        }
+
+        public void Dispose()
+        {
+            _disposed = true;
+            _toMeasure.Dispose();
+            _toArrange.Dispose();
+        }
+
+        void ILayoutManager.RegisterEffectiveViewportListener(ILayoutable control)
+        {
+            _effectiveViewportChangedListeners ??= new List<EffectiveViewportChangedListener>();
+            _effectiveViewportChangedListeners.Add(new EffectiveViewportChangedListener(
+                control,
+                CalculateEffectiveViewport(control)));
+        }
+
+        void ILayoutManager.UnregisterEffectiveViewportListener(ILayoutable control)
+        {
+            if (_effectiveViewportChangedListeners is object)
+            {
+                for (var i = _effectiveViewportChangedListeners.Count - 1; i >= 0; --i)
+                {
+                    if (_effectiveViewportChangedListeners[i].Listener == control)
+                    {
+                        _effectiveViewportChangedListeners.RemoveAt(i);
+                    }
+                }
+            }
+        }
+
+        private void InnerLayoutPass()
+        {
+            for (var pass = 0; pass < MaxPasses; ++pass)
+            {
+                ExecuteMeasurePass();
+                ExecuteArrangePass();
+
+                if (_toMeasure.Count == 0)
+                {
+                    break;
+                }
+            }
+        }
+
+        private void ExecuteMeasurePass()
+        {
+            while (_toMeasure.Count > 0)
+            {
+                var control = _toMeasure.Dequeue();
+
+                if (!control.IsMeasureValid && control.IsAttachedToVisualTree)
+                {
+                    Measure(control);
+                }
+            }
+        }
+
+        private void ExecuteArrangePass()
+        {
+            while (_toArrange.Count > 0)
+            {
+                var control = _toArrange.Dequeue();
+
+                if (!control.IsArrangeValid && control.IsAttachedToVisualTree)
+                {
+                    Arrange(control);
+                }
+            }
+        }
+
+        private void Measure(ILayoutable control)
+        {
+            // Controls closest to the visual root need to be arranged first. We don't try to store
+            // ordered invalidation lists, instead we traverse the tree upwards, measuring the
+            // controls closest to the root first. This has been shown by benchmarks to be the
+            // fastest and most memory-efficient algorithm.
+            if (control.VisualParent is ILayoutable parent)
+            {
+                Measure(parent);
+            }
+
+            // If the control being measured has IsMeasureValid == true here then its measure was
+            // handed by an ancestor and can be ignored. The measure may have also caused the
+            // control to be removed.
+            if (!control.IsMeasureValid && control.IsAttachedToVisualTree)
+            {
+                if (control is ILayoutRoot root)
+                {
+                    root.Measure(Size.Infinity);
+                }
+                else if (control.PreviousMeasure.HasValue)
+                {
+                    control.Measure(control.PreviousMeasure.Value);
+                }
+            }
+        }
+
+        private void Arrange(ILayoutable control)
+        {
+            if (control.VisualParent is ILayoutable parent)
+            {
+                Arrange(parent);
+            }
+
+            if (!control.IsArrangeValid && control.IsAttachedToVisualTree)
+            {
+                if (control is IEmbeddedLayoutRoot embeddedRoot)
+                    control.Arrange(new Rect(embeddedRoot.AllocatedSize));
+                else if (control is ILayoutRoot root)
+                    control.Arrange(new Rect(root.DesiredSize));
+                else if (control.PreviousArrange != null)
+                {
+                    // Has been observed that PreviousArrange sometimes is null, probably a bug somewhere else.
+                    // Condition observed: control.VisualParent is Scrollbar, control is Border.
+                    control.Arrange(control.PreviousArrange.Value);
+                }
+            }
+        }
+
+        private void QueueLayoutPass()
+        {
+            if (!_queued && !_running)
+            {
+                _queued = true;
+                Dispatcher.UIThread.Post(_executeLayoutPass, DispatcherPriority.Layout);
+            }
+        }
+
+        private bool RaiseEffectiveViewportChanged()
+        {
+            var startCount = _toMeasure.Count + _toArrange.Count;
+
+            if (_effectiveViewportChangedListeners is object)
+            {
+                var count = _effectiveViewportChangedListeners.Count;
+                var pool = ArrayPool<EffectiveViewportChangedListener>.Shared;
+                var listeners = pool.Rent(count);
+
+                _effectiveViewportChangedListeners.CopyTo(listeners);
+
+                try
+                {
+                    for (var i = 0; i < count; ++i)
+                    {
+                        var l = _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.Base/Layout/LayoutQueue.cs
similarity index 100%
rename from src/Avalonia.Layout/LayoutQueue.cs
rename to src/Avalonia.Base/Layout/LayoutQueue.cs
diff --git a/src/Avalonia.Base/Layout/Layoutable.cs b/src/Avalonia.Base/Layout/Layoutable.cs
new file mode 100644
index 0000000000..f30925f489
--- /dev/null
+++ b/src/Avalonia.Base/Layout/Layoutable.cs
@@ -0,0 +1,865 @@
+using System;
+using Avalonia.Logging;
+using Avalonia.VisualTree;
+
+#nullable enable
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Defines how a control aligns itself horizontally in its parent control.
+    /// </summary>
+    public enum HorizontalAlignment
+    {
+        /// <summary>
+        /// The control stretches to fill the width of the parent control.
+        /// </summary>
+        Stretch,
+
+        /// <summary>
+        /// The control aligns itself to the left of the parent control.
+        /// </summary>
+        Left,
+
+        /// <summary>
+        /// The control centers itself in the parent control.
+        /// </summary>
+        Center,
+
+        /// <summary>
+        /// The control aligns itself to the right of the parent control.
+        /// </summary>
+        Right,
+    }
+
+    /// <summary>
+    /// Defines how a control aligns itself vertically in its parent control.
+    /// </summary>
+    public enum VerticalAlignment
+    {
+        /// <summary>
+        /// The control stretches to fill the height of the parent control.
+        /// </summary>
+        Stretch,
+
+        /// <summary>
+        /// The control aligns itself to the top of the parent control.
+        /// </summary>
+        Top,
+
+        /// <summary>
+        /// The control centers itself within the parent control.
+        /// </summary>
+        Center,
+
+        /// <summary>
+        /// The control aligns itself to the bottom of the parent control.
+        /// </summary>
+        Bottom,
+    }
+
+    /// <summary>
+    /// Implements layout-related functionality for a control.
+    /// </summary>
+    public class Layoutable : Visual, ILayoutable
+    {
+        /// <summary>
+        /// Defines the <see cref="DesiredSize"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Layoutable, Size> DesiredSizeProperty =
+            AvaloniaProperty.RegisterDirect<Layoutable, Size>(nameof(DesiredSize), o => o.DesiredSize);
+
+        /// <summary>
+        /// Defines the <see cref="Width"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> WidthProperty =
+            AvaloniaProperty.Register<Layoutable, double>(nameof(Width), double.NaN);
+
+        /// <summary>
+        /// Defines the <see cref="Height"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> HeightProperty =
+            AvaloniaProperty.Register<Layoutable, double>(nameof(Height), double.NaN);
+
+        /// <summary>
+        /// Defines the <see cref="MinWidth"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinWidthProperty =
+            AvaloniaProperty.Register<Layoutable, double>(nameof(MinWidth));
+
+        /// <summary>
+        /// Defines the <see cref="MaxWidth"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MaxWidthProperty =
+            AvaloniaProperty.Register<Layoutable, double>(nameof(MaxWidth), double.PositiveInfinity);
+
+        /// <summary>
+        /// Defines the <see cref="MinHeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinHeightProperty =
+            AvaloniaProperty.Register<Layoutable, double>(nameof(MinHeight));
+
+        /// <summary>
+        /// Defines the <see cref="MaxHeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MaxHeightProperty =
+            AvaloniaProperty.Register<Layoutable, double>(nameof(MaxHeight), double.PositiveInfinity);
+
+        /// <summary>
+        /// Defines the <see cref="Margin"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Thickness> MarginProperty =
+            AvaloniaProperty.Register<Layoutable, Thickness>(nameof(Margin));
+
+        /// <summary>
+        /// Defines the <see cref="HorizontalAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HorizontalAlignment> HorizontalAlignmentProperty =
+            AvaloniaProperty.Register<Layoutable, HorizontalAlignment>(nameof(HorizontalAlignment));
+
+        /// <summary>
+        /// Defines the <see cref="VerticalAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<VerticalAlignment> VerticalAlignmentProperty =
+            AvaloniaProperty.Register<Layoutable, VerticalAlignment>(nameof(VerticalAlignment));
+
+        /// <summary>
+        /// Defines the <see cref="UseLayoutRoundingProperty"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> UseLayoutRoundingProperty =
+            AvaloniaProperty.Register<Layoutable, bool>(nameof(UseLayoutRounding), defaultValue: true, inherits: true);
+
+        private bool _measuring;
+        private Size? _previousMeasure;
+        private Rect? _previousArrange;
+        private EventHandler<EffectiveViewportChangedEventArgs>? _effectiveViewportChanged;
+        private EventHandler? _layoutUpdated;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="Layoutable"/> class.
+        /// </summary>
+        static Layoutable()
+        {
+            AffectsMeasure<Layoutable>(
+                WidthProperty,
+                HeightProperty,
+                MinWidthProperty,
+                MaxWidthProperty,
+                MinHeightProperty,
+                MaxHeightProperty,
+                MarginProperty,
+                HorizontalAlignmentProperty,
+                VerticalAlignmentProperty);
+        }
+
+        /// <summary>
+        /// Occurs when the element's effective viewport changes.
+        /// </summary>
+        public event EventHandler<EffectiveViewportChangedEventArgs>? EffectiveViewportChanged
+        {
+            add
+            {
+                if (_effectiveViewportChanged is null && VisualRoot is ILayoutRoot r)
+                {
+                    r.LayoutManager.RegisterEffectiveViewportListener(this);
+                }
+
+                _effectiveViewportChanged += value;
+            }
+
+            remove
+            {
+                _effectiveViewportChanged -= value;
+
+                if (_effectiveViewportChanged is null && VisualRoot is ILayoutRoot r)
+                {
+                    r.LayoutManager.UnregisterEffectiveViewportListener(this);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when a layout pass completes for the control.
+        /// </summary>
+        public event EventHandler? LayoutUpdated
+        {
+            add
+            {
+                if (_layoutUpdated is null && VisualRoot is ILayoutRoot r)
+                {
+                    r.LayoutManager.LayoutUpdated += LayoutManagedLayoutUpdated;
+                }
+
+                _layoutUpdated += value;
+            }
+
+            remove
+            {
+                _layoutUpdated -= value;
+
+                if (_layoutUpdated is null && VisualRoot is ILayoutRoot r)
+                {
+                    r.LayoutManager.LayoutUpdated -= LayoutManagedLayoutUpdated;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the width of the element.
+        /// </summary>
+        public double Width
+        {
+            get { return GetValue(WidthProperty); }
+            set { SetValue(WidthProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the height of the element.
+        /// </summary>
+        public double Height
+        {
+            get { return GetValue(HeightProperty); }
+            set { SetValue(HeightProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum width of the element.
+        /// </summary>
+        public double MinWidth
+        {
+            get { return GetValue(MinWidthProperty); }
+            set { SetValue(MinWidthProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum width of the element.
+        /// </summary>
+        public double MaxWidth
+        {
+            get { return GetValue(MaxWidthProperty); }
+            set { SetValue(MaxWidthProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum height of the element.
+        /// </summary>
+        public double MinHeight
+        {
+            get { return GetValue(MinHeightProperty); }
+            set { SetValue(MinHeightProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum height of the element.
+        /// </summary>
+        public double MaxHeight
+        {
+            get { return GetValue(MaxHeightProperty); }
+            set { SetValue(MaxHeightProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the margin around the element.
+        /// </summary>
+        public Thickness Margin
+        {
+            get { return GetValue(MarginProperty); }
+            set { SetValue(MarginProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the element's preferred horizontal alignment in its parent.
+        /// </summary>
+        public HorizontalAlignment HorizontalAlignment
+        {
+            get { return GetValue(HorizontalAlignmentProperty); }
+            set { SetValue(HorizontalAlignmentProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the element's preferred vertical alignment in its parent.
+        /// </summary>
+        public VerticalAlignment VerticalAlignment
+        {
+            get { return GetValue(VerticalAlignmentProperty); }
+            set { SetValue(VerticalAlignmentProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the size that this element computed during the measure pass of the layout process.
+        /// </summary>
+        public Size DesiredSize
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the control's layout measure is valid.
+        /// </summary>
+        public bool IsMeasureValid
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the control's layouts arrange is valid.
+        /// </summary>
+        public bool IsArrangeValid
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines whether the element should be snapped to pixel
+        /// boundaries at layout time.
+        /// </summary>
+        public bool UseLayoutRounding
+        {
+            get { return GetValue(UseLayoutRoundingProperty); }
+            set { SetValue(UseLayoutRoundingProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the available size passed in the previous layout pass, if any.
+        /// </summary>
+        Size? ILayoutable.PreviousMeasure => _previousMeasure;
+
+        /// <summary>
+        /// Gets the layout rect passed in the previous layout pass, if any.
+        /// </summary>
+        Rect? ILayoutable.PreviousArrange => _previousArrange;
+
+        /// <summary>
+        /// Creates the visual children of the control, if necessary
+        /// </summary>
+        public virtual void ApplyTemplate()
+        {
+        }
+
+        /// <summary>
+        /// Carries out a measure of the control.
+        /// </summary>
+        /// <param name="availableSize">The available size for the control.</param>
+        public void Measure(Size availableSize)
+        {
+            if (double.IsNaN(availableSize.Width) || double.IsNaN(availableSize.Height))
+            {
+                throw new InvalidOperationException("Cannot call Measure using a size with NaN values.");
+            }
+
+            if (!IsMeasureValid || _previousMeasure != availableSize)
+            {
+                var previousDesiredSize = DesiredSize;
+                var desiredSize = default(Size);
+
+                IsMeasureValid = true;
+
+                try
+                {
+                    _measuring = true;
+                    desiredSize = MeasureCore(availableSize);
+                }
+                finally
+                {
+                    _measuring = false;
+                }
+
+                if (IsInvalidSize(desiredSize))
+                {
+                    throw new InvalidOperationException("Invalid size returned for Measure.");
+                }
+
+                DesiredSize = desiredSize;
+                _previousMeasure = availableSize;
+
+                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Measure requested {DesiredSize}", DesiredSize);
+
+                if (DesiredSize != previousDesiredSize)
+                {
+                    this.GetVisualParent<ILayoutable>()?.ChildDesiredSizeChanged(this);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Arranges the control and its children.
+        /// </summary>
+        /// <param name="rect">The control's new bounds.</param>
+        public void Arrange(Rect rect)
+        {
+            if (IsInvalidRect(rect))
+            {
+                throw new InvalidOperationException("Invalid Arrange rectangle.");
+            }
+
+            if (!IsMeasureValid)
+            {
+                Measure(_previousMeasure ?? rect.Size);
+            }
+
+            if (!IsArrangeValid || _previousArrange != rect)
+            {
+                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Arrange to {Rect} ", rect);
+
+                IsArrangeValid = true;
+                ArrangeCore(rect);
+                _previousArrange = rect;
+            }
+        }
+
+        /// <summary>
+        /// Invalidates the measurement of the control and queues a new layout pass.
+        /// </summary>
+        public void InvalidateMeasure()
+        {
+            if (IsMeasureValid)
+            {
+                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Invalidated measure");
+
+                IsMeasureValid = false;
+                IsArrangeValid = false;
+
+                if (((ILayoutable)this).IsAttachedToVisualTree)
+                {
+                    (VisualRoot as ILayoutRoot)?.LayoutManager.InvalidateMeasure(this);
+                    InvalidateVisual();
+                }
+                OnMeasureInvalidated();
+            }
+        }
+
+        /// <summary>
+        /// Invalidates the arrangement of the control and queues a new layout pass.
+        /// </summary>
+        public void InvalidateArrange()
+        {
+            if (IsArrangeValid)
+            {
+                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Invalidated arrange");
+
+                IsArrangeValid = false;
+                (VisualRoot as ILayoutRoot)?.LayoutManager?.InvalidateArrange(this);
+                InvalidateVisual();
+            }
+        }
+
+        /// <inheritdoc/>
+        void ILayoutable.ChildDesiredSizeChanged(ILayoutable control)
+        {
+            if (!_measuring)
+            {
+                InvalidateMeasure();
+            }
+        }
+
+        void ILayoutable.EffectiveViewportChanged(EffectiveViewportChangedEventArgs e)
+        {
+            _effectiveViewportChanged?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Marks a property as affecting the control's measurement.
+        /// </summary>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a control's static constructor, any change to the
+        /// property will cause <see cref="InvalidateMeasure"/> to be called on the element.
+        /// </remarks>
+        [Obsolete("Use AffectsMeasure<T> and specify the control type.")]
+        protected static void AffectsMeasure(params AvaloniaProperty[] properties)
+        {
+            AffectsMeasure<Layoutable>(properties);
+        }
+
+        /// <summary>
+        /// Marks a property as affecting the control's measurement.
+        /// </summary>
+        /// <typeparam name="T">The control which the property affects.</typeparam>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a control's static constructor, any change to the
+        /// property will cause <see cref="InvalidateMeasure"/> to be called on the element.
+        /// </remarks>
+        protected static void AffectsMeasure<T>(params AvaloniaProperty[] properties)
+            where T : class, ILayoutable
+        {
+            void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                (e.Sender as T)?.InvalidateMeasure();
+            }
+
+            foreach (var property in properties)
+            {
+                property.Changed.Subscribe(Invalidate);
+            }
+        }
+
+        /// <summary>
+        /// Marks a property as affecting the control's arrangement.
+        /// </summary>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a control's static constructor, any change to the
+        /// property will cause <see cref="InvalidateArrange"/> to be called on the element.
+        /// </remarks>
+        [Obsolete("Use AffectsArrange<T> and specify the control type.")]
+        protected static void AffectsArrange(params AvaloniaProperty[] properties)
+        {
+            AffectsArrange<Layoutable>(properties);
+        }
+
+        /// <summary>
+        /// Marks a property as affecting the control's arrangement.
+        /// </summary>
+        /// <typeparam name="T">The control which the property affects.</typeparam>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a control's static constructor, any change to the
+        /// property will cause <see cref="InvalidateArrange"/> to be called on the element.
+        /// </remarks>
+        protected static void AffectsArrange<T>(params AvaloniaProperty[] properties)
+            where T : class, ILayoutable
+        {
+            void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                (e.Sender as T)?.InvalidateArrange();
+            }
+
+            foreach (var property in properties)
+            {
+                property.Changed.Subscribe(Invalidate);
+            }
+        }
+
+        /// <summary>
+        /// The default implementation of the control's measure pass.
+        /// </summary>
+        /// <param name="availableSize">The size available to the control.</param>
+        /// <returns>The desired size for the control.</returns>
+        /// <remarks>
+        /// This method calls <see cref="MeasureOverride(Size)"/> which is probably the method you
+        /// want to override in order to modify a control's arrangement.
+        /// </remarks>
+        protected virtual Size MeasureCore(Size availableSize)
+        {
+            if (IsVisible)
+            {
+                var margin = Margin;
+
+                ApplyStyling();
+                ApplyTemplate();
+
+                var constrained = LayoutHelper.ApplyLayoutConstraints(
+                    this,
+                    availableSize.Deflate(margin));
+                var measured = MeasureOverride(constrained);
+
+                var width = measured.Width;
+                var height = measured.Height;
+
+                {
+                    double widthCache = Width;
+
+                    if (!double.IsNaN(widthCache))
+                    {
+                        width = widthCache;
+                    }
+                }
+
+                width = Math.Min(width, MaxWidth);
+                width = Math.Max(width, MinWidth);
+
+                {
+                    double heightCache = Height;
+
+                    if (!double.IsNaN(heightCache))
+                    {
+                        height = heightCache;
+                    }
+                }
+
+                height = Math.Min(height, MaxHeight);
+                height = Math.Max(height, MinHeight);
+
+                width = Math.Min(width, availableSize.Width);
+                height = Math.Min(height, availableSize.Height);
+
+                if (UseLayoutRounding)
+                {
+                    var scale = LayoutHelper.GetLayoutScale(this);
+                    width = LayoutHelper.RoundLayoutValue(width, scale);
+                    height = LayoutHelper.RoundLayoutValue(height, scale);
+                }
+
+                return NonNegative(new Size(width, height).Inflate(margin));
+            }
+            else
+            {
+                return new Size();
+            }
+        }
+
+        /// <summary>
+        /// Measures the control and its child elements as part of a layout pass.
+        /// </summary>
+        /// <param name="availableSize">The size available to the control.</param>
+        /// <returns>The desired size for the control.</returns>
+        protected virtual Size MeasureOverride(Size availableSize)
+        {
+            double width = 0;
+            double height = 0;
+
+            var visualChildren = VisualChildren;
+            var visualCount = visualChildren.Count;
+
+            for (var i = 0; i < visualCount; i++)
+            {
+                IVisual visual = visualChildren[i];
+
+                if (visual is ILayoutable layoutable)
+                {
+                    layoutable.Measure(availableSize);
+                    width = Math.Max(width, layoutable.DesiredSize.Width);
+                    height = Math.Max(height, layoutable.DesiredSize.Height);
+                }
+            }
+
+            return new Size(width, height);
+        }
+
+        /// <summary>
+        /// The default implementation of the control's arrange pass.
+        /// </summary>
+        /// <param name="finalRect">The control's new bounds.</param>
+        /// <remarks>
+        /// This method calls <see cref="ArrangeOverride(Size)"/> which is probably the method you
+        /// want to override in order to modify a control's arrangement.
+        /// </remarks>
+        protected virtual void ArrangeCore(Rect finalRect)
+        {
+            if (IsVisible)
+            {
+                var useLayoutRounding = UseLayoutRounding;
+                var scale = LayoutHelper.GetLayoutScale(this);
+
+                var margin = Margin;
+                var originX = finalRect.X + margin.Left;
+                var originY = finalRect.Y + margin.Top;
+
+                // Margin has to be treated separately because the layout rounding function is not linear
+                // f(a + b) != f(a) + f(b)
+                // If the margin isn't pre-rounded some sizes will be offset by 1 pixel in certain scales.
+                if (useLayoutRounding)
+                {
+                    margin = LayoutHelper.RoundLayoutThickness(margin, scale, scale);
+                }
+
+                var availableSizeMinusMargins = new Size(
+                    Math.Max(0, finalRect.Width - margin.Left - margin.Right),
+                    Math.Max(0, finalRect.Height - margin.Top - margin.Bottom));
+                var horizontalAlignment = HorizontalAlignment;
+                var verticalAlignment = VerticalAlignment;
+                var size = availableSizeMinusMargins;
+
+                if (horizontalAlignment != HorizontalAlignment.Stretch)
+                {
+                    size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - margin.Left - margin.Right));
+                }
+
+                if (verticalAlignment != VerticalAlignment.Stretch)
+                {
+                    size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - margin.Top - margin.Bottom));
+                }
+
+                size = LayoutHelper.ApplyLayoutConstraints(this, size);
+
+                if (useLayoutRounding)
+                {
+                    size = LayoutHelper.RoundLayoutSize(size, scale, scale);
+                    availableSizeMinusMargins = LayoutHelper.RoundLayoutSize(availableSizeMinusMargins, scale, scale);
+                }
+
+                size = ArrangeOverride(size).Constrain(size);
+
+                switch (horizontalAlignment)
+                {
+                    case HorizontalAlignment.Center:
+                    case HorizontalAlignment.Stretch:
+                        originX += (availableSizeMinusMargins.Width - size.Width) / 2;
+                        break;
+                    case HorizontalAlignment.Right:
+                        originX += availableSizeMinusMargins.Width - size.Width;
+                        break;
+                }
+
+                switch (verticalAlignment)
+                {
+                    case VerticalAlignment.Center:
+                    case VerticalAlignment.Stretch:
+                        originY += (availableSizeMinusMargins.Height - size.Height) / 2;
+                        break;
+                    case VerticalAlignment.Bottom:
+                        originY += availableSizeMinusMargins.Height - size.Height;
+                        break;
+                }
+
+                if (useLayoutRounding)
+                {
+                    originX = LayoutHelper.RoundLayoutValue(originX, scale);
+                    originY = LayoutHelper.RoundLayoutValue(originY, scale);
+                }
+
+                Bounds = new Rect(originX, originY, size.Width, size.Height);
+            }
+        }
+
+        /// <summary>
+        /// Positions child elements as part of a layout pass.
+        /// </summary>
+        /// <param name="finalSize">The size available to the control.</param>
+        /// <returns>The actual size used.</returns>
+        protected virtual Size ArrangeOverride(Size finalSize)
+        {
+            var arrangeRect = new Rect(finalSize);
+
+            var visualChildren = VisualChildren;
+            var visualCount = visualChildren.Count;
+
+            for (var i = 0; i < visualCount; i++)
+            {
+                IVisual visual = visualChildren[i];
+
+                if (visual is ILayoutable layoutable)
+                {
+                    layoutable.Arrange(arrangeRect);
+                }
+            }
+
+            return finalSize;
+        }
+
+        protected sealed override void InvalidateStyles()
+        {
+            base.InvalidateStyles();
+            InvalidateMeasure();
+        }
+
+        protected override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTreeCore(e);
+
+            if (e.Root is ILayoutRoot r)
+            {
+                if (_layoutUpdated is object)
+                {
+                    r.LayoutManager.LayoutUpdated += LayoutManagedLayoutUpdated;
+                }
+
+                if (_effectiveViewportChanged is object)
+                {
+                    r.LayoutManager.RegisterEffectiveViewportListener(this);
+                }
+            }
+        }
+
+        protected override void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            if (e.Root is ILayoutRoot r)
+            {
+                if (_layoutUpdated is object)
+                {
+                    r.LayoutManager.LayoutUpdated -= LayoutManagedLayoutUpdated;
+                }
+
+                if (_effectiveViewportChanged is object)
+                {
+                    r.LayoutManager.UnregisterEffectiveViewportListener(this);
+                }
+            }
+
+            base.OnDetachedFromVisualTreeCore(e);
+        }
+
+        /// <summary>
+        /// Called by InvalidateMeasure
+        /// </summary>
+        protected virtual void OnMeasureInvalidated()
+        {
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == IsVisibleProperty)
+            {
+                DesiredSize = default;
+
+                // All changes to visibility cause the parent element to be notified.
+                this.GetVisualParent<ILayoutable>()?.ChildDesiredSizeChanged(this);
+
+                // We only invalidate outselves when visibility is changed to true.
+                if (change.GetNewValue<bool>())
+                {
+                    InvalidateMeasure();
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        protected sealed override void OnVisualParentChanged(IVisual? oldParent, IVisual? newParent)
+        {
+            LayoutHelper.InvalidateSelfAndChildrenMeasure(this);
+
+            base.OnVisualParentChanged(oldParent, newParent);
+        }
+
+        /// <summary>
+        /// Called when the layout manager raises a LayoutUpdated event.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private void LayoutManagedLayoutUpdated(object? sender, EventArgs e) => _layoutUpdated?.Invoke(this, e);
+
+        /// <summary>
+        /// Tests whether any of a <see cref="Rect"/>'s properties include negative values,
+        /// a NaN or Infinity.
+        /// </summary>
+        /// <param name="rect">The rect.</param>
+        /// <returns>True if the rect is invalid; otherwise false.</returns>
+        private static bool IsInvalidRect(Rect rect)
+        {
+            return rect.Width < 0 || rect.Height < 0 ||
+                double.IsInfinity(rect.X) || double.IsInfinity(rect.Y) ||
+                double.IsInfinity(rect.Width) || double.IsInfinity(rect.Height) ||
+                double.IsNaN(rect.X) || double.IsNaN(rect.Y) ||
+                double.IsNaN(rect.Width) || double.IsNaN(rect.Height);
+        }
+
+        /// <summary>
+        /// Tests whether any of a <see cref="Size"/>'s properties include negative values,
+        /// a NaN or Infinity.
+        /// </summary>
+        /// <param name="size">The size.</param>
+        /// <returns>True if the size is invalid; otherwise false.</returns>
+        private static bool IsInvalidSize(Size size)
+        {
+            return size.Width < 0 || size.Height < 0 ||
+                double.IsInfinity(size.Width) || double.IsInfinity(size.Height) ||
+                double.IsNaN(size.Width) || double.IsNaN(size.Height);
+        }
+
+        /// <summary>
+        /// Ensures neither component of a <see cref="Size"/> is negative.
+        /// </summary>
+        /// <param name="size">The size.</param>
+        /// <returns>The non-negative size.</returns>
+        private static Size NonNegative(Size size)
+        {
+            return new Size(Math.Max(size.Width, 0), Math.Max(size.Height, 0));
+        }
+    }
+}
diff --git a/src/Avalonia.Layout/NonVirtualizingLayout.cs b/src/Avalonia.Base/Layout/NonVirtualizingLayout.cs
similarity index 100%
rename from src/Avalonia.Layout/NonVirtualizingLayout.cs
rename to src/Avalonia.Base/Layout/NonVirtualizingLayout.cs
diff --git a/src/Avalonia.Layout/NonVirtualizingLayoutContext.cs b/src/Avalonia.Base/Layout/NonVirtualizingLayoutContext.cs
similarity index 100%
rename from src/Avalonia.Layout/NonVirtualizingLayoutContext.cs
rename to src/Avalonia.Base/Layout/NonVirtualizingLayoutContext.cs
diff --git a/src/Avalonia.Layout/NonVirtualizingStackLayout.cs b/src/Avalonia.Base/Layout/NonVirtualizingStackLayout.cs
similarity index 100%
rename from src/Avalonia.Layout/NonVirtualizingStackLayout.cs
rename to src/Avalonia.Base/Layout/NonVirtualizingStackLayout.cs
diff --git a/src/Avalonia.Layout/Orientation.cs b/src/Avalonia.Base/Layout/Orientation.cs
similarity index 100%
rename from src/Avalonia.Layout/Orientation.cs
rename to src/Avalonia.Base/Layout/Orientation.cs
diff --git a/src/Avalonia.Layout/OrientationBasedMeasures.cs b/src/Avalonia.Base/Layout/OrientationBasedMeasures.cs
similarity index 100%
rename from src/Avalonia.Layout/OrientationBasedMeasures.cs
rename to src/Avalonia.Base/Layout/OrientationBasedMeasures.cs
diff --git a/src/Avalonia.Base/Layout/StackLayout.cs b/src/Avalonia.Base/Layout/StackLayout.cs
new file mode 100644
index 0000000000..00ac4a37f0
--- /dev/null
+++ b/src/Avalonia.Base/Layout/StackLayout.cs
@@ -0,0 +1,363 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+using System.Collections.Specialized;
+using Avalonia.Data;
+using Avalonia.Logging;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Arranges elements into a single line (with spacing) that can be oriented horizontally or vertically.
+    /// </summary>
+    public class StackLayout : VirtualizingLayout, IFlowLayoutAlgorithmDelegates
+    {
+        /// <summary>
+        /// Defines the <see cref="DisableVirtualization"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> DisableVirtualizationProperty =
+            AvaloniaProperty.Register<StackLayout, bool>(nameof(DisableVirtualization));
+
+        /// <summary>
+        /// Defines the <see cref="Orientation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Orientation> OrientationProperty =
+            AvaloniaProperty.Register<StackLayout, Orientation>(nameof(Orientation), Orientation.Vertical);
+
+        /// <summary>
+        /// Defines the <see cref="Spacing"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> SpacingProperty =
+            AvaloniaProperty.Register<StackLayout, double>(nameof(Spacing));
+
+        private readonly OrientationBasedMeasures _orientation = new OrientationBasedMeasures();
+
+        /// <summary>
+        /// Initializes a new instance of the StackLayout class.
+        /// </summary>
+        public StackLayout()
+        {
+            LayoutId = "StackLayout";
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether virtualization is disabled on the layout.
+        /// </summary>
+        public bool DisableVirtualization
+        {
+            get => GetValue(DisableVirtualizationProperty);
+            set => SetValue(DisableVirtualizationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the axis along which items are laid out.
+        /// </summary>
+        /// <value>
+        /// One of the enumeration values that specifies the axis along which items are laid out.
+        /// The default is Vertical.
+        /// </value>
+        public Orientation Orientation
+        {
+            get => GetValue(OrientationProperty);
+            set => SetValue(OrientationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a uniform distance (in pixels) between stacked items. It is applied in the
+        /// direction of the StackLayout's Orientation.
+        /// </summary>
+        public double Spacing
+        {
+            get => GetValue(SpacingProperty);
+            set => SetValue(SpacingProperty, value);
+        }
+
+        internal Rect GetExtent(
+            Size availableSize,
+            VirtualizingLayoutContext context,
+            ILayoutable? firstRealized,
+            int firstRealizedItemIndex,
+            Rect firstRealizedLayoutBounds,
+            ILayoutable? lastRealized,
+            int lastRealizedItemIndex,
+            Rect lastRealizedLayoutBounds)
+        {
+            var extent = new Rect();
+
+            // Constants
+            int itemsCount = context.ItemCount;
+            var stackState = (StackLayoutState)context.LayoutState!;
+            double averageElementSize = GetAverageElementSize(availableSize, context, stackState) + Spacing;
+
+            _orientation.SetMinorSize(ref extent, stackState.MaxArrangeBounds);
+            _orientation.SetMajorSize(ref extent, Math.Max(0.0f, itemsCount * averageElementSize - Spacing));
+            if (itemsCount > 0)
+            {
+                if (firstRealized != null)
+                {
+                    _orientation.SetMajorStart(
+                        ref extent,
+                        _orientation.MajorStart(firstRealizedLayoutBounds) - firstRealizedItemIndex * averageElementSize);
+                    var remainingItems = itemsCount - lastRealizedItemIndex - 1;
+                    _orientation.SetMajorSize(
+                        ref extent,
+                        _orientation.MajorEnd(lastRealizedLayoutBounds) -
+                            _orientation.MajorStart(extent) + 
+                            (remainingItems * averageElementSize));
+                }
+                else
+                {
+                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Estimating extent with no realized elements",
+                        LayoutId);
+                }
+            }
+
+            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Extent is ({Size}). Based on average {Average}",
+                LayoutId, extent.Size, averageElementSize);
+            return extent;
+        }
+
+        internal void OnElementMeasured(
+            ILayoutable element,
+            int index,
+            Size availableSize,
+            Size measureSize,
+            Size desiredSize,
+            Size provisionalArrangeSize,
+            VirtualizingLayoutContext context)
+        {
+            if (context is VirtualizingLayoutContext virtualContext)
+            {
+                var stackState = (StackLayoutState)virtualContext.LayoutState!;
+                var provisionalArrangeSizeWinRt = provisionalArrangeSize;
+                stackState.OnElementMeasured(
+                    index,
+                    _orientation.Major(provisionalArrangeSizeWinRt),
+                    _orientation.Minor(provisionalArrangeSizeWinRt));
+            }
+        }
+
+        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetMeasureSize(
+            int index,
+            Size availableSize,
+            VirtualizingLayoutContext context) => availableSize;
+
+        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetProvisionalArrangeSize(
+            int index,
+            Size measureSize,
+            Size desiredSize,
+            VirtualizingLayoutContext context)
+        {
+            var measureSizeMinor = _orientation.Minor(measureSize);
+            return _orientation.MinorMajorSize(
+                !double.IsInfinity(measureSizeMinor) ?
+                    Math.Max(measureSizeMinor, _orientation.Minor(desiredSize)) :
+                    _orientation.Minor(desiredSize),
+                _orientation.Major(desiredSize));
+        }
+
+        bool IFlowLayoutAlgorithmDelegates.Algorithm_ShouldBreakLine(int index, double remainingSpace) => true;
+
+        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForRealizationRect(
+            Size availableSize,
+            VirtualizingLayoutContext context) => GetAnchorForRealizationRect(availableSize, context);
+
+        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForTargetElement(
+            int targetIndex,
+            Size availableSize,
+            VirtualizingLayoutContext context)
+        {
+            double offset = double.NaN;
+            int index = -1;
+            int itemsCount = context.ItemCount;
+
+            if (targetIndex >= 0 && targetIndex < itemsCount)
+            {
+                index = targetIndex;
+                var state = (StackLayoutState)context.LayoutState!;
+                double averageElementSize = GetAverageElementSize(availableSize, context, state) + Spacing;
+                offset = index * averageElementSize + _orientation.MajorStart(state.FlowAlgorithm.LastExtent);
+            }
+
+            return new FlowLayoutAnchorInfo { Index = index, Offset = offset };
+        }
+
+        Rect IFlowLayoutAlgorithmDelegates.Algorithm_GetExtent(
+            Size availableSize,
+            VirtualizingLayoutContext context,
+            ILayoutable? firstRealized,
+            int firstRealizedItemIndex,
+            Rect firstRealizedLayoutBounds,
+            ILayoutable? lastRealized,
+            int lastRealizedItemIndex,
+            Rect lastRealizedLayoutBounds)
+        {
+            return GetExtent(
+                availableSize,
+                context,
+                firstRealized,
+                firstRealizedItemIndex,
+                firstRealizedLayoutBounds,
+                lastRealized,
+                lastRealizedItemIndex,
+                lastRealizedLayoutBounds);
+        }
+
+        void IFlowLayoutAlgorithmDelegates.Algorithm_OnElementMeasured(ILayoutable element, int index, Size availableSize, Size measureSize, Size desiredSize, Size provisionalArrangeSize, VirtualizingLayoutContext context)
+        {
+            OnElementMeasured(
+                element,
+                index,
+                availableSize,
+                measureSize,
+                desiredSize,
+                provisionalArrangeSize,
+                context);
+        }
+
+        void IFlowLayoutAlgorithmDelegates.Algorithm_OnLineArranged(int startIndex, int countInLine, double lineSize, VirtualizingLayoutContext context)
+        {
+        }
+
+        internal FlowLayoutAnchorInfo GetAnchorForRealizationRect(
+            Size availableSize,
+            VirtualizingLayoutContext context)
+        {
+            int anchorIndex = -1;
+            double offset = double.NaN;
+
+            // Constants
+            int itemsCount = context.ItemCount;
+            if (itemsCount > 0)
+            {
+                var realizationRect = context.RealizationRect;
+                var state = (StackLayoutState)context.LayoutState!;
+                var lastExtent = state.FlowAlgorithm.LastExtent;
+
+                double averageElementSize = GetAverageElementSize(availableSize, context, state) + Spacing;
+                double realizationWindowOffsetInExtent = _orientation.MajorStart(realizationRect) - _orientation.MajorStart(lastExtent);
+                double majorSize = _orientation.MajorSize(lastExtent) == 0 ? Math.Max(0.0, averageElementSize * itemsCount - Spacing) : _orientation.MajorSize(lastExtent);
+                if (itemsCount > 0 &&
+                    _orientation.MajorSize(realizationRect) >= 0 &&
+                    // MajorSize = 0 will account for when a nested repeater is outside the realization rect but still being measured. Also,
+                    // note that if we are measuring this repeater, then we are already realizing an element to figure out the size, so we could
+                    // just keep that element alive. It also helps in XYFocus scenarios to have an element realized for XYFocus to find a candidate
+                    // in the navigating direction.
+                    realizationWindowOffsetInExtent + _orientation.MajorSize(realizationRect) >= 0 && realizationWindowOffsetInExtent <= majorSize)
+                {
+                    anchorIndex = (int) (realizationWindowOffsetInExtent / averageElementSize);
+                    anchorIndex = Math.Max(0, Math.Min(itemsCount - 1, anchorIndex));
+                    offset = anchorIndex* averageElementSize + _orientation.MajorStart(lastExtent);
+                }
+        }
+
+            return new FlowLayoutAnchorInfo { Index = anchorIndex, Offset = offset, };
+        }
+
+        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
+        {
+            var state = context.LayoutState;
+            var stackState = state as StackLayoutState;
+            
+            if (stackState == null)
+            {
+                if (state != null)
+                {
+                    throw new InvalidOperationException("LayoutState must derive from StackLayoutState.");
+                }
+
+                // Custom deriving layouts could potentially be stateful.
+                // If that is the case, we will just create the base state required by UniformGridLayout ourselves.
+                stackState = new StackLayoutState();
+            }
+
+            stackState.InitializeForContext(context, this);
+        }
+
+        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
+        {
+            var stackState = (StackLayoutState)context.LayoutState!;
+            stackState.UninitializeForContext(context);
+        }
+
+        protected internal override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
+        {
+            ((StackLayoutState)context.LayoutState!).OnMeasureStart();
+
+            var desiredSize = GetFlowAlgorithm(context).Measure(
+                availableSize,
+                context,
+                false,
+                0,
+                Spacing,
+                int.MaxValue,
+                _orientation.ScrollOrientation,
+                DisableVirtualization,
+                LayoutId);
+
+            return new Size(desiredSize.Width, desiredSize.Height);
+        }
+
+        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
+        {
+            var value = GetFlowAlgorithm(context).Arrange(
+               finalSize,
+               context,
+               false,
+               FlowLayoutAlgorithm.LineAlignment.Start,
+               LayoutId);
+
+            return new Size(value.Width, value.Height);
+        }
+
+        protected internal override void OnItemsChangedCore(VirtualizingLayoutContext context, object? source, NotifyCollectionChangedEventArgs args)
+        {
+            GetFlowAlgorithm(context).OnItemsSourceChanged(source, args, context);
+            // Always invalidate layout to keep the view accurate.
+            InvalidateLayout();
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (change.Property == OrientationProperty)
+            {
+                var orientation = change.GetNewValue<Orientation>();
+
+                //Note: For StackLayout Vertical Orientation means we have a Vertical ScrollOrientation.
+                //Horizontal Orientation means we have a Horizontal ScrollOrientation.
+                _orientation.ScrollOrientation = orientation == Orientation.Horizontal ? ScrollOrientation.Horizontal : ScrollOrientation.Vertical;
+            }
+
+            InvalidateLayout();
+        }
+
+        private double GetAverageElementSize(
+            Size availableSize,
+            VirtualizingLayoutContext context,
+            StackLayoutState stackLayoutState)
+        {
+            double averageElementSize = 0;
+
+            if (context.ItemCount > 0)
+            {
+                if (stackLayoutState.TotalElementsMeasured == 0)
+                {
+                    var tmpElement = context.GetOrCreateElementAt(0, ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle);
+                    stackLayoutState.FlowAlgorithm.MeasureElement(tmpElement, 0, availableSize, context);
+                    context.RecycleElement(tmpElement);
+                }
+
+                averageElementSize = Math.Round(stackLayoutState.TotalElementSize / stackLayoutState.TotalElementsMeasured);
+            }
+
+            return averageElementSize;
+        }
+
+        private void InvalidateLayout() => InvalidateMeasure();
+
+        private FlowLayoutAlgorithm GetFlowAlgorithm(VirtualizingLayoutContext context) => ((StackLayoutState)context.LayoutState!).FlowAlgorithm;
+    }
+}
diff --git a/src/Avalonia.Layout/StackLayoutState.cs b/src/Avalonia.Base/Layout/StackLayoutState.cs
similarity index 100%
rename from src/Avalonia.Layout/StackLayoutState.cs
rename to src/Avalonia.Base/Layout/StackLayoutState.cs
diff --git a/src/Avalonia.Base/Layout/UniformGridLayout.cs b/src/Avalonia.Base/Layout/UniformGridLayout.cs
new file mode 100644
index 0000000000..47c994a350
--- /dev/null
+++ b/src/Avalonia.Base/Layout/UniformGridLayout.cs
@@ -0,0 +1,561 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+using System.Collections.Specialized;
+using Avalonia.Data;
+using Avalonia.Logging;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Defines constants that specify how items are aligned on the non-scrolling or non-virtualizing axis.
+    /// </summary>
+    public enum UniformGridLayoutItemsJustification
+    {
+        /// <summary>
+        /// Items are aligned with the start of the row or column, with extra space at the end.
+        /// Spacing between items does not change.
+        /// </summary>
+        Start = 0,
+
+        /// <summary>
+        /// Items are aligned in the center of the row or column, with extra space at the start and
+        /// end. Spacing between items does not change.
+        /// </summary>
+        Center = 1,
+
+        /// <summary>
+        /// Items are aligned with the end of the row or column, with extra space at the start.
+        /// Spacing between items does not change.
+        /// </summary>
+        End = 2,
+
+        /// <summary>
+        /// Items are aligned so that extra space is added evenly before and after each item.
+        /// </summary>
+        SpaceAround = 3,
+
+        /// <summary>
+        /// Items are aligned so that extra space is added evenly between adjacent items. No space
+        /// is added at the start or end.
+        /// </summary>
+        SpaceBetween = 4,
+
+        SpaceEvenly = 5,
+    };
+
+    /// <summary>
+    /// Defines constants that specify how items are sized to fill the available space.
+    /// </summary>
+    public enum UniformGridLayoutItemsStretch
+    {
+        /// <summary>
+        /// The item retains its natural size. Use of extra space is determined by the
+        /// <see cref="UniformGridLayout.ItemsJustification"/> property.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// The item is sized to fill the available space in the non-scrolling direction. Item size
+        /// in the scrolling direction is not changed.
+        /// </summary>
+        Fill = 1,
+
+        /// <summary>
+        /// The item is sized to both fill the available space in the non-scrolling direction and
+        /// maintain its aspect ratio.
+        /// </summary>
+        Uniform = 2,
+    };
+
+    /// <summary>
+    /// Positions elements sequentially from left to right or top to bottom in a wrapping layout.
+    /// </summary>
+    public class UniformGridLayout : VirtualizingLayout, IFlowLayoutAlgorithmDelegates
+    {
+        /// <summary>
+        /// Defines the <see cref="ItemsJustification"/> property.
+        /// </summary>
+        public static readonly StyledProperty<UniformGridLayoutItemsJustification> ItemsJustificationProperty =
+            AvaloniaProperty.Register<UniformGridLayout, UniformGridLayoutItemsJustification>(nameof(ItemsJustification));
+
+        /// <summary>
+        /// Defines the <see cref="ItemsStretch"/> property.
+        /// </summary>
+        public static readonly StyledProperty<UniformGridLayoutItemsStretch> ItemsStretchProperty =
+            AvaloniaProperty.Register<UniformGridLayout, UniformGridLayoutItemsStretch>(nameof(ItemsStretch));
+
+        /// <summary>
+        /// Defines the <see cref="MinColumnSpacing"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinColumnSpacingProperty =
+            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinColumnSpacing));
+
+        /// <summary>
+        /// Defines the <see cref="MinItemHeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinItemHeightProperty =
+            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinItemHeight));
+
+        /// <summary>
+        /// Defines the <see cref="MinItemWidth"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinItemWidthProperty =
+            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinItemWidth));
+
+        /// <summary>
+        /// Defines the <see cref="MinRowSpacing"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinRowSpacingProperty =
+            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinRowSpacing));
+
+        /// <summary>
+        /// Defines the <see cref="MaximumRowsOrColumnsProperty"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MaximumRowsOrColumnsProperty =
+            AvaloniaProperty.Register<UniformGridLayout, int>(nameof(MaximumRowsOrColumns));
+
+        /// <summary>
+        /// Defines the <see cref="Orientation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Orientation> OrientationProperty =
+            StackLayout.OrientationProperty.AddOwner<UniformGridLayout>();
+
+        private readonly OrientationBasedMeasures _orientation = new OrientationBasedMeasures();
+        private double _minItemWidth = double.NaN;
+        private double _minItemHeight = double.NaN;
+        private double _minRowSpacing;
+        private double _minColumnSpacing;
+        private UniformGridLayoutItemsJustification _itemsJustification;
+        private UniformGridLayoutItemsStretch _itemsStretch;
+        private int _maximumRowsOrColumns = int.MaxValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UniformGridLayout"/> class.
+        /// </summary>
+        public UniformGridLayout()
+        {
+            LayoutId = "UniformGridLayout";
+        } 
+
+        static UniformGridLayout()
+        {
+            OrientationProperty.OverrideDefaultValue<UniformGridLayout>(Orientation.Horizontal);
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates how items are aligned on the non-scrolling or non-
+        /// virtualizing axis.
+        /// </summary>
+        /// <value>
+        /// An enumeration value that indicates how items are aligned. The default is Start.
+        /// </value>
+        public UniformGridLayoutItemsJustification ItemsJustification
+        {
+            get => GetValue(ItemsJustificationProperty);
+            set => SetValue(ItemsJustificationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates how items are sized to fill the available space.
+        /// </summary>
+        /// <value>
+        /// An enumeration value that indicates how items are sized to fill the available space.
+        /// The default is None.
+        /// </value>
+        /// <remarks>
+        /// This property enables adaptive layout behavior where the items are sized to fill the
+        /// available space along the non-scrolling axis, and optionally maintain their aspect ratio.
+        /// </remarks>
+        public UniformGridLayoutItemsStretch ItemsStretch
+        {
+            get => GetValue(ItemsStretchProperty);
+            set => SetValue(ItemsStretchProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum space between items on the horizontal axis.
+        /// </summary>
+        /// <remarks>
+        /// The spacing may exceed this minimum value when <see cref="ItemsJustification"/> is set
+        /// to SpaceEvenly, SpaceAround, or SpaceBetween.
+        /// </remarks>
+        public double MinColumnSpacing
+        {
+            get => GetValue(MinColumnSpacingProperty);
+            set => SetValue(MinColumnSpacingProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum height of each item.
+        /// </summary>
+        /// <value>
+        /// The minimum height (in pixels) of each item. The default is NaN, in which case the
+        /// height of the first item is used as the minimum.
+        /// </value>
+        public double MinItemHeight
+        {
+            get => GetValue(MinItemHeightProperty);
+            set => SetValue(MinItemHeightProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum width of each item.
+        /// </summary>
+        /// <value>
+        /// The minimum width (in pixels) of each item. The default is NaN, in which case the width
+        /// of the first item is used as the minimum.
+        /// </value>
+        public double MinItemWidth
+        {
+            get => GetValue(MinItemWidthProperty);
+            set => SetValue(MinItemWidthProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum space between items on the vertical axis.
+        /// </summary>
+        /// <remarks>
+        /// The spacing may exceed this minimum value when <see cref="ItemsJustification"/> is set
+        /// to SpaceEvenly, SpaceAround, or SpaceBetween.
+        /// </remarks>
+        public double MinRowSpacing
+        {
+            get => GetValue(MinRowSpacingProperty);
+            set => SetValue(MinRowSpacingProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum row or column count.
+        /// </summary>
+        public int MaximumRowsOrColumns
+        {
+            get => GetValue(MaximumRowsOrColumnsProperty);
+            set => SetValue(MaximumRowsOrColumnsProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the axis along which items are laid out.
+        /// </summary>
+        /// <value>
+        /// One of the enumeration values that specifies the axis along which items are laid out.
+        /// The default is Vertical.
+        /// </value>
+        public Orientation Orientation
+        {
+            get => GetValue(OrientationProperty);
+            set => SetValue(OrientationProperty, value);
+        }
+
+        internal double LineSpacing => Orientation == Orientation.Horizontal ? _minRowSpacing : _minColumnSpacing;
+        internal double MinItemSpacing => Orientation == Orientation.Horizontal ? _minColumnSpacing : _minRowSpacing;
+
+        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetMeasureSize(
+            int index,
+            Size availableSize,
+            VirtualizingLayoutContext context)
+        {
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            return new Size(gridState.EffectiveItemWidth, gridState.EffectiveItemHeight);
+        }
+
+        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetProvisionalArrangeSize(
+            int index,
+            Size measureSize,
+            Size desiredSize,
+            VirtualizingLayoutContext context)
+        {
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            return new Size(gridState.EffectiveItemWidth, gridState.EffectiveItemHeight);
+        }
+
+        bool IFlowLayoutAlgorithmDelegates.Algorithm_ShouldBreakLine(int index, double remainingSpace) => remainingSpace < 0;
+
+        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForRealizationRect(
+            Size availableSize,
+            VirtualizingLayoutContext context)
+        {
+            Rect bounds = new Rect(double.NaN, double.NaN, double.NaN, double.NaN);
+            int anchorIndex = -1;
+
+            int itemsCount = context.ItemCount;
+            var realizationRect = context.RealizationRect;
+            if (itemsCount > 0 && _orientation.MajorSize(realizationRect) > 0)
+            {
+                var gridState = (UniformGridLayoutState)context.LayoutState!;
+                var lastExtent = gridState.FlowAlgorithm.LastExtent;
+                var itemsPerLine = Math.Min( // note use of unsigned ints
+                    Math.Max(1u, (uint)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context))),
+                    Math.Max(1u, (uint)_maximumRowsOrColumns));
+                var majorSize = (itemsCount / itemsPerLine) * GetMajorSizeWithSpacing(context);
+                var realizationWindowStartWithinExtent = _orientation.MajorStart(realizationRect) - _orientation.MajorStart(lastExtent);
+                if ((realizationWindowStartWithinExtent + _orientation.MajorSize(realizationRect)) >= 0 && realizationWindowStartWithinExtent <= majorSize)
+                {
+                    double offset = Math.Max(0.0, _orientation.MajorStart(realizationRect) - _orientation.MajorStart(lastExtent));
+                    int anchorRowIndex = (int)(offset / GetMajorSizeWithSpacing(context));
+
+                    anchorIndex = (int)Math.Max(0, Math.Min(itemsCount - 1, anchorRowIndex * itemsPerLine));
+                    bounds = GetLayoutRectForDataIndex(availableSize, anchorIndex, lastExtent, context);
+                }
+            }
+
+            return new FlowLayoutAnchorInfo
+            {
+                Index = anchorIndex,
+                Offset = _orientation.MajorStart(bounds)
+            };
+        }
+
+        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForTargetElement(
+            int targetIndex,
+            Size availableSize,
+            VirtualizingLayoutContext context)
+        {
+            int index = -1;
+            double offset = double.NaN;
+            int count = context.ItemCount;
+            if (targetIndex >= 0 && targetIndex < count)
+            {
+                int itemsPerLine = (int)Math.Min( // note use of unsigned ints
+                    Math.Max(1u, (uint)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context))),
+                    Math.Max(1u, _maximumRowsOrColumns));
+                int indexOfFirstInLine = (targetIndex / itemsPerLine) * itemsPerLine;
+                index = indexOfFirstInLine;
+                var state = (UniformGridLayoutState)context.LayoutState!;
+                offset = _orientation.MajorStart(GetLayoutRectForDataIndex(availableSize, indexOfFirstInLine, state.FlowAlgorithm.LastExtent, context));
+            }
+
+            return new FlowLayoutAnchorInfo
+            {
+                Index = index,
+                Offset = offset
+            };
+        }
+
+        Rect IFlowLayoutAlgorithmDelegates.Algorithm_GetExtent(
+            Size availableSize,
+            VirtualizingLayoutContext context,
+            ILayoutable? firstRealized,
+            int firstRealizedItemIndex,
+            Rect firstRealizedLayoutBounds,
+            ILayoutable? lastRealized,
+            int lastRealizedItemIndex,
+            Rect lastRealizedLayoutBounds)
+        {
+            var extent = new Rect();
+
+
+            // Constants
+            int itemsCount = context.ItemCount;
+            double availableSizeMinor = _orientation.Minor(availableSize);
+            int itemsPerLine =
+                (int)Math.Min( // note use of unsigned ints
+                    Math.Max(1u, !double.IsInfinity(availableSizeMinor)
+                        ? (uint)(availableSizeMinor / GetMinorSizeWithSpacing(context))
+                        : (uint)itemsCount),
+                Math.Max(1u, _maximumRowsOrColumns));
+            double lineSize = GetMajorSizeWithSpacing(context);
+
+            if (itemsCount > 0)
+            {
+                _orientation.SetMinorSize(
+                    ref extent,
+                    !double.IsInfinity(availableSizeMinor) && _itemsStretch == UniformGridLayoutItemsStretch.Fill ?
+                    availableSizeMinor :
+                    Math.Max(0.0, itemsPerLine * GetMinorSizeWithSpacing(context) - (double)MinItemSpacing));
+                _orientation.SetMajorSize(
+                    ref extent,
+                    Math.Max(0.0, (itemsCount / itemsPerLine) * lineSize - (double)LineSpacing));
+
+                if (firstRealized != null)
+                {
+                    _orientation.SetMajorStart(
+                        ref extent,
+                        _orientation.MajorStart(firstRealizedLayoutBounds) - (firstRealizedItemIndex / itemsPerLine) * lineSize);
+                    int remainingItems = itemsCount - lastRealizedItemIndex - 1;
+                    _orientation.SetMajorSize(
+                        ref extent,
+                        _orientation.MajorEnd(lastRealizedLayoutBounds) - _orientation.MajorStart(extent) + (remainingItems / itemsPerLine) * lineSize);
+                }
+                else
+                {
+                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Estimating extent with no realized elements", LayoutId);
+                }
+            }
+
+            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Extent is ({Size}). Based on lineSize {LineSize} and items per line {ItemsPerLine}",
+                LayoutId, extent.Size, lineSize, itemsPerLine);
+            return extent;
+        }
+
+        void IFlowLayoutAlgorithmDelegates.Algorithm_OnElementMeasured(ILayoutable element, int index, Size availableSize, Size measureSize, Size desiredSize, Size provisionalArrangeSize, VirtualizingLayoutContext context)
+        {
+        }
+
+        void IFlowLayoutAlgorithmDelegates.Algorithm_OnLineArranged(int startIndex, int countInLine, double lineSize, VirtualizingLayoutContext context)
+        {
+        }
+
+        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
+        {
+            var state = context.LayoutState;
+            var gridState = state as UniformGridLayoutState;
+            
+            if (gridState == null)
+            {
+                if (state != null)
+                {
+                    throw new InvalidOperationException("LayoutState must derive from UniformGridLayoutState.");
+                }
+
+                // Custom deriving layouts could potentially be stateful.
+                // If that is the case, we will just create the base state required by UniformGridLayout ourselves.
+                gridState = new UniformGridLayoutState();
+            }
+
+            gridState.InitializeForContext(context, this);
+        }
+
+        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
+        {
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            gridState.UninitializeForContext(context);
+        }
+
+        protected internal override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
+        {
+            // Set the width and height on the grid state. If the user already set them then use the preset. 
+            // If not, we have to measure the first element and get back a size which we're going to be using for the rest of the items.
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            gridState.EnsureElementSize(availableSize, context, _minItemWidth, _minItemHeight, _itemsStretch, Orientation, MinRowSpacing, MinColumnSpacing, _maximumRowsOrColumns);
+
+            var desiredSize = GetFlowAlgorithm(context).Measure(
+                availableSize,
+                context,
+                true,
+                MinItemSpacing,
+                LineSpacing,
+                _maximumRowsOrColumns,
+                _orientation.ScrollOrientation,
+                false,
+                LayoutId);
+
+            // If after Measure the first item is in the realization rect, then we revoke grid state's ownership,
+            // and only use the layout when to clear it when it's done.
+            gridState.EnsureFirstElementOwnership(context);
+
+            return desiredSize;
+        }
+
+        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
+        {
+            var value = GetFlowAlgorithm(context).Arrange(
+               finalSize,
+               context,
+               true,
+               (FlowLayoutAlgorithm.LineAlignment)_itemsJustification,
+               LayoutId);
+            return new Size(value.Width, value.Height);
+        }
+
+        protected internal override void OnItemsChangedCore(VirtualizingLayoutContext context, object? source, NotifyCollectionChangedEventArgs args)
+        {
+            GetFlowAlgorithm(context).OnItemsSourceChanged(source, args, context);
+            // Always invalidate layout to keep the view accurate.
+            InvalidateLayout();
+
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            gridState.ClearElementOnDataSourceChange(context, args);
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (change.Property == OrientationProperty)
+            {
+                var orientation = change.GetNewValue<Orientation>();
+
+                //Note: For UniformGridLayout Vertical Orientation means we have a Horizontal ScrollOrientation. Horizontal Orientation means we have a Vertical ScrollOrientation.
+                //i.e. the properties are the inverse of each other.
+                var scrollOrientation = (orientation == Orientation.Horizontal) ? ScrollOrientation.Vertical : ScrollOrientation.Horizontal;
+                _orientation.ScrollOrientation = scrollOrientation;
+            }
+            else if (change.Property == MinColumnSpacingProperty)
+            {
+                _minColumnSpacing = change.GetNewValue<double>();
+            }
+            else if (change.Property == MinRowSpacingProperty)
+            {
+                _minRowSpacing = change.GetNewValue<double>();
+            }
+            else if (change.Property == ItemsJustificationProperty)
+            {
+                _itemsJustification = change.GetNewValue<UniformGridLayoutItemsJustification>();
+            }
+            else if (change.Property == ItemsStretchProperty)
+            {
+                _itemsStretch = change.GetNewValue<UniformGridLayoutItemsStretch>();
+            }
+            else if (change.Property == MinItemWidthProperty)
+            {
+                _minItemWidth = change.GetNewValue<double>();
+            }
+            else if (change.Property == MinItemHeightProperty)
+            {
+                _minItemHeight = change.GetNewValue<double>();
+            }
+            else if (change.Property == MaximumRowsOrColumnsProperty)
+            {
+                _maximumRowsOrColumns = change.GetNewValue<int>();
+            }
+
+            InvalidateLayout();
+        }
+
+        private double GetMinorSizeWithSpacing(VirtualizingLayoutContext context)
+        {
+            var minItemSpacing = MinItemSpacing;
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            return _orientation.ScrollOrientation == ScrollOrientation.Vertical?
+                gridState.EffectiveItemWidth + minItemSpacing :
+                gridState.EffectiveItemHeight + minItemSpacing;
+        }
+
+        private double GetMajorSizeWithSpacing(VirtualizingLayoutContext context)
+        {
+            var lineSpacing = LineSpacing;
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            return _orientation.ScrollOrientation == ScrollOrientation.Vertical ?
+                gridState.EffectiveItemHeight + lineSpacing :
+                gridState.EffectiveItemWidth + lineSpacing;
+        }
+
+        Rect GetLayoutRectForDataIndex(
+            Size availableSize,
+            int index,
+            Rect lastExtent,
+            VirtualizingLayoutContext context)
+        {
+            int itemsPerLine = (int)Math.Min( //note use of unsigned ints
+                Math.Max(1u, (uint)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context))),
+                Math.Max(1u, _maximumRowsOrColumns));
+            int rowIndex = (int)(index / itemsPerLine);
+            int indexInRow = index - (rowIndex * itemsPerLine);
+
+            var gridState = (UniformGridLayoutState)context.LayoutState!;
+            Rect bounds = _orientation.MinorMajorRect(
+                indexInRow * GetMinorSizeWithSpacing(context) + _orientation.MinorStart(lastExtent),
+                rowIndex * GetMajorSizeWithSpacing(context) + _orientation.MajorStart(lastExtent),
+                _orientation.ScrollOrientation == ScrollOrientation.Vertical ? gridState.EffectiveItemWidth : gridState.EffectiveItemHeight,
+                _orientation.ScrollOrientation == ScrollOrientation.Vertical ? gridState.EffectiveItemHeight : gridState.EffectiveItemWidth);
+
+            return bounds;
+        }
+
+        private void InvalidateLayout() => InvalidateMeasure();
+
+        private FlowLayoutAlgorithm GetFlowAlgorithm(VirtualizingLayoutContext context) => ((UniformGridLayoutState)context.LayoutState!).FlowAlgorithm;
+    }
+}
diff --git a/src/Avalonia.Layout/UniformGridLayoutState.cs b/src/Avalonia.Base/Layout/UniformGridLayoutState.cs
similarity index 100%
rename from src/Avalonia.Layout/UniformGridLayoutState.cs
rename to src/Avalonia.Base/Layout/UniformGridLayoutState.cs
diff --git a/src/Avalonia.Layout/Utils/ListUtils.cs b/src/Avalonia.Base/Layout/Utils/ListUtils.cs
similarity index 100%
rename from src/Avalonia.Layout/Utils/ListUtils.cs
rename to src/Avalonia.Base/Layout/Utils/ListUtils.cs
diff --git a/src/Avalonia.Layout/VirtualLayoutContextAdapter.cs b/src/Avalonia.Base/Layout/VirtualLayoutContextAdapter.cs
similarity index 100%
rename from src/Avalonia.Layout/VirtualLayoutContextAdapter.cs
rename to src/Avalonia.Base/Layout/VirtualLayoutContextAdapter.cs
diff --git a/src/Avalonia.Layout/VirtualizingLayout.cs b/src/Avalonia.Base/Layout/VirtualizingLayout.cs
similarity index 100%
rename from src/Avalonia.Layout/VirtualizingLayout.cs
rename to src/Avalonia.Base/Layout/VirtualizingLayout.cs
diff --git a/src/Avalonia.Layout/VirtualizingLayoutContext.cs b/src/Avalonia.Base/Layout/VirtualizingLayoutContext.cs
similarity index 100%
rename from src/Avalonia.Layout/VirtualizingLayoutContext.cs
rename to src/Avalonia.Base/Layout/VirtualizingLayoutContext.cs
diff --git a/src/Avalonia.Layout/WrapLayout/UvBounds.cs b/src/Avalonia.Base/Layout/WrapLayout/UvBounds.cs
similarity index 100%
rename from src/Avalonia.Layout/WrapLayout/UvBounds.cs
rename to src/Avalonia.Base/Layout/WrapLayout/UvBounds.cs
diff --git a/src/Avalonia.Layout/WrapLayout/UvMeasure.cs b/src/Avalonia.Base/Layout/WrapLayout/UvMeasure.cs
similarity index 100%
rename from src/Avalonia.Layout/WrapLayout/UvMeasure.cs
rename to src/Avalonia.Base/Layout/WrapLayout/UvMeasure.cs
diff --git a/src/Avalonia.Layout/WrapLayout/WrapItem.cs b/src/Avalonia.Base/Layout/WrapLayout/WrapItem.cs
similarity index 100%
rename from src/Avalonia.Layout/WrapLayout/WrapItem.cs
rename to src/Avalonia.Base/Layout/WrapLayout/WrapItem.cs
diff --git a/src/Avalonia.Base/Layout/WrapLayout/WrapLayout.cs b/src/Avalonia.Base/Layout/WrapLayout/WrapLayout.cs
new file mode 100644
index 0000000000..52de1dd3b8
--- /dev/null
+++ b/src/Avalonia.Base/Layout/WrapLayout/WrapLayout.cs
@@ -0,0 +1,336 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Layout;
+using System;
+using System.Collections.Specialized;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Arranges elements by wrapping them to fit the available space.
+    /// When <see cref="Orientation"/> is set to Orientation.Horizontal, element are arranged in rows until the available width is reached and then to a new row.
+    /// When <see cref="Orientation"/> is set to Orientation.Vertical, element are arranged in columns until the available height is reached.
+    /// </summary>
+    public class WrapLayout : VirtualizingLayout
+    {
+        /// <summary>
+        /// Gets or sets a uniform Horizontal distance (in pixels) between items when <see cref="Orientation"/> is set to Horizontal,
+        /// or between columns of items when <see cref="Orientation"/> is set to Vertical.
+        /// </summary>
+        public double HorizontalSpacing
+        {
+            get { return (double)GetValue(HorizontalSpacingProperty); }
+            set { SetValue(HorizontalSpacingProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="HorizontalSpacing"/> dependency property.
+        /// </summary>
+        public static readonly StyledProperty<double> HorizontalSpacingProperty =
+            AvaloniaProperty.Register<WrapLayout, double>(nameof(HorizontalSpacing), 0);
+
+        /// <summary>
+        /// Gets or sets a uniform Vertical distance (in pixels) between items when <see cref="Orientation"/> is set to Vertical,
+        /// or between rows of items when <see cref="Orientation"/> is set to Horizontal.
+        /// </summary>
+        public double VerticalSpacing
+        {
+            get { return (double)GetValue(VerticalSpacingProperty); }
+            set { SetValue(VerticalSpacingProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="VerticalSpacing"/> dependency property.
+        /// </summary>
+        public static readonly StyledProperty<double> VerticalSpacingProperty =
+            AvaloniaProperty.Register<WrapLayout, double>(
+                nameof(VerticalSpacing), 0d);
+
+        /// <summary>
+        /// Gets or sets the orientation of the WrapLayout.
+        /// Horizontal means that child controls will be added horizontally until the width of the panel is reached, then a new row is added to add new child controls.
+        /// Vertical means that children will be added vertically until the height of the panel is reached, then a new column is added.
+        /// </summary>
+        public Orientation Orientation
+        {
+            get { return (Orientation)GetValue(OrientationProperty); }
+            set { SetValue(OrientationProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="Orientation"/> dependency property.
+        /// </summary>
+        public static readonly StyledProperty<Orientation> OrientationProperty =
+            AvaloniaProperty.Register<WrapLayout, Orientation>(
+                nameof(Orientation),
+                Orientation.Horizontal);
+
+        /// <inheritdoc />
+        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
+        {
+            var state = new WrapLayoutState(context);
+            context.LayoutState = state;
+            base.InitializeForContextCore(context);
+        }
+
+        /// <inheritdoc />
+        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
+        {
+            context.LayoutState = null;
+            base.UninitializeForContextCore(context);
+        }
+
+        /// <inheritdoc />
+        protected internal override void OnItemsChangedCore(VirtualizingLayoutContext context, object? source, NotifyCollectionChangedEventArgs args)
+        {
+            var state = (WrapLayoutState)context.LayoutState!;
+
+            switch (args.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    state.RemoveFromIndex(args.NewStartingIndex);
+                    break;
+                case NotifyCollectionChangedAction.Move:
+                    int minIndex = Math.Min(args.NewStartingIndex, args.OldStartingIndex);
+                    state.RemoveFromIndex(minIndex);
+
+                    state.RecycleElementAt(args.OldStartingIndex);
+                    state.RecycleElementAt(args.NewStartingIndex);
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    state.RemoveFromIndex(args.OldStartingIndex);
+                    break;
+                case NotifyCollectionChangedAction.Replace:
+                    state.RemoveFromIndex(args.NewStartingIndex);
+                    state.RecycleElementAt(args.NewStartingIndex);
+                    break;
+                case NotifyCollectionChangedAction.Reset:
+                    state.Clear();
+                    break;
+            }
+
+            base.OnItemsChangedCore(context, source, args);
+        }
+
+        /// <inheritdoc />
+        protected internal override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
+        {
+            var totalMeasure = UvMeasure.Zero;
+            var parentMeasure = new UvMeasure(Orientation, availableSize.Width, availableSize.Height);
+            var spacingMeasure = new UvMeasure(Orientation, HorizontalSpacing, VerticalSpacing);
+            var realizationBounds = new UvBounds(Orientation, context.RealizationRect);
+            var position = UvMeasure.Zero;
+
+            var state = (WrapLayoutState)context.LayoutState!;
+            if (state.Orientation != Orientation)
+            {
+                state.SetOrientation(Orientation);
+            }
+
+            if (spacingMeasure.Equals(state.Spacing) == false)
+            {
+                state.ClearPositions();
+                state.Spacing = spacingMeasure;
+            }
+
+            if (state.AvailableU != parentMeasure.U)
+            {
+                state.ClearPositions();
+                state.AvailableU = parentMeasure.U;
+            }
+
+            double currentV = 0;
+            for (int i = 0; i < context.ItemCount; i++)
+            {
+                bool measured = false;
+                WrapItem item = state.GetItemAt(i);
+                if (item.Measure == null)
+                {
+                    item.Element = context.GetOrCreateElementAt(i);
+                    item.Element.Measure(availableSize);
+                    item.Measure = new UvMeasure(Orientation, item.Element.DesiredSize.Width, item.Element.DesiredSize.Height);
+                    measured = true;
+                }
+
+                UvMeasure currentMeasure = item.Measure.Value;
+                if (currentMeasure.U == 0)
+                {
+                    continue; // ignore collapsed items
+                }
+
+                if (item.Position == null)
+                {
+                    if (parentMeasure.U < position.U + currentMeasure.U)
+                    {
+                        // New Row
+                        position.U = 0;
+                        position.V += currentV + spacingMeasure.V;
+                        currentV = 0;
+                    }
+
+                    item.Position = position;
+                }
+
+                position = item.Position.Value;
+
+                double vEnd = position.V + currentMeasure.V;
+                if (vEnd < realizationBounds.VMin)
+                {
+                    // Item is "above" the bounds
+                    if (item.Element != null)
+                    {
+                        context.RecycleElement(item.Element);
+                        item.Element = null;
+                    }
+                }
+                else if (position.V > realizationBounds.VMax)
+                {
+                    // Item is "below" the bounds.
+                    if (item.Element != null)
+                    {
+                        context.RecycleElement(item.Element);
+                        item.Element = null;
+                    }
+
+                    // We don't need to measure anything below the bounds
+                    break;
+                }
+                else if (measured == false)
+                {
+                    // Always measure elements that are within the bounds
+                    item.Element = context.GetOrCreateElementAt(i);
+                    item.Element.Measure(availableSize);
+
+                    currentMeasure = new UvMeasure(Orientation, item.Element.DesiredSize.Width, item.Element.DesiredSize.Height);
+                    if (currentMeasure.Equals(item.Measure) == false)
+                    {
+                        // this item changed size; we need to recalculate layout for everything after this
+                        state.RemoveFromIndex(i + 1);
+                        item.Measure = currentMeasure;
+
+                        // did the change make it go into the new row?
+                        if (parentMeasure.U < position.U + currentMeasure.U)
+                        {
+                            // New Row
+                            position.U = 0;
+                            position.V += currentV + spacingMeasure.V;
+                            currentV = 0;
+                        }
+
+                        item.Position = position;
+                    }
+                }
+
+                position.U += currentMeasure.U + spacingMeasure.U;
+                currentV = Math.Max(currentMeasure.V, currentV);
+            }
+
+            // update value with the last line
+            // if the the last loop is(parentMeasure.U > currentMeasure.U + lineMeasure.U) the total isn't calculated then calculate it
+            // if the last loop is (parentMeasure.U > currentMeasure.U) the currentMeasure isn't added to the total so add it here
+            // for the last condition it is zeros so adding it will make no difference
+            // this way is faster than an if condition in every loop for checking the last item
+            totalMeasure.U = parentMeasure.U;
+            
+            // Propagating an infinite size causes a crash. This can happen if the parent is scrollable and infinite in the opposite
+            // axis to the panel. Clearing to zero prevents the crash.
+            // This is likely an incorrect use of the control by the developer, however we need stability here so setting a default that wont crash.
+            if (double.IsInfinity(totalMeasure.U))
+            {
+                totalMeasure.U = 0.0;
+            }
+            
+            totalMeasure.V = state.GetHeight();
+
+            totalMeasure.U = Math.Ceiling(totalMeasure.U);
+
+            return Orientation == Orientation.Horizontal ? new Size(totalMeasure.U, totalMeasure.V) : new Size(totalMeasure.V, totalMeasure.U);
+        }
+
+        /// <inheritdoc />
+        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
+        {
+            if (context.ItemCount > 0)
+            {
+                var parentMeasure = new UvMeasure(Orientation, finalSize.Width, finalSize.Height);
+                var spacingMeasure = new UvMeasure(Orientation, HorizontalSpacing, VerticalSpacing);
+                var realizationBounds = new UvBounds(Orientation, context.RealizationRect);
+
+                var state = (WrapLayoutState)context.LayoutState!;
+                bool Arrange(WrapItem item, bool isLast = false)
+                {
+                    if (item.Measure.HasValue == false)
+                    {
+                        return false;
+                    }
+
+                    if (item.Position == null)
+                    {
+                        return false;
+                    }
+
+                    var desiredMeasure = item.Measure.Value;
+                    if (desiredMeasure.U == 0)
+                    {
+                        return true; // if an item is collapsed, avoid adding the spacing
+                    }
+
+                    UvMeasure position = item.Position.Value;
+
+                    // Stretch the last item to fill the available space
+                    if (isLast)
+                    {
+                        desiredMeasure.U = parentMeasure.U - position.U;
+                    }
+
+                    if (((position.V + desiredMeasure.V) >= realizationBounds.VMin) && (position.V <= realizationBounds.VMax))
+                    {
+                        // place the item
+                        var child = context.GetOrCreateElementAt(item.Index);
+                        if (Orientation == Orientation.Horizontal)
+                        {
+                            child.Arrange(new Rect(position.U, position.V, desiredMeasure.U, desiredMeasure.V));
+                        }
+                        else
+                        {
+                            child.Arrange(new Rect(position.V, position.U, desiredMeasure.V, desiredMeasure.U));
+                        }
+                    }
+                    else if (position.V > realizationBounds.VMax)
+                    {
+                        return false;
+                    }
+
+                    return true;
+                }
+
+                for (var i = 0; i < context.ItemCount; i++)
+                {
+                    bool continueArranging = Arrange(state.GetItemAt(i));
+                    if (continueArranging == false)
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return finalSize;
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == OrientationProperty || change.Property == HorizontalSpacingProperty || change.Property == VerticalSpacingProperty)
+            {
+                InvalidateMeasure();
+                InvalidateArrange();
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Layout/WrapLayout/WrapLayoutState.cs b/src/Avalonia.Base/Layout/WrapLayout/WrapLayoutState.cs
similarity index 100%
rename from src/Avalonia.Layout/WrapLayout/WrapLayoutState.cs
rename to src/Avalonia.Base/Layout/WrapLayout/WrapLayoutState.cs
diff --git a/src/Avalonia.Base/Logging/ILogSink.cs b/src/Avalonia.Base/Logging/ILogSink.cs
index 27558ba0ee..60709776c6 100644
--- a/src/Avalonia.Base/Logging/ILogSink.cs
+++ b/src/Avalonia.Base/Logging/ILogSink.cs
@@ -26,57 +26,6 @@ namespace Avalonia.Logging
             object? source,
             string messageTemplate);
 
-        /// <summary>
-        /// Logs an event.
-        /// </summary>
-        /// <param name="level">The log event level.</param>
-        /// <param name="area">The area that the event originates.</param>
-        /// <param name="source">The object from which the event originates.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="propertyValue0">Message property value.</param>
-        void Log<T0>(
-            LogEventLevel level,
-            string area,
-            object? source,
-            string messageTemplate,
-            T0 propertyValue0);
-
-        /// <summary>
-        /// Logs an event.
-        /// </summary>
-        /// <param name="level">The log event level.</param>
-        /// <param name="area">The area that the event originates.</param>
-        /// <param name="source">The object from which the event originates.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="propertyValue0">Message property value.</param>
-        /// <param name="propertyValue1">Message property value.</param>
-        void Log<T0, T1>(
-            LogEventLevel level,
-            string area,
-            object? source,
-            string messageTemplate,
-            T0 propertyValue0,
-            T1 propertyValue1);
-
-        /// <summary>
-        /// Logs an event.
-        /// </summary>
-        /// <param name="level">The log event level.</param>
-        /// <param name="area">The area that the event originates.</param>
-        /// <param name="source">The object from which the event originates.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="propertyValue0">Message property value.</param>
-        /// <param name="propertyValue1">Message property value.</param>
-        /// <param name="propertyValue2">Message property value.</param>
-        void Log<T0, T1, T2>(
-            LogEventLevel level,
-            string area,
-            object? source,
-            string messageTemplate,
-            T0 propertyValue0,
-            T1 propertyValue1,
-            T2 propertyValue2);
-
         /// <summary>
         /// Logs a new event.
         /// </summary>
diff --git a/src/Avalonia.Base/Logging/TraceLogSink.cs b/src/Avalonia.Base/Logging/TraceLogSink.cs
index 02ed191d2c..05e4b8bc5a 100644
--- a/src/Avalonia.Base/Logging/TraceLogSink.cs
+++ b/src/Avalonia.Base/Logging/TraceLogSink.cs
@@ -28,31 +28,7 @@ namespace Avalonia.Logging
         {
             if (IsEnabled(level, area))
             {
-                Trace.WriteLine(Format<object, object, object>(area, messageTemplate, source));
-            }
-        }
-
-        public void Log<T0>(LogEventLevel level, string area, object? source, string messageTemplate, T0 propertyValue0)
-        {
-            if (IsEnabled(level, area))
-            {
-                Trace.WriteLine(Format<T0, object, object>(area, messageTemplate, source, propertyValue0));
-            }
-        }
-
-        public void Log<T0, T1>(LogEventLevel level, string area, object? source, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
-        {
-            if (IsEnabled(level, area))
-            {
-                Trace.WriteLine(Format<T0, T1, object>(area, messageTemplate, source, propertyValue0, propertyValue1));
-            }
-        }
-
-        public void Log<T0, T1, T2>(LogEventLevel level, string area, object? source, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
-        {
-            if (IsEnabled(level, area))
-            {
-                Trace.WriteLine(Format(area, messageTemplate, source, propertyValue0, propertyValue1, propertyValue2));
+                Trace.WriteLine(Format<object, object, object>(area, messageTemplate, source, null));
             }
         }
 
@@ -68,9 +44,7 @@ namespace Avalonia.Logging
             string area,
             string template,
             object? source,
-            T0? v0 = default,
-            T1? v1 = default,
-            T2? v2 = default)
+            object?[]? values)
         {
             var result = new StringBuilder(template.Length);
             var r = new CharacterReader(template.AsSpan());
@@ -93,13 +67,7 @@ namespace Avalonia.Logging
                     if (r.Peek != '{')
                     {
                         result.Append('\'');
-                        result.Append(i++ switch
-                        {
-                            0 => v0,
-                            1 => v1,
-                            2 => v2,
-                            _ => null
-                        });
+                        result.Append(values?[i++]);
                         result.Append('\'');
                         r.TakeUntil('}');
                         r.Take();
diff --git a/src/Avalonia.Base/LogicalTree/ChildIndexChangedEventArgs.cs b/src/Avalonia.Base/LogicalTree/ChildIndexChangedEventArgs.cs
new file mode 100644
index 0000000000..497596fcc1
--- /dev/null
+++ b/src/Avalonia.Base/LogicalTree/ChildIndexChangedEventArgs.cs
@@ -0,0 +1,28 @@
+#nullable enable
+using System;
+
+namespace Avalonia.LogicalTree
+{
+    /// <summary>
+    /// Event args for <see cref="IChildIndexProvider.ChildIndexChanged"/> event.
+    /// </summary>
+    public class ChildIndexChangedEventArgs : EventArgs
+    {
+        public static new ChildIndexChangedEventArgs Empty { get; } = new ChildIndexChangedEventArgs();
+
+        private ChildIndexChangedEventArgs()
+        {
+        }
+
+        public ChildIndexChangedEventArgs(ILogical child)
+        {
+            Child = child;
+        }
+
+        /// <summary>
+        /// Logical child which index was changed.
+        /// If null, all children should be reset.
+        /// </summary>
+        public ILogical? Child { get; }
+    }
+}
diff --git a/src/Avalonia.Styling/LogicalTree/ControlLocator.cs b/src/Avalonia.Base/LogicalTree/ControlLocator.cs
similarity index 100%
rename from src/Avalonia.Styling/LogicalTree/ControlLocator.cs
rename to src/Avalonia.Base/LogicalTree/ControlLocator.cs
diff --git a/src/Avalonia.Styling/LogicalTree/IChildIndexProvider.cs b/src/Avalonia.Base/LogicalTree/IChildIndexProvider.cs
similarity index 100%
rename from src/Avalonia.Styling/LogicalTree/IChildIndexProvider.cs
rename to src/Avalonia.Base/LogicalTree/IChildIndexProvider.cs
diff --git a/src/Avalonia.Base/LogicalTree/ILogical.cs b/src/Avalonia.Base/LogicalTree/ILogical.cs
new file mode 100644
index 0000000000..9cc2edff86
--- /dev/null
+++ b/src/Avalonia.Base/LogicalTree/ILogical.cs
@@ -0,0 +1,69 @@
+using System;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Metadata;
+
+namespace Avalonia.LogicalTree
+{
+    /// <summary>
+    /// Represents a node in the logical tree.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ILogical
+    {
+        /// <summary>
+        /// Raised when the control is attached to a rooted logical tree.
+        /// </summary>
+        event EventHandler<LogicalTreeAttachmentEventArgs>? AttachedToLogicalTree;
+
+        /// <summary>
+        /// Raised when the control is detached from a rooted logical tree.
+        /// </summary>
+        event EventHandler<LogicalTreeAttachmentEventArgs>? DetachedFromLogicalTree;
+
+        /// <summary>
+        /// Gets a value indicating whether the element is attached to a rooted logical tree.
+        /// </summary>
+        bool IsAttachedToLogicalTree { get; }
+
+        /// <summary>
+        /// Gets the logical parent.
+        /// </summary>
+        ILogical? LogicalParent { get; }
+
+        /// <summary>
+        /// Gets the logical children.
+        /// </summary>
+        IAvaloniaReadOnlyList<ILogical> LogicalChildren { get; }
+
+        /// <summary>
+        /// Notifies the control that it is being attached to a rooted logical tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        /// <remarks>
+        /// This method will be called automatically by the framework, you should not need to call
+        /// this method yourself.
+        /// </remarks>
+        void NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e);
+
+        /// <summary>
+        /// Notifies the control that it is being detached from a rooted logical tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        /// <remarks>
+        /// This method will be called automatically by the framework, you should not need to call
+        /// this method yourself.
+        /// </remarks>
+        void NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e);
+
+        /// <summary>
+        /// Notifies the control that a change has been made to resources that apply to it.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        /// <remarks>
+        /// This method will be called automatically by the framework, you should not need to call
+        /// this method yourself.
+        /// </remarks>
+        void NotifyResourcesChanged(ResourcesChangedEventArgs e);
+    }
+}
diff --git a/src/Avalonia.Base/LogicalTree/ILogicalRoot.cs b/src/Avalonia.Base/LogicalTree/ILogicalRoot.cs
new file mode 100644
index 0000000000..ea0f554e96
--- /dev/null
+++ b/src/Avalonia.Base/LogicalTree/ILogicalRoot.cs
@@ -0,0 +1,12 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.LogicalTree
+{
+    /// <summary>
+    /// Represents a root of a logical tree.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ILogicalRoot : ILogical
+    {
+    }
+}
diff --git a/src/Avalonia.Styling/LogicalTree/LogicalExtensions.cs b/src/Avalonia.Base/LogicalTree/LogicalExtensions.cs
similarity index 100%
rename from src/Avalonia.Styling/LogicalTree/LogicalExtensions.cs
rename to src/Avalonia.Base/LogicalTree/LogicalExtensions.cs
diff --git a/src/Avalonia.Styling/LogicalTree/LogicalTreeAttachmentEventArgs.cs b/src/Avalonia.Base/LogicalTree/LogicalTreeAttachmentEventArgs.cs
similarity index 100%
rename from src/Avalonia.Styling/LogicalTree/LogicalTreeAttachmentEventArgs.cs
rename to src/Avalonia.Base/LogicalTree/LogicalTreeAttachmentEventArgs.cs
diff --git a/src/Avalonia.Base/Matrix.cs b/src/Avalonia.Base/Matrix.cs
new file mode 100644
index 0000000000..df6439b1b3
--- /dev/null
+++ b/src/Avalonia.Base/Matrix.cs
@@ -0,0 +1,582 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Numerics;
+using Avalonia.Utilities;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// A 3x3 matrix.
+    /// </summary>
+    /// <remarks>Matrix layout:
+    ///         | 1st col | 2nd col | 3r col |
+    /// 1st row | scaleX  | skewY  | perspX  |
+    /// 2nd row | skewX  | scaleY  | perspY  |
+    /// 3rd row | transX  | transY  | perspZ  |
+    /// 
+    /// Note: Skia.SkMatrix uses a transposed layout (where for example skewX/skewY and persp0/transX are swapped).
+    /// </remarks>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct Matrix : IEquatable<Matrix>
+    {
+        private readonly double _m11;
+        private readonly double _m12;
+        private readonly double _m13;
+        private readonly double _m21;
+        private readonly double _m22;
+        private readonly double _m23;
+        private readonly double _m31;
+        private readonly double _m32;
+        private readonly double _m33;
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Matrix"/> struct (equivalent to a 2x3 Matrix without perspective).
+        /// </summary>
+        /// <param name="scaleX">The first element of the first row.</param>
+        /// <param name="skewY">The second element of the first row.</param>
+        /// <param name="skewX">The first element of the second row.</param>
+        /// <param name="scaleY">The second element of the second row.</param>
+        /// <param name="offsetX">The first element of the third row.</param>
+        /// <param name="offsetY">The second element of the third row.</param>
+        public Matrix(
+            double scaleX,
+            double skewY,
+            double skewX,
+            double scaleY,
+            double offsetX,
+            double offsetY) : this( scaleX, skewY, 0, skewX, scaleY, 0, offsetX, offsetY, 1)
+        {
+        }
+
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Matrix"/> struct.
+        /// </summary>
+        /// <param name="scaleX">The first element of the first row.</param>
+        /// <param name="skewY">The second element of the first row.</param>
+        /// <param name="perspX">The third element of the first row.</param>
+        /// <param name="skewX">The first element of the second row.</param>
+        /// <param name="scaleY">The second element of the second row.</param>
+        /// <param name="perspY">The third element of the second row.</param>
+        /// <param name="offsetX">The first element of the third row.</param>
+        /// <param name="offsetY">The second element of the third row.</param>
+        /// <param name="perspZ">The third element of the third row.</param>
+        public Matrix(
+            double scaleX,
+            double skewY,
+            double perspX,
+            double skewX,
+            double scaleY,
+            double perspY, 
+            double offsetX,
+            double offsetY,
+            double perspZ)
+        {
+            _m11 = scaleX;
+            _m12 = skewY;
+            _m13 = perspX;
+            _m21 = skewX;
+            _m22 = scaleY;
+            _m23 = perspY;
+            _m31 = offsetX;
+            _m32 = offsetY;
+            _m33 = perspZ;
+        }
+
+        /// <summary>
+        /// Returns the multiplicative identity matrix.
+        /// </summary>
+        public static Matrix Identity { get; } = new Matrix(
+            1.0, 0.0, 0.0,
+            0.0, 1.0, 0.0,
+            0.0, 0.0, 1.0);
+
+        /// <summary>
+        /// Returns whether the matrix is the identity matrix.
+        /// </summary>
+        public bool IsIdentity => Equals(Identity);
+
+        /// <summary>
+        /// HasInverse Property - returns true if this matrix is invertible, false otherwise.
+        /// </summary>
+        public bool HasInverse => !MathUtilities.IsZero(GetDeterminant());
+
+        /// <summary>
+        /// The first element of the first row (scaleX).
+        /// </summary>
+        public double M11 => _m11;
+
+        /// <summary>
+        /// The second element of the first row (skewY).
+        /// </summary>
+        public double M12 => _m12;
+
+        /// <summary>
+        /// The third element of the first row (perspX: input x-axis perspective factor).
+        /// </summary>
+        public double M13 => _m13;
+
+        /// <summary>
+        /// The first element of the second row (skewX).
+        /// </summary>
+        public double M21 => _m21;
+
+        /// <summary>
+        /// The second element of the second row (scaleY).
+        /// </summary>
+        public double M22 => _m22;
+
+        /// <summary>
+        /// The third element of the second row (perspY: input y-axis perspective factor).
+        /// </summary>
+        public double M23 => _m23;
+
+        /// <summary>
+        /// The first element of the third row (offsetX/translateX).
+        /// </summary>
+        public double M31 => _m31;
+
+        /// <summary>
+        /// The second element of the third row (offsetY/translateY).
+        /// </summary>
+        public double M32 => _m32;
+
+        /// <summary>
+        /// The third element of the third row (perspZ: perspective scale factor).
+        /// </summary>
+        public double M33 => _m33;
+
+        /// <summary>
+        /// Multiplies two matrices together and returns the resulting matrix.
+        /// </summary>
+        /// <param name="value1">The first source matrix.</param>
+        /// <param name="value2">The second source matrix.</param>
+        /// <returns>The product matrix.</returns>
+        public static Matrix operator *(Matrix value1, Matrix value2)
+        {
+            return new Matrix(
+                (value1.M11 * value2.M11) + (value1.M12 * value2.M21) + (value1.M13 * value2.M31),
+                (value1.M11 * value2.M12) + (value1.M12 * value2.M22) + (value1.M13 * value2.M32),
+                (value1.M11 * value2.M13) + (value1.M12 * value2.M23) + (value1.M13 * value2.M33),
+                (value1.M21 * value2.M11) + (value1.M22 * value2.M21) + (value1.M23 * value2.M31),
+                (value1.M21 * value2.M12) + (value1.M22 * value2.M22) + (value1.M23 * value2.M32),
+                (value1.M21 * value2.M13) + (value1.M22 * value2.M23) + (value1.M23 * value2.M33),
+                (value1.M31 * value2.M11) + (value1.M32 * value2.M21) + (value1.M33 * value2.M31),
+                (value1.M31 * value2.M12) + (value1.M32 * value2.M22) + (value1.M33 * value2.M32), 
+                (value1.M31 * value2.M13) + (value1.M32 * value2.M23) + (value1.M33 * value2.M33));
+        }
+
+        /// <summary>
+        /// Negates the given matrix by multiplying all values by -1.
+        /// </summary>
+        /// <param name="value">The source matrix.</param>
+        /// <returns>The negated matrix.</returns>
+        public static Matrix operator -(Matrix value)
+        {
+            return value.Invert();
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the given matrices are equal.
+        /// </summary>
+        /// <param name="value1">The first source matrix.</param>
+        /// <param name="value2">The second source matrix.</param>
+        /// <returns>True if the matrices are equal; False otherwise.</returns>
+        public static bool operator ==(Matrix value1, Matrix value2)
+        {
+            return value1.Equals(value2);
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the given matrices are not equal.
+        /// </summary>
+        /// <param name="value1">The first source matrix.</param>
+        /// <param name="value2">The second source matrix.</param>
+        /// <returns>True if the matrices are not equal; False if they are equal.</returns>
+        public static bool operator !=(Matrix value1, Matrix value2)
+        {
+            return !value1.Equals(value2);
+        }
+
+        /// <summary>
+        /// Creates a rotation matrix using the given rotation in radians.
+        /// </summary>
+        /// <param name="radians">The amount of rotation, in radians.</param>
+        /// <returns>A rotation matrix.</returns>
+        public static Matrix CreateRotation(double radians)
+        {
+            double cos = Math.Cos(radians);
+            double sin = Math.Sin(radians);
+            return new Matrix(cos, sin, -sin, cos, 0, 0);
+        }
+
+        /// <summary>
+        /// Creates a skew matrix from the given axis skew angles in radians.
+        /// </summary>
+        /// <param name="xAngle">The amount of skew along the X-axis, in radians.</param>
+        /// <param name="yAngle">The amount of skew along the Y-axis, in radians.</param>
+        /// <returns>A rotation matrix.</returns>
+        public static Matrix CreateSkew(double xAngle, double yAngle)
+        {
+            double tanX = Math.Tan(xAngle);
+            double tanY = Math.Tan(yAngle);
+            return new Matrix(1.0, tanY, tanX, 1.0, 0.0, 0.0);
+        }
+
+        /// <summary>
+        /// Creates a scale matrix from the given X and Y components.
+        /// </summary>
+        /// <param name="xScale">Value to scale by on the X-axis.</param>
+        /// <param name="yScale">Value to scale by on the Y-axis.</param>
+        /// <returns>A scaling matrix.</returns>
+        public static Matrix CreateScale(double xScale, double yScale)
+        {
+            return new Matrix(xScale, 0, 0, yScale, 0, 0);
+        }
+
+        /// <summary>
+        /// Creates a scale matrix from the given vector scale.
+        /// </summary>
+        /// <param name="scales">The scale to use.</param>
+        /// <returns>A scaling matrix.</returns>
+        public static Matrix CreateScale(Vector scales)
+        {
+            return CreateScale(scales.X, scales.Y);
+        }
+
+        /// <summary>
+        /// Creates a translation matrix from the given vector.
+        /// </summary>
+        /// <param name="position">The translation position.</param>
+        /// <returns>A translation matrix.</returns>
+        public static Matrix CreateTranslation(Vector position)
+        {
+            return CreateTranslation(position.X, position.Y);
+        }
+
+        /// <summary>
+        /// Creates a translation matrix from the given X and Y components.
+        /// </summary>
+        /// <param name="xPosition">The X position.</param>
+        /// <param name="yPosition">The Y position.</param>
+        /// <returns>A translation matrix.</returns>
+        public static Matrix CreateTranslation(double xPosition, double yPosition)
+        {
+            return new Matrix(1.0, 0.0, 0.0, 1.0, xPosition, yPosition);
+        }
+
+        /// <summary>
+        /// Converts an angle in degrees to radians.
+        /// </summary>
+        /// <param name="angle">The angle in degrees.</param>
+        /// <returns>The angle in radians.</returns>
+        public static double ToRadians(double angle)
+        {
+            return angle * 0.0174532925;
+        }
+        
+        /// <summary>
+        /// Appends another matrix as post-multiplication operation.
+        /// Equivalent to this * value;
+        /// </summary>
+        /// <param name="value">A matrix.</param>
+        /// <returns>Post-multiplied matrix.</returns>
+        public Matrix Append(Matrix value)
+        {
+            return this * value;
+        }
+
+        /// <summary>
+        /// Prepends another matrix as pre-multiplication operation.
+        /// Equivalent to value * this;
+        /// </summary>
+        /// <param name="value">A matrix.</param>
+        /// <returns>Pre-multiplied matrix.</returns>
+        public Matrix Prepend(Matrix value)
+        {
+            return value * this;
+        }
+
+        /// <summary>
+        /// Calculates the determinant for this matrix.
+        /// </summary>
+        /// <returns>The determinant.</returns>
+        /// <remarks>
+        /// The determinant is calculated by expanding the matrix with a third column whose
+        /// values are (0,0,1).
+        /// </remarks>
+        public double GetDeterminant()
+        {
+            // implemented using "Laplace expansion":
+            return _m11 * (_m22 * _m33 - _m23 * _m32)
+                 - _m12 * (_m21 * _m33 - _m23 * _m31)
+                 + _m13 * (_m21 * _m32 - _m22 * _m31);
+        }
+
+        /// <summary>
+        ///  Transforms the point with the matrix
+        /// </summary>
+        /// <param name="p">The point to be transformed</param>
+        /// <returns>The transformed point</returns>
+        public Point Transform(Point p)
+        {
+            Point transformedResult;
+            
+            // If this matrix contains a non-affine transform with need to extend
+            // the point to a 3D vector and flatten it back for 2d display
+            // by multiplying X and Y with the inverse of the Z axis.
+            // The code below also works with affine transformations, but for performance (and compatibility)
+            // reasons we will use the more complex calculation only if necessary
+            if (ContainsPerspective())
+            {
+                var m44 = new Matrix4x4(
+                    (float)M11, (float)M12, (float)M13, 0,
+                    (float)M21, (float)M22, (float)M23, 0,
+                    (float)M31, (float)M32, (float)M33, 0,
+                    0, 0, 0, 1
+                );
+            
+                var vector = new Vector3((float)p.X, (float)p.Y, 1);
+                var transformedVector = Vector3.Transform(vector, m44);
+                var z = 1 / transformedVector.Z;
+            
+                transformedResult = new Point(transformedVector.X * z, transformedVector.Y * z);
+            }
+            else
+            {
+                return new Point(
+                    (p.X * M11) + (p.Y * M21) + M31,
+                    (p.X * M12) + (p.Y * M22) + M32);
+            }
+
+            return transformedResult;
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the matrix is equal to the other given matrix.
+        /// </summary>
+        /// <param name="other">The other matrix to test equality against.</param>
+        /// <returns>True if this matrix is equal to other; False otherwise.</returns>
+        public bool Equals(Matrix other)
+        {
+            // ReSharper disable CompareOfFloatsByEqualityOperator
+            return _m11 == other.M11 &&
+                   _m12 == other.M12 &&
+                   _m13 == other.M13 &&
+                   _m21 == other.M21 &&
+                   _m22 == other.M22 &&
+                   _m23 == other.M23 &&
+                   _m31 == other.M31 &&
+                   _m32 == other.M32 &&
+                   _m33 == other.M33;
+            // ReSharper restore CompareOfFloatsByEqualityOperator
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the given Object is equal to this matrix instance.
+        /// </summary>
+        /// <param name="obj">The Object to compare against.</param>
+        /// <returns>True if the Object is equal to this matrix; False otherwise.</returns>
+        public override bool Equals(object? obj) => obj is Matrix other && Equals(other);
+
+        /// <summary>
+        /// Returns the hash code for this instance.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            return (_m11, _m12, _m13, _m21, _m22, _m23, _m31, _m32, _m33).GetHashCode();
+        }
+
+        /// <summary>
+        ///  Determines if the current matrix contains perspective (non-affine) transforms (true) or only (affine) transforms that could be mapped into an 2x3 matrix (false).
+        /// </summary>
+        public bool ContainsPerspective()
+        {
+
+            // ReSharper disable CompareOfFloatsByEqualityOperator
+            return _m13 != 0 || _m23 != 0 || _m33 != 1;
+            // ReSharper restore CompareOfFloatsByEqualityOperator
+        }
+
+        /// <summary>
+        /// Returns a String representing this matrix instance.
+        /// </summary>
+        /// <returns>The string representation.</returns>
+        public override string ToString()
+        {
+            CultureInfo ci = CultureInfo.CurrentCulture;
+
+            string msg;
+            double[] values;
+
+            if (ContainsPerspective())
+            {
+                msg = "{{ {{M11:{0} M12:{1} M13:{2}}} {{M21:{3} M22:{4} M23:{5}}} {{M31:{6} M32:{7} M33:{8}}} }}";
+                values = new[] { M11, M12, M13, M21, M22, M23, M31, M32, M33 };
+            }
+            else
+            {
+                msg = "{{ {{M11:{0} M12:{1}}} {{M21:{2} M22:{3}}} {{M31:{4} M32:{5}}} }}";
+                values = new[] { M11, M12, M21, M22, M31, M32 };
+            }
+
+            return string.Format(
+                ci,
+                msg,
+                values.Select((v) => v.ToString(ci)).ToArray());
+        }
+
+        /// <summary>
+        /// Attempts to invert the Matrix.
+        /// </summary>
+        /// <returns>The inverted matrix or <see langword="null"/> when matrix is not invertible.</returns>
+        public bool TryInvert(out Matrix inverted)
+        {
+            double d = GetDeterminant();
+
+            if (MathUtilities.IsZero(d))
+            {
+                inverted = default;
+                
+                return false;
+            }
+
+            var invdet = 1 / d;
+            
+            inverted = new Matrix(
+                (_m22 * _m33 - _m32 * _m23) * invdet,
+                (_m13 * _m32 - _m12 * _m33) * invdet,
+                (_m12 * _m23 - _m13 * _m22) * invdet,
+                (_m23 * _m31 - _m21 * _m33) * invdet,
+                (_m11 * _m33 - _m13 * _m31) * invdet,
+                (_m21 * _m13 - _m11 * _m23) * invdet,
+                (_m21 * _m32 - _m31 * _m22) * invdet,
+                (_m31 * _m12 - _m11 * _m32) * invdet,
+                (_m11 * _m22 - _m21 * _m12) * invdet
+                );
+            
+            return true;
+        }
+
+        /// <summary>
+        /// Inverts the Matrix.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Matrix is not invertible.</exception>
+        /// <returns>The inverted matrix.</returns>
+        public Matrix Invert()
+        {
+            if (!TryInvert(out var inverted))
+            {
+                throw new InvalidOperationException("Transform is not invertible.");
+            }
+
+            return inverted;
+        }
+
+        /// <summary>
+        /// Parses a <see cref="Matrix"/> string.
+        /// </summary>
+        /// <param name="s">Six or nine comma-delimited double values (m11, m12, m21, m22, offsetX, offsetY[, perspX, perspY, perspZ]) that describe the new <see cref="Matrix"/></param>
+        /// <returns>The <see cref="Matrix"/>.</returns>
+        public static Matrix Parse(string s)
+        {
+            // initialize to satisfy compiler - only used when retrieved from string.
+            double v8 = 0;
+            double v9 = 0;
+
+            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Matrix."))
+            {
+                var v1 = tokenizer.ReadDouble();
+                var v2 = tokenizer.ReadDouble();
+                var v3 = tokenizer.ReadDouble();
+                var v4 = tokenizer.ReadDouble();
+                var v5 = tokenizer.ReadDouble();
+                var v6 = tokenizer.ReadDouble();
+                var persp = tokenizer.TryReadDouble(out var v7);
+                persp = persp && tokenizer.TryReadDouble(out v8);
+                persp = persp && tokenizer.TryReadDouble(out v9);
+
+                if (persp) 
+                    return new Matrix(v1, v2, v7, v3, v4, v8, v5, v6, v9);
+                else
+                    return new Matrix(v1, v2, v3, v4, v5, v6);
+            }
+        }
+
+        /// <summary>
+        /// Decomposes given matrix into transform operations.
+        /// </summary>
+        /// <param name="matrix">Matrix to decompose.</param>
+        /// <param name="decomposed">Decomposed matrix.</param>
+        /// <returns>The status of the operation.</returns>        
+        public static bool TryDecomposeTransform(Matrix matrix, out Decomposed decomposed)
+        {
+            decomposed = default;
+
+            var determinant = matrix.GetDeterminant();
+            
+            if (MathUtilities.IsZero(determinant) || matrix.ContainsPerspective())
+            {
+                return false;
+            }
+
+            var m11 = matrix.M11;
+            var m21 = matrix.M21;
+            var m12 = matrix.M12;
+            var m22 = matrix.M22;
+
+            // Translation.
+            decomposed.Translate = new Vector(matrix.M31, matrix.M32);
+
+            // Scale sign.
+            var scaleX = 1d;
+            var scaleY = 1d;
+
+            if (determinant < 0)
+            {
+                if (m11 < m22)
+                {
+                    scaleX *= -1d;
+                }
+                else
+                {
+                    scaleY *= -1d;
+                }
+            }
+
+            // X Scale.
+            scaleX *= Math.Sqrt(m11 * m11 + m12 * m12);
+
+            m11 /= scaleX;
+            m12 /= scaleX;
+
+            // XY Shear.
+            double scaledShear = m11 * m21 + m12 * m22;
+
+            m21 -= m11 * scaledShear;
+            m22 -= m12 * scaledShear;
+
+            // Y Scale.
+            scaleY *= Math.Sqrt(m21 * m21 + m22 * m22);
+
+            decomposed.Scale = new Vector(scaleX, scaleY);
+            decomposed.Skew = new Vector(scaledShear / scaleY, 0d);
+            decomposed.Angle = Math.Atan2(m12, m11);
+
+            return true;
+        }
+
+        public struct Decomposed
+        {
+            public Vector Translate;
+            public Vector Scale;
+            public Vector Skew;
+            public double Angle;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/AcrylicBackgroundSource.cs b/src/Avalonia.Base/Media/AcrylicBackgroundSource.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/AcrylicBackgroundSource.cs
rename to src/Avalonia.Base/Media/AcrylicBackgroundSource.cs
diff --git a/src/Avalonia.Visuals/Media/AlignmentX.cs b/src/Avalonia.Base/Media/AlignmentX.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/AlignmentX.cs
rename to src/Avalonia.Base/Media/AlignmentX.cs
diff --git a/src/Avalonia.Visuals/Media/AlignmentY.cs b/src/Avalonia.Base/Media/AlignmentY.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/AlignmentY.cs
rename to src/Avalonia.Base/Media/AlignmentY.cs
diff --git a/src/Avalonia.Visuals/Media/ArcSegment.cs b/src/Avalonia.Base/Media/ArcSegment.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/ArcSegment.cs
rename to src/Avalonia.Base/Media/ArcSegment.cs
diff --git a/src/Avalonia.Visuals/Media/BaselineAlignment.cs b/src/Avalonia.Base/Media/BaselineAlignment.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/BaselineAlignment.cs
rename to src/Avalonia.Base/Media/BaselineAlignment.cs
diff --git a/src/Avalonia.Visuals/Media/BezierSegment .cs b/src/Avalonia.Base/Media/BezierSegment .cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/BezierSegment .cs
rename to src/Avalonia.Base/Media/BezierSegment .cs
diff --git a/src/Avalonia.Visuals/Media/BoxShadow.cs b/src/Avalonia.Base/Media/BoxShadow.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/BoxShadow.cs
rename to src/Avalonia.Base/Media/BoxShadow.cs
diff --git a/src/Avalonia.Visuals/Media/BoxShadows.cs b/src/Avalonia.Base/Media/BoxShadows.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/BoxShadows.cs
rename to src/Avalonia.Base/Media/BoxShadows.cs
diff --git a/src/Avalonia.Base/Media/Brush.cs b/src/Avalonia.Base/Media/Brush.cs
new file mode 100644
index 0000000000..8d531e9394
--- /dev/null
+++ b/src/Avalonia.Base/Media/Brush.cs
@@ -0,0 +1,126 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Animation;
+using Avalonia.Animation.Animators;
+using Avalonia.Media.Immutable;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes how an area is painted.
+    /// </summary>
+    [TypeConverter(typeof(BrushConverter))]
+    public abstract class Brush : Animatable, IMutableBrush
+    {
+        /// <summary>
+        /// Defines the <see cref="Opacity"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> OpacityProperty =
+            AvaloniaProperty.Register<Brush, double>(nameof(Opacity), 1.0);
+
+        /// <summary>
+        /// Defines the <see cref="Transform"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ITransform?> TransformProperty =
+            AvaloniaProperty.Register<Brush, ITransform?>(nameof(Transform));
+
+        /// <summary>
+        /// Defines the <see cref="TransformOrigin"/> property
+        /// </summary>
+        public static readonly StyledProperty<RelativePoint> TransformOriginProperty =
+            AvaloniaProperty.Register<Brush, RelativePoint>(nameof(TransformOrigin));
+
+        /// <inheritdoc/>
+        public event EventHandler? Invalidated;
+
+        static Brush()
+        {
+            Animation.Animation.RegisterAnimator<BaseBrushAnimator>(prop => typeof(IBrush).IsAssignableFrom(prop.PropertyType));
+            AffectsRender<Brush>(OpacityProperty, TransformProperty);
+        }
+
+        /// <summary>
+        /// Gets or sets the opacity of the brush.
+        /// </summary>
+        public double Opacity
+        {
+            get { return GetValue(OpacityProperty); }
+            set { SetValue(OpacityProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the transform of the brush.
+        /// </summary>
+        public ITransform? Transform
+        {
+            get { return GetValue(TransformProperty); }
+            set { SetValue(TransformProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the origin of the brush <see cref="Transform"/>
+        /// </summary>
+        public RelativePoint TransformOrigin
+        {
+            get => GetValue(TransformOriginProperty);
+            set => SetValue(TransformOriginProperty, value);
+        }
+
+        /// <summary>
+        /// Parses a brush string.
+        /// </summary>
+        /// <param name="s">The brush string.</param>
+        /// <returns>The <see cref="Color"/>.</returns>
+        public static IBrush Parse(string s)
+        {
+            _ = s ?? throw new ArgumentNullException(nameof(s));
+
+            if (s.Length > 0)
+            {
+                if (s[0] == '#')
+                {
+                    return new ImmutableSolidColorBrush(Color.Parse(s));
+                }
+
+                var brush = KnownColors.GetKnownBrush(s);
+                if (brush != null)
+                {
+                    return brush;
+                }
+            }
+
+            throw new FormatException($"Invalid brush string: '{s}'.");
+        }
+
+        /// <inheritdoc/>
+        public abstract IBrush ToImmutable();
+
+        /// <summary>
+        /// Marks a property as affecting the brush's visual representation.
+        /// </summary>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a brush's static constructor, any change to the
+        /// property will cause the <see cref="Invalidated"/> event to be raised on the brush.
+        /// </remarks>
+        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
+            where T : Brush
+        {
+            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                (e.Sender as T)?.RaiseInvalidated(EventArgs.Empty);
+            }
+
+            foreach (var property in properties)
+            {
+                property.Changed.Subscribe(e => Invalidate(e));
+            }
+        }
+
+        /// <summary>
+        /// Raises the <see cref="Invalidated"/> event.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/BrushConverter.cs b/src/Avalonia.Base/Media/BrushConverter.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/BrushConverter.cs
rename to src/Avalonia.Base/Media/BrushConverter.cs
diff --git a/src/Avalonia.Visuals/Media/BrushExtensions.cs b/src/Avalonia.Base/Media/BrushExtensions.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/BrushExtensions.cs
rename to src/Avalonia.Base/Media/BrushExtensions.cs
diff --git a/src/Avalonia.Visuals/Media/BrushMappingMode.cs b/src/Avalonia.Base/Media/BrushMappingMode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/BrushMappingMode.cs
rename to src/Avalonia.Base/Media/BrushMappingMode.cs
diff --git a/src/Avalonia.Visuals/Media/Brushes.cs b/src/Avalonia.Base/Media/Brushes.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Brushes.cs
rename to src/Avalonia.Base/Media/Brushes.cs
diff --git a/src/Avalonia.Visuals/Media/CharacterHit.cs b/src/Avalonia.Base/Media/CharacterHit.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/CharacterHit.cs
rename to src/Avalonia.Base/Media/CharacterHit.cs
diff --git a/src/Avalonia.Base/Media/Color.cs b/src/Avalonia.Base/Media/Color.cs
new file mode 100644
index 0000000000..cb90404f6d
--- /dev/null
+++ b/src/Avalonia.Base/Media/Color.cs
@@ -0,0 +1,790 @@
+// Color conversion portions of this source file are adapted from the WinUI project
+// (https://github.com/microsoft/microsoft-ui-xaml)
+// and the Windows Community Toolkit project.
+// (https://github.com/CommunityToolkit/WindowsCommunityToolkit)
+//
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+using System.Globalization;
+#if !BUILDTASK
+using Avalonia.Animation.Animators;
+#endif
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// An ARGB color.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct Color : IEquatable<Color>
+    {
+        private const double byteToDouble = 1.0 / 255;
+
+        static Color()
+        {
+#if !BUILDTASK
+            Animation.Animation.RegisterAnimator<ColorAnimator>(prop => typeof(Color).IsAssignableFrom(prop.PropertyType));
+#endif
+        }
+
+        /// <summary>
+        /// Gets the Alpha component of the color.
+        /// </summary>
+        public byte A { get; }
+
+        /// <summary>
+        /// Gets the Red component of the color.
+        /// </summary>
+        public byte R { get; }
+
+        /// <summary>
+        /// Gets the Green component of the color.
+        /// </summary>
+        public byte G { get; }
+
+        /// <summary>
+        /// Gets the Blue component of the color.
+        /// </summary>
+        public byte B { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// </summary>
+        /// <param name="a">The alpha component.</param>
+        /// <param name="r">The red component.</param>
+        /// <param name="g">The green component.</param>
+        /// <param name="b">The blue component.</param>
+        public Color(byte a, byte r, byte g, byte b)
+        {
+            A = a;
+            R = r;
+            G = g;
+            B = b;
+        }
+
+        /// <summary>
+        /// Creates a <see cref="Color"/> from alpha, red, green and blue components.
+        /// </summary>
+        /// <param name="a">The alpha component.</param>
+        /// <param name="r">The red component.</param>
+        /// <param name="g">The green component.</param>
+        /// <param name="b">The blue component.</param>
+        /// <returns>The color.</returns>
+        public static Color FromArgb(byte a, byte r, byte g, byte b)
+        {
+            return new Color(a, r, g, b);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="Color"/> from red, green and blue components.
+        /// </summary>
+        /// <param name="r">The red component.</param>
+        /// <param name="g">The green component.</param>
+        /// <param name="b">The blue component.</param>
+        /// <returns>The color.</returns>
+        public static Color FromRgb(byte r, byte g, byte b)
+        {
+            return new Color(0xff, r, g, b);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="Color"/> from an integer.
+        /// </summary>
+        /// <param name="value">The integer value.</param>
+        /// <returns>The color.</returns>
+        public static Color FromUInt32(uint value)
+        {
+            return new Color(
+                (byte)((value >> 24) & 0xff),
+                (byte)((value >> 16) & 0xff),
+                (byte)((value >> 8) & 0xff),
+                (byte)(value & 0xff)
+            );
+        }
+
+        /// <summary>
+        /// Parses a color string.
+        /// </summary>
+        /// <param name="s">The color string.</param>
+        /// <returns>The <see cref="Color"/>.</returns>
+        public static Color Parse(string s)
+        {
+            if (s is null)
+            {
+                throw new ArgumentNullException(nameof(s));
+            }
+
+            if (TryParse(s, out Color color))
+            {
+                return color;
+            }
+
+            throw new FormatException($"Invalid color string: '{s}'.");
+        }
+
+        /// <summary>
+        /// Parses a color string.
+        /// </summary>
+        /// <param name="s">The color string.</param>
+        /// <returns>The <see cref="Color"/>.</returns>
+        public static Color Parse(ReadOnlySpan<char> s)
+        {
+            if (TryParse(s, out Color color))
+            {
+                return color;
+            }
+
+            throw new FormatException($"Invalid color string: '{s.ToString()}'.");
+        }
+
+        /// <summary>
+        /// Parses a color string.
+        /// </summary>
+        /// <param name="s">The color string.</param>
+        /// <param name="color">The parsed color</param>
+        /// <returns>The status of the operation.</returns>
+        public static bool TryParse(string s, out Color color)
+        {
+            color = default;
+
+            if (s is null)
+            {
+                return false;
+            }
+
+            if (s.Length == 0)
+            {
+                return false;
+            }
+
+            if (s[0] == '#' &&
+                TryParseHexFormat(s.AsSpan(), out color))
+            {
+                return true;
+            }
+
+            // Note: The length checks are also an important optimization.
+            // The shortest possible CSS format is "rbg(0,0,0)", Length = 10.
+
+            if (s.Length >= 10 &&
+                (s[0] == 'r' || s[0] == 'R') &&
+                (s[1] == 'g' || s[1] == 'G') &&
+                (s[2] == 'b' || s[2] == 'B') &&
+                TryParseCssFormat(s, out color))
+            {
+                return true;
+            }
+
+            if (s.Length >= 10 &&
+                (s[0] == 'h' || s[0] == 'H') &&
+                (s[1] == 's' || s[1] == 'S') &&
+                (s[2] == 'l' || s[2] == 'L') &&
+                HslColor.TryParse(s, out HslColor hslColor))
+            {
+                color = hslColor.ToRgb();
+                return true;
+            }
+
+            if (s.Length >= 10 &&
+                (s[0] == 'h' || s[0] == 'H') &&
+                (s[1] == 's' || s[1] == 'S') &&
+                (s[2] == 'v' || s[2] == 'V') &&
+                HsvColor.TryParse(s, out HsvColor hsvColor))
+            {
+                color = hsvColor.ToRgb();
+                return true;
+            }
+
+            var knownColor = KnownColors.GetKnownColor(s);
+
+            if (knownColor != KnownColor.None)
+            {
+                color = knownColor.ToColor();
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Parses a color string.
+        /// </summary>
+        /// <param name="s">The color string.</param>
+        /// <param name="color">The parsed color</param>
+        /// <returns>The status of the operation.</returns>
+        public static bool TryParse(ReadOnlySpan<char> s, out Color color)
+        {
+            if (s.Length == 0)
+            {
+                color = default;
+                return false;
+            }
+
+            if (s[0] == '#' &&
+                TryParseHexFormat(s, out color))
+            {
+                return true;
+            }
+
+            // At this point all parsing uses strings
+            var str = s.ToString();
+
+            // Note: The length checks are also an important optimization.
+            // The shortest possible CSS format is "rbg(0,0,0)", Length = 10.
+
+            if (s.Length >= 10 &&
+                (s[0] == 'r' || s[0] == 'R') &&
+                (s[1] == 'g' || s[1] == 'G') &&
+                (s[2] == 'b' || s[2] == 'B') &&
+                TryParseCssFormat(str, out color))
+            {
+                return true;
+            }
+
+            if (s.Length >= 10 &&
+                (s[0] == 'h' || s[0] == 'H') &&
+                (s[1] == 's' || s[1] == 'S') &&
+                (s[2] == 'l' || s[2] == 'L') &&
+                HslColor.TryParse(str, out HslColor hslColor))
+            {
+                color = hslColor.ToRgb();
+                return true;
+            }
+
+            if (s.Length >= 10 &&
+                (s[0] == 'h' || s[0] == 'H') &&
+                (s[1] == 's' || s[1] == 'S') &&
+                (s[2] == 'v' || s[2] == 'V') &&
+                HsvColor.TryParse(str, out HsvColor hsvColor))
+            {
+                color = hsvColor.ToRgb();
+                return true;
+            }
+
+            var knownColor = KnownColors.GetKnownColor(str);
+
+            if (knownColor != KnownColor.None)
+            {
+                color = knownColor.ToColor();
+                return true;
+            }
+
+            color = default;
+
+            return false;
+        }
+
+        /// <summary>
+        /// Parses the given span of characters representing a hex color value into a new <see cref="Color"/>.
+        /// </summary>
+        private static bool TryParseHexFormat(ReadOnlySpan<char> s, out Color color)
+        {
+            static bool TryParseCore(ReadOnlySpan<char> input, ref Color color)
+            {
+                var alphaComponent = 0u;
+
+                if (input.Length == 6)
+                {
+                    alphaComponent = 0xff000000;
+                }
+                else if (input.Length != 8)
+                {
+                    return false;
+                }
+
+                // TODO: (netstandard 2.1) Can use allocation free parsing.
+                if (!uint.TryParse(input.ToString(), NumberStyles.HexNumber, CultureInfo.InvariantCulture,
+                    out var parsed))
+                {
+                    return false;
+                }
+
+                color = FromUInt32(parsed | alphaComponent);
+
+                return true;
+            }
+
+            color = default;
+
+            ReadOnlySpan<char> input = s.Slice(1);
+
+            // Handle shorthand cases like #FFF (RGB) or #FFFF (ARGB).
+            if (input.Length == 3 || input.Length == 4)
+            {
+                var extendedLength = 2 * input.Length;
+                
+#if !BUILDTASK
+                Span<char> extended = stackalloc char[extendedLength];
+#else
+                char[] extended = new char[extendedLength];
+#endif
+
+                for (int i = 0; i < input.Length; i++)
+                {
+                    extended[2 * i + 0] = input[i];
+                    extended[2 * i + 1] = input[i];
+                }
+
+                return TryParseCore(extended, ref color);
+            }
+
+            return TryParseCore(input, ref color);
+        }
+
+        /// <summary>
+        /// Parses the given string representing a CSS color value into a new <see cref="Color"/>.
+        /// </summary>
+        private static bool TryParseCssFormat(string s, out Color color)
+        {
+            bool prefixMatched = false;
+
+            color = default;
+
+            if (s is null)
+            {
+                return false;
+            }
+
+            string workingString = s.Trim();
+
+            if (workingString.Length == 0 ||
+                workingString.IndexOf(",", StringComparison.Ordinal) < 0)
+            {
+                return false;
+            }
+
+            if (workingString.Length >= 11 &&
+                workingString.StartsWith("rgba(", StringComparison.OrdinalIgnoreCase) &&
+                workingString.EndsWith(")", StringComparison.Ordinal))
+            {
+                workingString = workingString.Substring(5, workingString.Length - 6);
+                prefixMatched = true;
+            }
+
+            if (prefixMatched == false &&
+                workingString.Length >= 10 &&
+                workingString.StartsWith("rgb(", StringComparison.OrdinalIgnoreCase) &&
+                workingString.EndsWith(")", StringComparison.Ordinal))
+            {
+                workingString = workingString.Substring(4, workingString.Length - 5);
+                prefixMatched = true;
+            }
+
+            if (prefixMatched == false)
+            {
+                return false;
+            }
+
+            string[] components = workingString.Split(',');
+
+            if (components.Length == 3) // RGB
+            {
+                if (InternalTryParseByte(components[0], out byte red) &&
+                    InternalTryParseByte(components[1], out byte green) &&
+                    InternalTryParseByte(components[2], out byte blue))
+                {
+                    color = new Color(0xFF, red, green, blue);
+                    return true;
+                }
+            }
+            else if (components.Length == 4) // RGBA
+            {
+                if (InternalTryParseByte(components[0], out byte red) &&
+                    InternalTryParseByte(components[1], out byte green) &&
+                    InternalTryParseByte(components[2], out byte blue) &&
+                    InternalTryParseDouble(components[3], out double alpha))
+                {
+                    color = new Color((byte)Math.Round(alpha * 255.0), red, green, blue);
+                    return true;
+                }
+            }
+
+            // Local function to specially parse a byte value with an optional percentage sign
+            bool InternalTryParseByte(string inString, out byte outByte)
+            {
+                // The percent sign, if it exists, must be at the end of the number
+                int percentIndex = inString.IndexOf("%", StringComparison.Ordinal);
+
+                if (percentIndex >= 0)
+                {
+                    var result = double.TryParse(
+                        inString.Substring(0, percentIndex),
+                        NumberStyles.Number,
+                        CultureInfo.InvariantCulture,
+                        out double percentage);
+
+                    outByte = (byte)Math.Round((percentage / 100.0) * 255.0);
+                    return result;
+                }
+                else
+                {
+                    return byte.TryParse(
+                        inString,
+                        NumberStyles.Number,
+                        CultureInfo.InvariantCulture,
+                        out outByte);
+                }
+            }
+
+            // Local function to specially parse a double value with an optional percentage sign
+            bool InternalTryParseDouble(string inString, out double outDouble)
+            {
+                // The percent sign, if it exists, must be at the end of the number
+                int percentIndex = inString.IndexOf("%", StringComparison.Ordinal);
+
+                if (percentIndex >= 0)
+                {
+                    var result = double.TryParse(
+                        inString.Substring(0, percentIndex),
+                        NumberStyles.Number,
+                        CultureInfo.InvariantCulture,
+                        out double percentage);
+
+                    outDouble = percentage / 100.0;
+                    return result;
+                }
+                else
+                {
+                    return double.TryParse(
+                        inString,
+                        NumberStyles.Number,
+                        CultureInfo.InvariantCulture,
+                        out outDouble);
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Returns the string representation of the color.
+        /// </summary>
+        /// <returns>
+        /// The string representation of the color.
+        /// </returns>
+        public override string ToString()
+        {
+            uint rgb = ToUint32();
+            return KnownColors.GetKnownColorName(rgb) ?? $"#{rgb.ToString("x8", CultureInfo.InvariantCulture)}";
+        }
+
+        /// <summary>
+        /// Returns the integer representation of the color.
+        /// </summary>
+        /// <returns>
+        /// The integer representation of the color.
+        /// </returns>
+        public uint ToUint32()
+        {
+            return ((uint)A << 24) | ((uint)R << 16) | ((uint)G << 8) | (uint)B;
+        }
+
+        /// <summary>
+        /// Returns the HSL color model equivalent of this RGB color.
+        /// </summary>
+        /// <returns>The HSL equivalent color.</returns>
+        public HslColor ToHsl()
+        {
+            // Don't use the HslColor(Color) constructor to avoid an extra HslColor
+            return Color.ToHsl(R, G, B, A);
+        }
+
+        /// <summary>
+        /// Returns the HSV color model equivalent of this RGB color.
+        /// </summary>
+        /// <returns>The HSV equivalent color.</returns>
+        public HsvColor ToHsv()
+        {
+            // Don't use the HsvColor(Color) constructor to avoid an extra HsvColor
+            return Color.ToHsv(R, G, B, A);
+        }
+
+        /// <inheritdoc/>
+        public bool Equals(Color other)
+        {
+            return A == other.A && R == other.R && G == other.G && B == other.B;
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object? obj)
+        {
+            return obj is Color other && Equals(other);
+        }
+
+        /// <inheritdoc/>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = A.GetHashCode();
+                hashCode = (hashCode * 397) ^ R.GetHashCode();
+                hashCode = (hashCode * 397) ^ G.GetHashCode();
+                hashCode = (hashCode * 397) ^ B.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// Converts the given RGB color to its HSL color equivalent.
+        /// </summary>
+        /// <param name="color">The color in the RGB color model.</param>
+        /// <returns>A new <see cref="HslColor"/> equivalent to the given RGBA values.</returns>
+        public static HslColor ToHsl(Color color)
+        {
+            // Normalize RGBA components into the 0..1 range
+            return Color.ToHsl(
+                (byteToDouble * color.R),
+                (byteToDouble * color.G),
+                (byteToDouble * color.B),
+                (byteToDouble * color.A));
+        }
+
+        /// <summary>
+        /// Converts the given RGBA color component values to their HSL color equivalent.
+        /// </summary>
+        /// <param name="red">The Red component in the RGB color model.</param>
+        /// <param name="green">The Green component in the RGB color model.</param>
+        /// <param name="blue">The Blue component in the RGB color model.</param>
+        /// <param name="alpha">The Alpha component.</param>
+        /// <returns>A new <see cref="HslColor"/> equivalent to the given RGBA values.</returns>
+        public static HslColor ToHsl(
+            byte red,
+            byte green,
+            byte blue,
+            byte alpha = 0xFF)
+        {
+            // Normalize RGBA components into the 0..1 range
+            return Color.ToHsl(
+                (byteToDouble * red),
+                (byteToDouble * green),
+                (byteToDouble * blue),
+                (byteToDouble * alpha));
+        }
+
+        /// <summary>
+        /// Converts the given RGBA color component values to their HSL color equivalent.
+        /// </summary>
+        /// <remarks>
+        /// Warning: No bounds checks or clamping is done on the input component values.
+        /// This method is for internal-use only and the caller must ensure bounds.
+        /// </remarks>
+        /// <param name="r">The Red component in the RGB color model within the range 0..1.</param>
+        /// <param name="g">The Green component in the RGB color model within the range 0..1.</param>
+        /// <param name="b">The Blue component in the RGB color model within the range 0..1.</param>
+        /// <param name="a">The Alpha component in the RGB color model within the range 0..1.</param>
+        /// <returns>A new <see cref="HslColor"/> equivalent to the given RGBA values.</returns>
+        internal static HslColor ToHsl(
+            double r,
+            double g,
+            double b,
+            double a = 1.0)
+        {
+            // Note: Conversion code is originally based on ColorHelper in the Windows Community Toolkit (licensed MIT)
+            // https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/main/Microsoft.Toolkit.Uwp/Helpers/ColorHelper.cs
+            // It has been modified.
+
+            double max = r >= g ? (r >= b ? r : b) : (g >= b ? g : b);
+            double min = r <= g ? (r <= b ? r : b) : (g <= b ? g : b);
+            double chroma = max - min;
+            double h1;
+
+            if (chroma == 0)
+            {
+                h1 = 0;
+            }
+            else if (max == r)
+            {
+                // The % operator doesn't do proper modulo on negative
+                // numbers, so we'll add 6 before using it
+                h1 = (((g - b) / chroma) + 6) % 6;
+            }
+            else if (max == g)
+            {
+                h1 = 2 + ((b - r) / chroma);
+            }
+            else
+            {
+                h1 = 4 + ((r - g) / chroma);
+            }
+
+            double lightness = 0.5 * (max + min);
+            double saturation = chroma == 0 ? 0 : chroma / (1 - Math.Abs((2 * lightness) - 1));
+
+            return new HslColor(a, 60 * h1, saturation, lightness, clampValues: false);
+        }
+
+        /// <summary>
+        /// Converts the given RGB color to its HSV color equivalent.
+        /// </summary>
+        /// <param name="color">The color in the RGB color model.</param>
+        /// <returns>A new <see cref="HsvColor"/> equivalent to the given RGBA values.</returns>
+        public static HsvColor ToHsv(Color color)
+        {
+            // Normalize RGBA components into the 0..1 range
+            return Color.ToHsv(
+                (byteToDouble * color.R),
+                (byteToDouble * color.G),
+                (byteToDouble * color.B),
+                (byteToDouble * color.A));
+        }
+
+        /// <summary>
+        /// Converts the given RGBA color component values to their HSV color equivalent.
+        /// </summary>
+        /// <param name="red">The Red component in the RGB color model.</param>
+        /// <param name="green">The Green component in the RGB color model.</param>
+        /// <param name="blue">The Blue component in the RGB color model.</param>
+        /// <param name="alpha">The Alpha component.</param>
+        /// <returns>A new <see cref="HsvColor"/> equivalent to the given RGBA values.</returns>
+        public static HsvColor ToHsv(
+            byte red,
+            byte green,
+            byte blue,
+            byte alpha = 0xFF)
+        {
+            // Normalize RGBA components into the 0..1 range
+            return Color.ToHsv(
+                (byteToDouble * red),
+                (byteToDouble * green),
+                (byteToDouble * blue),
+                (byteToDouble * alpha));
+        }
+
+        /// <summary>
+        /// Converts the given RGBA color component values to their HSV color equivalent.
+        /// </summary>
+        /// <remarks>
+        /// Warning: No bounds checks or clamping is done on the input component values.
+        /// This method is for internal-use only and the caller must ensure bounds.
+        /// </remarks>
+        /// <param name="r">The Red component in the RGB color model within the range 0..1.</param>
+        /// <param name="g">The Green component in the RGB color model within the range 0..1.</param>
+        /// <param name="b">The Blue component in the RGB color model within the range 0..1.</param>
+        /// <param name="a">The Alpha component in the RGB color model within the range 0..1.</param>
+        /// <returns>A new <see cref="HsvColor"/> equivalent to the given RGBA values.</returns>
+        internal static HsvColor ToHsv(
+            double r,
+            double g,
+            double b,
+            double a = 1.0)
+        {
+            // Note: Conversion code is originally based on the C++ in WinUI (licensed MIT)
+            // https://github.com/microsoft/microsoft-ui-xaml/blob/main/dev/Common/ColorConversion.cpp
+            // This was used because it is the best documented and likely most optimized for performance
+            // Alpha support was added
+
+            double hue;
+            double saturation;
+            double value;
+
+            double max = r >= g ? (r >= b ? r : b) : (g >= b ? g : b);
+            double min = r <= g ? (r <= b ? r : b) : (g <= b ? g : b);
+
+            // The value, a number between 0 and 1, is the largest of R, G, and B (divided by 255).
+            // Conceptually speaking, it represents how much color is present.
+            // If at least one of R, G, B is 255, then there exists as much color as there can be.
+            // If RGB = (0, 0, 0), then there exists no color at all - a value of zero corresponds
+            // to black (i.e., the absence of any color).
+            value = max;
+
+            // The "chroma" of the color is a value directly proportional to the extent to which
+            // the color diverges from greyscale.  If, for example, we have RGB = (255, 255, 0),
+            // then the chroma is maximized - this is a pure yellow, no gray of any kind.
+            // On the other hand, if we have RGB = (128, 128, 128), then the chroma being zero
+            // implies that this color is pure greyscale, with no actual hue to be found.
+            var chroma = max - min;
+
+            // If the chrome is zero, then hue is technically undefined - a greyscale color
+            // has no hue.  For the sake of convenience, we'll just set hue to zero, since
+            // it will be unused in this circumstance.  Since the color is purely gray,
+            // saturation is also equal to zero - you can think of saturation as basically
+            // a measure of hue intensity, such that no hue at all corresponds to a
+            // nonexistent intensity.
+            if (chroma == 0)
+            {
+                hue = 0.0;
+                saturation = 0.0;
+            }
+            else
+            {
+                // In this block, hue is properly defined, so we'll extract both hue
+                // and saturation information from the RGB color.
+
+                // Hue can be thought of as a cyclical thing, between 0 degrees and 360 degrees.
+                // A hue of 0 degrees is red; 120 degrees is green; 240 degrees is blue; and 360 is back to red.
+                // Every other hue is somewhere between either red and green, green and blue, and blue and red,
+                // so every other hue can be thought of as an angle on this color wheel.
+                // These if/else statements determines where on this color wheel our color lies.
+                if (r == max)
+                {
+                    // If the red channel is the most pronounced channel, then we exist
+                    // somewhere between (-60, 60) on the color wheel - i.e., the section around 0 degrees
+                    // where red dominates.  We figure out where in that section we are exactly
+                    // by considering whether the green or the blue channel is greater - by subtracting green from blue,
+                    // then if green is greater, we'll nudge ourselves closer to 60, whereas if blue is greater, then
+                    // we'll nudge ourselves closer to -60.  We then divide by chroma (which will actually make the result larger,
+                    // since chroma is a value between 0 and 1) to normalize the value to ensure that we get the right hue
+                    // even if we're very close to greyscale.
+                    hue = 60 * (g - b) / chroma;
+                }
+                else if (g == max)
+                {
+                    // We do the exact same for the case where the green channel is the most pronounced channel,
+                    // only this time we want to see if we should tilt towards the blue direction or the red direction.
+                    // We add 120 to center our value in the green third of the color wheel.
+                    hue = 120 + (60 * (b - r) / chroma);
+                }
+                else // blue == max
+                {
+                    // And we also do the exact same for the case where the blue channel is the most pronounced channel,
+                    // only this time we want to see if we should tilt towards the red direction or the green direction.
+                    // We add 240 to center our value in the blue third of the color wheel.
+                    hue = 240 + (60 * (r - g) / chroma);
+                }
+
+                // Since we want to work within the range [0, 360), we'll add 360 to any value less than zero -
+                // this will bump red values from within -60 to -1 to 300 to 359.  The hue is the same at both values.
+                if (hue < 0.0)
+                {
+                    hue += 360.0;
+                }
+
+                // The saturation, our final HSV axis, can be thought of as a value between 0 and 1 indicating how intense our color is.
+                // To find it, we divide the chroma - the distance between the minimum and the maximum RGB channels - by the maximum channel (i.e., the value).
+                // This effectively normalizes the chroma - if the maximum is 0.5 and the minimum is 0, the saturation will be (0.5 - 0) / 0.5 = 1,
+                // meaning that although this color is not as bright as it can be, the dark color is as intense as it possibly could be.
+                // If, on the other hand, the maximum is 0.5 and the minimum is 0.25, then the saturation will be (0.5 - 0.25) / 0.5 = 0.5,
+                // meaning that this color is partially washed out.
+                // A saturation value of 0 corresponds to a greyscale color, one in which the color is *completely* washed out and there is no actual hue.
+                saturation = chroma / value;
+            }
+
+            return new HsvColor(a, hue, saturation, value, clampValues: false);
+        }
+
+        /// <summary>
+        /// Indicates whether the values of two specified <see cref="Color"/> objects are equal.
+        /// </summary>
+        /// <param name="left">The first object to compare.</param>
+        /// <param name="right">The second object to compare.</param>
+        /// <returns>True if left and right are equal; otherwise, false.</returns>
+        public static bool operator ==(Color left, Color right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Indicates whether the values of two specified <see cref="Color"/> objects are not equal.
+        /// </summary>
+        /// <param name="left">The first object to compare.</param>
+        /// <param name="right">The second object to compare.</param>
+        /// <returns>True if left and right are not equal; otherwise, false.</returns>
+        public static bool operator !=(Color left, Color right)
+        {
+            return !left.Equals(right);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Colors.cs b/src/Avalonia.Base/Media/Colors.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Colors.cs
rename to src/Avalonia.Base/Media/Colors.cs
diff --git a/src/Avalonia.Base/Media/ConicGradientBrush.cs b/src/Avalonia.Base/Media/ConicGradientBrush.cs
new file mode 100644
index 0000000000..4b50019ddc
--- /dev/null
+++ b/src/Avalonia.Base/Media/ConicGradientBrush.cs
@@ -0,0 +1,55 @@
+using Avalonia.Media.Immutable;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Paints an area with a swept circular gradient.
+    /// </summary>
+    public sealed class ConicGradientBrush : GradientBrush, IConicGradientBrush
+    {
+        /// <summary>
+        /// Defines the <see cref="Center"/> property.
+        /// </summary>
+        public static readonly StyledProperty<RelativePoint> CenterProperty =
+            AvaloniaProperty.Register<ConicGradientBrush, RelativePoint>(
+                nameof(Center),
+                RelativePoint.Center);
+
+        /// <summary>
+        /// Defines the <see cref="Angle"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> AngleProperty =
+            AvaloniaProperty.Register<ConicGradientBrush, double>(
+                nameof(Angle),
+                0);
+        
+        static ConicGradientBrush()
+        {
+            AffectsRender<ConicGradientBrush>(CenterProperty, AngleProperty);
+        }
+
+        /// <summary>
+        /// Gets or sets the center point of the gradient.
+        /// </summary>
+        public RelativePoint Center
+        {
+            get { return GetValue(CenterProperty); }
+            set { SetValue(CenterProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the angle of the start and end of the sweep, measured from above the center point.
+        /// </summary>
+        public double Angle
+        {
+            get { return GetValue(AngleProperty); }
+            set { SetValue(AngleProperty, value); }
+        }
+
+        /// <inheritdoc/>
+        public override IBrush ToImmutable()
+        {
+            return new ImmutableConicGradientBrush(this);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/DashStyle.cs b/src/Avalonia.Base/Media/DashStyle.cs
new file mode 100644
index 0000000000..abee580020
--- /dev/null
+++ b/src/Avalonia.Base/Media/DashStyle.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using Avalonia.Animation;
+using Avalonia.Collections;
+using Avalonia.Media.Immutable;
+
+#nullable enable
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents the sequence of dashes and gaps that will be applied by a <see cref="Pen"/>.
+    /// </summary>
+    public class DashStyle : Animatable, IDashStyle, IAffectsRender
+    {
+        /// <summary>
+        /// Defines the <see cref="Dashes"/> property.
+        /// </summary>
+        public static readonly StyledProperty<AvaloniaList<double>> DashesProperty =
+            AvaloniaProperty.Register<DashStyle, AvaloniaList<double>>(nameof(Dashes));
+
+        /// <summary>
+        /// Defines the <see cref="Offset"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> OffsetProperty =
+            AvaloniaProperty.Register<DashStyle, double>(nameof(Offset));
+
+        private static ImmutableDashStyle? s_dash;
+        private static ImmutableDashStyle? s_dot;
+        private static ImmutableDashStyle? s_dashDot;
+        private static ImmutableDashStyle? s_dashDotDot;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DashStyle"/> class.
+        /// </summary>
+        public DashStyle()
+            : this(null, 0)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DashStyle"/> class.
+        /// </summary>
+        /// <param name="dashes">The dashes collection.</param>
+        /// <param name="offset">The dash sequence offset.</param>
+        public DashStyle(IEnumerable<double>? dashes, double offset)
+        {
+            Dashes = (dashes as AvaloniaList<double>) ?? new AvaloniaList<double>(dashes ?? Array.Empty<double>());
+            Offset = offset;
+        }
+
+        static DashStyle()
+        {
+            void RaiseInvalidated(AvaloniaPropertyChangedEventArgs e)
+            {
+                ((DashStyle)e.Sender).Invalidated?.Invoke(e.Sender, EventArgs.Empty);
+            }
+
+            DashesProperty.Changed.Subscribe(RaiseInvalidated);
+            OffsetProperty.Changed.Subscribe(RaiseInvalidated);
+        }
+
+        /// <summary>
+        /// Represents a dashed <see cref="DashStyle"/>.
+        /// </summary>
+        public static IDashStyle Dash => s_dash ??= new ImmutableDashStyle(new double[] { 2, 2 }, 1);
+
+        /// <summary>
+        /// Represents a dotted <see cref="DashStyle"/>.
+        /// </summary>
+        public static IDashStyle Dot => s_dot ??= new ImmutableDashStyle(new double[] { 0, 2 }, 0);
+
+        /// <summary>
+        /// Represents a dashed dotted <see cref="DashStyle"/>.
+        /// </summary>
+        public static IDashStyle DashDot => s_dashDot ??= new ImmutableDashStyle(new double[] { 2, 2, 0, 2 }, 1);
+
+        /// <summary>
+        /// Represents a dashed double dotted <see cref="DashStyle"/>.
+        /// </summary>
+        public static IDashStyle DashDotDot => s_dashDotDot ??= new ImmutableDashStyle(new double[] { 2, 2, 0, 2, 0, 2 }, 1);
+
+        /// <summary>
+        /// Gets or sets the length of alternating dashes and gaps.
+        /// </summary>
+        public AvaloniaList<double> Dashes
+        {
+            get => GetValue(DashesProperty);
+            set => SetValue(DashesProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets how far in the dash sequence the stroke will start.
+        /// </summary>
+        public double Offset
+        {
+            get => GetValue(OffsetProperty);
+            set => SetValue(OffsetProperty, value);
+        }
+
+        IReadOnlyList<double> IDashStyle.Dashes => Dashes;
+
+        /// <summary>
+        /// Raised when the dash style changes.
+        /// </summary>
+        public event EventHandler? Invalidated;
+
+        /// <summary>
+        /// Returns an immutable clone of the <see cref="DashStyle"/>.
+        /// </summary>
+        /// <returns></returns>
+        public ImmutableDashStyle ToImmutable() => new ImmutableDashStyle(Dashes, Offset);
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == DashesProperty)
+            {
+                var (oldValue, newValue) = change.GetOldAndNewValue<AvaloniaList<double>>();
+
+                if (oldValue is object)
+                {
+                    oldValue.CollectionChanged -= DashesChanged;
+                }
+
+                if (newValue is object)
+                {
+                    newValue.CollectionChanged += DashesChanged;
+                }
+            }
+        }
+
+        private void DashesChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            Invalidated?.Invoke(this, e);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Drawing.cs b/src/Avalonia.Base/Media/Drawing.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Drawing.cs
rename to src/Avalonia.Base/Media/Drawing.cs
diff --git a/src/Avalonia.Base/Media/DrawingContext.cs b/src/Avalonia.Base/Media/DrawingContext.cs
new file mode 100644
index 0000000000..d0f3b9e21a
--- /dev/null
+++ b/src/Avalonia.Base/Media/DrawingContext.cs
@@ -0,0 +1,451 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Platform;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Threading;
+using Avalonia.Utilities;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media
+{
+    public sealed class DrawingContext : IDisposable
+    {
+        private readonly bool _ownsImpl;
+        private int _currentLevel;
+
+
+        private static ThreadSafeObjectPool<Stack<PushedState>> StateStackPool { get; } =
+            ThreadSafeObjectPool<Stack<PushedState>>.Default;
+
+        private static ThreadSafeObjectPool<Stack<TransformContainer>> TransformStackPool { get; } =
+            ThreadSafeObjectPool<Stack<TransformContainer>>.Default;
+
+        private Stack<PushedState>? _states = StateStackPool.Get();
+
+        private Stack<TransformContainer>? _transformContainers = TransformStackPool.Get();
+
+        readonly struct TransformContainer
+        {
+            public readonly Matrix LocalTransform;
+            public readonly Matrix ContainerTransform;
+
+            public TransformContainer(Matrix localTransform, Matrix containerTransform)
+            {
+                LocalTransform = localTransform;
+                ContainerTransform = containerTransform;
+            }
+        }
+
+        public DrawingContext(IDrawingContextImpl impl)
+        {
+            PlatformImpl = impl;
+            _ownsImpl = true;
+        }
+        
+        public DrawingContext(IDrawingContextImpl impl, bool ownsImpl)
+        {
+            _ownsImpl = ownsImpl;
+            PlatformImpl = impl;
+        }
+
+        public IDrawingContextImpl PlatformImpl { get; }
+
+        private Matrix _currentTransform = Matrix.Identity;
+
+        private Matrix _currentContainerTransform = Matrix.Identity;
+
+        /// <summary>
+        /// Gets the current transform of the drawing context.
+        /// </summary>
+        public Matrix CurrentTransform
+        {
+            get { return _currentTransform; }
+            private set
+            {
+                _currentTransform = value;
+                var transform = _currentTransform * _currentContainerTransform;
+                PlatformImpl.Transform = transform;
+            }
+        }
+
+        //HACK: This is a temporary hack that is used in the render loop 
+        //to update TransformedBounds property
+        [Obsolete("HACK for render loop, don't use")]
+        public Matrix CurrentContainerTransform => _currentContainerTransform;
+
+        /// <summary>
+        /// Draws an image.
+        /// </summary>
+        /// <param name="source">The image.</param>
+        /// <param name="rect">The rect in the output to draw to.</param>
+        public void DrawImage(IImage source, Rect rect)
+        {
+            _ = source ?? throw new ArgumentNullException(nameof(source));
+
+            DrawImage(source, new Rect(source.Size), rect);
+        }
+
+        /// <summary>
+        /// Draws an image.
+        /// </summary>
+        /// <param name="source">The image.</param>
+        /// <param name="sourceRect">The rect in the image to draw.</param>
+        /// <param name="destRect">The rect in the output to draw to.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        public void DrawImage(IImage source, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = default)
+        {
+            _ = source ?? throw new ArgumentNullException(nameof(source));
+
+            source.Draw(this, sourceRect, destRect, bitmapInterpolationMode);
+        }
+
+        /// <summary>
+        /// Draws a line.
+        /// </summary>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="p1">The first point of the line.</param>
+        /// <param name="p2">The second point of the line.</param>
+        public void DrawLine(IPen pen, Point p1, Point p2)
+        {
+            if (PenIsVisible(pen))
+            {
+                PlatformImpl.DrawLine(pen, p1, p2);
+            }
+        }
+
+        /// <summary>
+        /// Draws a geometry.
+        /// </summary>
+        /// <param name="brush">The fill brush.</param>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="geometry">The geometry.</param>
+        public void DrawGeometry(IBrush? brush, IPen? pen, Geometry geometry)
+        {
+            if (geometry.PlatformImpl is not null)
+                DrawGeometry(brush, pen, geometry.PlatformImpl);
+        }
+
+        /// <summary>
+        /// Draws a geometry.
+        /// </summary>
+        /// <param name="brush">The fill brush.</param>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="geometry">The geometry.</param>
+        public void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry)
+        {
+            _ = geometry ?? throw new ArgumentNullException(nameof(geometry));
+
+            if (brush != null || PenIsVisible(pen))
+            {
+                PlatformImpl.DrawGeometry(brush, pen, geometry);
+            }
+        }
+
+        /// <summary>
+        /// Draws a rectangle with the specified Brush and Pen.
+        /// </summary>
+        /// <param name="brush">The brush used to fill the rectangle, or <c>null</c> for no fill.</param>
+        /// <param name="pen">The pen used to stroke the rectangle, or <c>null</c> for no stroke.</param>
+        /// <param name="rect">The rectangle bounds.</param>
+        /// <param name="radiusX">The radius in the X dimension of the rounded corners.
+        ///     This value will be clamped to the range of 0 to Width/2
+        /// </param>
+        /// <param name="radiusY">The radius in the Y dimension of the rounded corners.
+        ///     This value will be clamped to the range of 0 to Height/2
+        /// </param>
+        /// <param name="boxShadows">Box shadow effect parameters</param>
+        /// <remarks>
+        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
+        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
+        /// </remarks>
+        public void DrawRectangle(IBrush? brush, IPen? pen, Rect rect, double radiusX = 0, double radiusY = 0,
+            BoxShadows boxShadows = default)
+        {
+            if (brush == null && !PenIsVisible(pen))
+            {
+                return;
+            }
+
+            if (!MathUtilities.IsZero(radiusX))
+            {
+                radiusX = Math.Min(radiusX, rect.Width / 2);
+            }
+
+            if (!MathUtilities.IsZero(radiusY))
+            {
+                radiusY = Math.Min(radiusY, rect.Height / 2);
+            }
+
+            PlatformImpl.DrawRectangle(brush, pen, new RoundedRect(rect, radiusX, radiusY), boxShadows);
+        }
+
+        /// <summary>
+        /// Draws the outline of a rectangle.
+        /// </summary>
+        /// <param name="pen">The pen.</param>
+        /// <param name="rect">The rectangle bounds.</param>
+        /// <param name="cornerRadius">The corner radius.</param>
+        public void DrawRectangle(IPen pen, Rect rect, float cornerRadius = 0.0f)
+        {
+            DrawRectangle(null, pen, rect, cornerRadius, cornerRadius);
+        }
+
+        /// <summary>
+        /// Draws an ellipse with the specified Brush and Pen.
+        /// </summary>
+        /// <param name="brush">The brush used to fill the ellipse, or <c>null</c> for no fill.</param>
+        /// <param name="pen">The pen used to stroke the ellipse, or <c>null</c> for no stroke.</param>
+        /// <param name="center">The location of the center of the ellipse.</param>
+        /// <param name="radiusX">The horizontal radius of the ellipse.</param>
+        /// <param name="radiusY">The vertical radius of the ellipse.</param>
+        /// <remarks>
+        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
+        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
+        /// </remarks>
+        public void DrawEllipse(IBrush? brush, IPen? pen, Point center, double radiusX, double radiusY)
+        {
+            if (brush == null && !PenIsVisible(pen))
+            {
+                return;
+            }
+
+            var originX = center.X - radiusX;
+            var originY = center.Y - radiusY;
+            var width = radiusX * 2;
+            var height = radiusY * 2;
+
+            PlatformImpl.DrawEllipse(brush, pen, new Rect(originX, originY, width, height));
+        }
+
+        /// <summary>
+        /// Draws a custom drawing operation
+        /// </summary>
+        /// <param name="custom">custom operation</param>
+        public void Custom(ICustomDrawOperation custom) => PlatformImpl.Custom(custom);
+
+        /// <summary>
+        /// Draws text.
+        /// </summary>
+        /// <param name="origin">The upper-left corner of the text.</param>
+        /// <param name="text">The text.</param>
+        public void DrawText(FormattedText text, Point origin)
+        {
+            _ = text ?? throw new ArgumentNullException(nameof(text));
+         
+           text.Draw(this, origin);            
+        }
+
+        /// <summary>
+        /// Draws a glyph run.
+        /// </summary>
+        /// <param name="foreground">The foreground brush.</param>
+        /// <param name="glyphRun">The glyph run.</param>
+        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+        {
+            _ = glyphRun ?? throw new ArgumentNullException(nameof(glyphRun));
+
+            if (foreground != null)
+            {
+                PlatformImpl.DrawGlyphRun(foreground, glyphRun);
+            }
+        }
+
+        /// <summary>
+        /// Draws a filled rectangle.
+        /// </summary>
+        /// <param name="brush">The brush.</param>
+        /// <param name="rect">The rectangle bounds.</param>
+        /// <param name="cornerRadius">The corner radius.</param>
+        public void FillRectangle(IBrush brush, Rect rect, float cornerRadius = 0.0f)
+        {
+            DrawRectangle(brush, null, rect, cornerRadius, cornerRadius);
+        }
+
+        public readonly struct PushedState : IDisposable
+        {
+            private readonly int _level;
+            private readonly DrawingContext _context;
+            private readonly Matrix _matrix;
+            private readonly PushedStateType _type;
+
+            public enum PushedStateType
+            {
+                None,
+                Matrix,
+                Opacity,
+                Clip,
+                MatrixContainer,
+                GeometryClip,
+                OpacityMask,
+            }
+
+            public PushedState(DrawingContext context, PushedStateType type, Matrix matrix = default(Matrix))
+            {
+                if (context._states is null)
+                    throw new ObjectDisposedException(nameof(DrawingContext));
+
+                _context = context;
+                _type = type;
+                _matrix = matrix;
+                _level = context._currentLevel += 1;
+                context._states.Push(this);
+            }
+
+            public void Dispose()
+            {
+                if (_type == PushedStateType.None)
+                    return;
+                if (_context._states is null || _context._transformContainers is null)
+                    throw new ObjectDisposedException(nameof(DrawingContext));
+                if (_context._currentLevel != _level)
+                    throw new InvalidOperationException("Wrong Push/Pop state order");
+                _context._currentLevel--;
+                _context._states.Pop();
+                if (_type == PushedStateType.Matrix)
+                    _context.CurrentTransform = _matrix;
+                else if (_type == PushedStateType.Clip)
+                    _context.PlatformImpl.PopClip();
+                else if (_type == PushedStateType.Opacity)
+                    _context.PlatformImpl.PopOpacity();
+                else if (_type == PushedStateType.GeometryClip)
+                    _context.PlatformImpl.PopGeometryClip();
+                else if (_type == PushedStateType.OpacityMask)
+                    _context.PlatformImpl.PopOpacityMask();
+                else if (_type == PushedStateType.MatrixContainer)
+                {
+                    var cont = _context._transformContainers.Pop();
+                    _context._currentContainerTransform = cont.ContainerTransform;
+                    _context.CurrentTransform = cont.LocalTransform;
+                }
+            }
+        }
+
+
+        public PushedState PushClip(RoundedRect clip)
+        {
+            PlatformImpl.PushClip(clip);
+            return new PushedState(this, PushedState.PushedStateType.Clip);
+        }
+
+        /// <summary>
+        /// Pushes a clip rectangle.
+        /// </summary>
+        /// <param name="clip">The clip rectangle.</param>
+        /// <returns>A disposable used to undo the clip rectangle.</returns>
+        public PushedState PushClip(Rect clip)
+        {
+            PlatformImpl.PushClip(clip);
+            return new PushedState(this, PushedState.PushedStateType.Clip);
+        }
+
+        /// <summary>
+        /// Pushes a clip geometry.
+        /// </summary>
+        /// <param name="clip">The clip geometry.</param>
+        /// <returns>A disposable used to undo the clip geometry.</returns>
+        public PushedState PushGeometryClip(Geometry clip)
+        {
+            _ = clip ?? throw new ArgumentNullException(nameof(clip));
+
+            // HACK: This check was added when nullable annotations pointed out that we're potentially
+            // pushing a null value for the clip here. Ideally we'd return an empty PushedState here but
+            // I don't want to make that change as part of adding nullable annotations.
+            if (clip.PlatformImpl is null)
+                throw new InvalidOperationException("Cannot push empty geometry clip.");
+
+            PlatformImpl.PushGeometryClip(clip.PlatformImpl);
+            return new PushedState(this, PushedState.PushedStateType.GeometryClip);
+        }
+
+        /// <summary>
+        /// Pushes an opacity value.
+        /// </summary>
+        /// <param name="opacity">The opacity.</param>
+        /// <returns>A disposable used to undo the opacity.</returns>
+        public PushedState PushOpacity(double opacity)
+        //TODO: Eliminate platform-specific push opacity call
+        {
+            PlatformImpl.PushOpacity(opacity);
+            return new PushedState(this, PushedState.PushedStateType.Opacity);
+        }
+
+        /// <summary>
+        /// Pushes an opacity mask.
+        /// </summary>
+        /// <param name="mask">The opacity mask.</param>
+        /// <param name="bounds">
+        /// The size of the brush's target area. TODO: Are we sure this is needed?
+        /// </param>
+        /// <returns>A disposable to undo the opacity mask.</returns>
+        public PushedState PushOpacityMask(IBrush mask, Rect bounds)
+        {
+            PlatformImpl.PushOpacityMask(mask, bounds);
+            return new PushedState(this, PushedState.PushedStateType.OpacityMask);
+        }
+
+        /// <summary>
+        /// Pushes a matrix post-transformation.
+        /// </summary>
+        /// <param name="matrix">The matrix</param>
+        /// <returns>A disposable used to undo the transformation.</returns>
+        public PushedState PushPostTransform(Matrix matrix) => PushSetTransform(CurrentTransform * matrix);
+
+        /// <summary>
+        /// Pushes a matrix pre-transformation.
+        /// </summary>
+        /// <param name="matrix">The matrix</param>
+        /// <returns>A disposable used to undo the transformation.</returns>
+        public PushedState PushPreTransform(Matrix matrix) => PushSetTransform(matrix * CurrentTransform);
+
+        /// <summary>
+        /// Sets the current matrix transformation.
+        /// </summary>
+        /// <param name="matrix">The matrix</param>
+        /// <returns>A disposable used to undo the transformation.</returns>
+        public PushedState PushSetTransform(Matrix matrix)
+        {
+            var oldMatrix = CurrentTransform;
+            CurrentTransform = matrix;
+
+            return new PushedState(this, PushedState.PushedStateType.Matrix, oldMatrix);
+        }
+
+        /// <summary>
+        /// Pushes a new transform context.
+        /// </summary>
+        /// <returns>A disposable used to undo the transformation.</returns>
+        public PushedState PushTransformContainer()
+        {
+            if (_transformContainers is null)
+                throw new ObjectDisposedException(nameof(DrawingContext));
+            _transformContainers.Push(new TransformContainer(CurrentTransform, _currentContainerTransform));
+            _currentContainerTransform = CurrentTransform * _currentContainerTransform;
+            _currentTransform = Matrix.Identity;
+            return new PushedState(this, PushedState.PushedStateType.MatrixContainer);
+        }
+
+        /// <summary>
+        /// Disposes of any resources held by the <see cref="DrawingContext"/>.
+        /// </summary>
+        public void Dispose()
+        {
+            if (_states is null || _transformContainers is null)
+                throw new ObjectDisposedException(nameof(DrawingContext));
+            while (_states.Count != 0)
+                _states.Peek().Dispose();
+            StateStackPool.Return(_states);
+            _states = null;
+            if (_transformContainers.Count != 0)
+                throw new InvalidOperationException("Transform container stack is non-empty");
+            TransformStackPool.Return(_transformContainers);
+            _transformContainers = null;
+            if (_ownsImpl)
+                PlatformImpl.Dispose();
+        }
+
+        private static bool PenIsVisible(IPen? pen)
+        {
+            return pen?.Brush != null && pen.Thickness > 0;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/DrawingGroup.cs b/src/Avalonia.Base/Media/DrawingGroup.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/DrawingGroup.cs
rename to src/Avalonia.Base/Media/DrawingGroup.cs
diff --git a/src/Avalonia.Base/Media/DrawingImage.cs b/src/Avalonia.Base/Media/DrawingImage.cs
new file mode 100644
index 0000000000..38ddbdfaed
--- /dev/null
+++ b/src/Avalonia.Base/Media/DrawingImage.cs
@@ -0,0 +1,88 @@
+using System;
+using Avalonia.Metadata;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// An <see cref="IImage"/> that uses a <see cref="Drawing"/> for content.
+    /// </summary>
+    public class DrawingImage : AvaloniaObject, IImage, IAffectsRender
+    {
+        public DrawingImage() 
+        { 
+        }
+
+        public DrawingImage(Drawing drawing)
+        {
+            Drawing = drawing;
+        }
+        /// <summary>
+        /// Defines the <see cref="Drawing"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Drawing> DrawingProperty =
+            AvaloniaProperty.Register<DrawingImage, Drawing>(nameof(Drawing));
+
+        /// <inheritdoc/>
+        public event EventHandler? Invalidated;
+
+        /// <summary>
+        /// Gets or sets the drawing content.
+        /// </summary>
+        [Content]
+        public Drawing Drawing
+        {
+            get => GetValue(DrawingProperty);
+            set => SetValue(DrawingProperty, value);
+        }
+
+        /// <inheritdoc/>
+        public Size Size => Drawing?.GetBounds().Size ?? default;
+
+        /// <inheritdoc/>
+        void IImage.Draw(
+            DrawingContext context,
+            Rect sourceRect,
+            Rect destRect,
+            BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            var drawing = Drawing;
+
+            if (drawing == null)
+            {
+                return;
+            }
+
+            var bounds = drawing.GetBounds();
+            var scale = Matrix.CreateScale(
+                destRect.Width / sourceRect.Width,
+                destRect.Height / sourceRect.Height);
+            var translate = Matrix.CreateTranslation(
+                -sourceRect.X + destRect.X - bounds.X,
+                -sourceRect.Y + destRect.Y - bounds.Y);
+
+            using (context.PushClip(destRect))
+            using (context.PushPreTransform(translate * scale))
+            {
+                Drawing?.Draw(context);
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == DrawingProperty)
+            {
+                RaiseInvalidated(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Raises the <see cref="Invalidated"/> event.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/EllipseGeometry.cs b/src/Avalonia.Base/Media/EllipseGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/EllipseGeometry.cs
rename to src/Avalonia.Base/Media/EllipseGeometry.cs
diff --git a/src/Avalonia.Base/Media/ExperimentalAcrylicMaterial.cs b/src/Avalonia.Base/Media/ExperimentalAcrylicMaterial.cs
new file mode 100644
index 0000000000..0e485d0db8
--- /dev/null
+++ b/src/Avalonia.Base/Media/ExperimentalAcrylicMaterial.cs
@@ -0,0 +1,299 @@
+using System;
+
+namespace Avalonia.Media
+{
+    public class ExperimentalAcrylicMaterial : AvaloniaObject, IMutableExperimentalAcrylicMaterial
+    {
+        private Color _effectiveTintColor;
+        private Color _effectiveLuminosityColor;
+
+        static ExperimentalAcrylicMaterial()
+        {
+            AffectsRender<ExperimentalAcrylicMaterial>(
+                TintColorProperty,
+                BackgroundSourceProperty,
+                TintOpacityProperty,
+                MaterialOpacityProperty,
+                PlatformTransparencyCompensationLevelProperty);
+
+            TintColorProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
+            {
+                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
+                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
+            });
+
+            TintOpacityProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
+            {
+                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
+                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
+            });
+
+            MaterialOpacityProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
+            {
+                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
+                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
+            });
+
+            PlatformTransparencyCompensationLevelProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
+            {
+                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
+                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
+            });
+        }
+
+        /// <summary>
+        /// Defines the <see cref="TintColor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Color> TintColorProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, Color>(nameof(TintColor));
+
+        /// <summary>
+        /// Defines the <see cref="BackgroundSource"/> property.
+        /// </summary>
+        public static readonly StyledProperty<AcrylicBackgroundSource> BackgroundSourceProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, AcrylicBackgroundSource>(nameof(BackgroundSource));
+
+        /// <summary>
+        /// Defines the <see cref="TintOpacity"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> TintOpacityProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, double>(nameof(TintOpacity), 0.8);
+
+        /// <summary>
+        /// Defines the <see cref="MaterialOpacity"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MaterialOpacityProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, double>(nameof(MaterialOpacity), 0.5);
+
+        /// <summary>
+        /// Defines the <see cref="PlatformTransparencyCompensationLevel"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> PlatformTransparencyCompensationLevelProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, double>(nameof(PlatformTransparencyCompensationLevel), 0.0);
+
+        /// <summary>
+        /// Defines the <see cref="FallbackColor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Color> FallbackColorProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, Color>(nameof(FallbackColor));
+
+        /// <inheritdoc/>
+        public event EventHandler? Invalidated;
+
+        /// <summary>
+        /// Gets or Sets the BackgroundSource <seealso cref="AcrylicBackgroundSource"/>.
+        /// </summary>
+        public AcrylicBackgroundSource BackgroundSource
+        {
+            get => GetValue(BackgroundSourceProperty);
+            set => SetValue(BackgroundSourceProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or Sets the TintColor.
+        /// </summary>
+        public Color TintColor
+        {
+            get => GetValue(TintColorProperty);
+            set => SetValue(TintColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or Sets the Tint Opacity.
+        /// </summary>
+        public double TintOpacity
+        {
+            get => GetValue(TintOpacityProperty);
+            set => SetValue(TintOpacityProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or Sets the Fallback Color.
+        /// This is used on rendering plaforms that dont support acrylic.
+        /// </summary>
+        public Color FallbackColor
+        {
+            get => GetValue(FallbackColorProperty);
+            set => SetValue(FallbackColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or Sets the MaterialOpacity.
+        /// This makes the material more or less opaque.
+        /// </summary>
+        public double MaterialOpacity
+        {
+            get => GetValue(MaterialOpacityProperty);
+            set => SetValue(MaterialOpacityProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or Sets the PlatformTransparencyCompensationLevel.
+        /// This value defines the minimum <see cref="MaterialOpacity"/> that can be used.
+        /// It means material opacity is re-scaled from this value to 1.
+        /// </summary>
+        public double PlatformTransparencyCompensationLevel
+        {
+            get => GetValue(PlatformTransparencyCompensationLevelProperty);
+            set => SetValue(PlatformTransparencyCompensationLevelProperty, value);
+        }
+
+        Color IExperimentalAcrylicMaterial.MaterialColor => _effectiveLuminosityColor;
+
+        Color IExperimentalAcrylicMaterial.TintColor => _effectiveTintColor;
+
+        private static Color GetEffectiveTintColor(Color tintColor, double tintOpacity)
+        {
+            // Update tintColor's alpha with the combined opacity value
+            double tintOpacityModifier = GetTintOpacityModifier(tintColor);
+
+            return new Color((byte)(255 * ((255.0 / tintColor.A) * tintOpacity) * tintOpacityModifier), tintColor.R, tintColor.G, tintColor.B);
+        }
+
+        private static double GetTintOpacityModifier(Color tintColor)
+        {
+            // This method suppresses the maximum allowable tint opacity depending on the luminosity and saturation of a color by 
+            // compressing the range of allowable values - for example, a user-defined value of 100% will be mapped to 45% for pure 
+            // white (100% luminosity), 85% for pure black (0% luminosity), and 90% for pure gray (50% luminosity).  The intensity of 
+            // the effect increases linearly as luminosity deviates from 50%.  After this effect is calculated, we cancel it out
+            // linearly as saturation increases from zero.
+
+            const double midPoint = 0.5; // Mid point of HsvV range that these calculations are based on. This is here for easy tuning.
+
+            const double whiteMaxOpacity = 0.2; // 100% luminosity
+            const double midPointMaxOpacity = 0.45; // 50% luminosity
+            const double blackMaxOpacity = 0.45; // 0% luminosity
+
+            var hsv = tintColor.ToHsv();
+
+            double opacityModifier = midPointMaxOpacity;
+
+            if (hsv.V != midPoint)
+            {
+                // Determine maximum suppression amount
+                double lowestMaxOpacity = midPointMaxOpacity;
+                double maxDeviation = midPoint;
+
+                if (hsv.V > midPoint)
+                {
+                    lowestMaxOpacity = whiteMaxOpacity; // At white (100% hsvV)
+                    maxDeviation = 1 - maxDeviation;
+                }
+                else if (hsv.V < midPoint)
+                {
+                    lowestMaxOpacity = blackMaxOpacity; // At black (0% hsvV)
+                }
+
+                double maxOpacitySuppression = midPointMaxOpacity - lowestMaxOpacity;
+
+                // Determine normalized deviation from the midpoint
+                double deviation = Math.Abs(hsv.V - midPoint);
+                double normalizedDeviation = deviation / maxDeviation;
+
+                // If we have saturation, reduce opacity suppression to allow that color to come through more
+                if (hsv.S > 0)
+                {
+                    // Dampen opacity suppression based on how much saturation there is
+                    maxOpacitySuppression *= Math.Max(1 - (hsv.S * 2), 0.0);
+                }
+
+                double opacitySuppression = maxOpacitySuppression * normalizedDeviation;
+
+                opacityModifier = midPointMaxOpacity - opacitySuppression;
+            }
+
+            return opacityModifier;
+        }
+
+        private Color GetEffectiveLuminosityColor()
+        {
+            double? luminosityOpacity = MaterialOpacity;
+
+            return GetLuminosityColor(luminosityOpacity);
+        }
+
+        private static byte Trim(double value)
+        {
+            value = Math.Min(Math.Floor(value * 256), 255);
+
+            if (value < 0)
+            {
+                return 0;
+            }
+            else if (value > 255)
+            {
+                return 255;
+            }
+
+            return (byte)value;
+        }
+
+        private static float RGBMax(Color color)
+        {
+            if (color.R > color.G)
+                return (color.R > color.B) ? color.R : color.B;
+            else
+                return (color.G > color.B) ? color.G : color.B;
+        }
+
+        private static float RGBMin(Color color)
+        {
+            if (color.R < color.G)
+                return (color.R < color.B) ? color.R : color.B;
+            else
+                return (color.G < color.B) ? color.G : color.B;
+        }
+
+        // The tintColor passed into this method should be the original, unmodified color created using user values for TintColor + TintOpacity
+        private Color GetLuminosityColor(double? luminosityOpacity)
+        {
+            // Calculate the HSL lightness value of the color.
+            var max = (float)RGBMax(TintColor) / 255.0f;
+            var min = (float)RGBMin(TintColor) / 255.0f;
+
+            var lightness = (max + min) / 2.0;
+
+            lightness = 1 - ((1 - lightness) * (luminosityOpacity ?? 1));
+
+            lightness = 0.13 + (lightness * 0.74);
+
+            var luminosityColor = new Color(255, Trim(lightness), Trim(lightness), Trim(lightness));
+
+            var compensationMultiplier = 1 - PlatformTransparencyCompensationLevel;
+            return new Color((byte)(255 * Math.Max(Math.Min(PlatformTransparencyCompensationLevel + ((luminosityOpacity ?? 1) * compensationMultiplier), 1.0), 0.0)), luminosityColor.R, luminosityColor.G, luminosityColor.B);
+        }
+
+        /// <summary>
+        /// Marks a property as affecting the brush's visual representation.
+        /// </summary>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a brush's static constructor, any change to the
+        /// property will cause the <see cref="Invalidated"/> event to be raised on the brush.
+        /// </remarks>
+        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
+            where T : ExperimentalAcrylicMaterial
+        {
+            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                (e.Sender as T)?.RaiseInvalidated(EventArgs.Empty);
+            }
+
+            foreach (var property in properties)
+            {
+                property.Changed.Subscribe(e => Invalidate(e));
+            }
+        }
+
+        /// <summary>
+        /// Raises the <see cref="Invalidated"/> event.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
+
+        public IExperimentalAcrylicMaterial ToImmutable()
+        {
+            return new ImmutableExperimentalAcrylicMaterial(this);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/FillRule.cs b/src/Avalonia.Base/Media/FillRule.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FillRule.cs
rename to src/Avalonia.Base/Media/FillRule.cs
diff --git a/src/Avalonia.Visuals/Media/FlowDirection.cs b/src/Avalonia.Base/Media/FlowDirection.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FlowDirection.cs
rename to src/Avalonia.Base/Media/FlowDirection.cs
diff --git a/src/Avalonia.Visuals/Media/FontFallback.cs b/src/Avalonia.Base/Media/FontFallback.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FontFallback.cs
rename to src/Avalonia.Base/Media/FontFallback.cs
diff --git a/src/Avalonia.Visuals/Media/FontFamily.cs b/src/Avalonia.Base/Media/FontFamily.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FontFamily.cs
rename to src/Avalonia.Base/Media/FontFamily.cs
diff --git a/src/Avalonia.Visuals/Media/FontManager.cs b/src/Avalonia.Base/Media/FontManager.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FontManager.cs
rename to src/Avalonia.Base/Media/FontManager.cs
diff --git a/src/Avalonia.Visuals/Media/FontManagerOptions.cs b/src/Avalonia.Base/Media/FontManagerOptions.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FontManagerOptions.cs
rename to src/Avalonia.Base/Media/FontManagerOptions.cs
diff --git a/src/Avalonia.Visuals/Media/FontStretch.cs b/src/Avalonia.Base/Media/FontStretch.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FontStretch.cs
rename to src/Avalonia.Base/Media/FontStretch.cs
diff --git a/src/Avalonia.Visuals/Media/FontStyle.cs b/src/Avalonia.Base/Media/FontStyle.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FontStyle.cs
rename to src/Avalonia.Base/Media/FontStyle.cs
diff --git a/src/Avalonia.Visuals/Media/FontWeight.cs b/src/Avalonia.Base/Media/FontWeight.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/FontWeight.cs
rename to src/Avalonia.Base/Media/FontWeight.cs
diff --git a/src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs b/src/Avalonia.Base/Media/Fonts/FamilyNameCollection.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs
rename to src/Avalonia.Base/Media/Fonts/FamilyNameCollection.cs
diff --git a/src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs b/src/Avalonia.Base/Media/Fonts/FontFamilyKey.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs
rename to src/Avalonia.Base/Media/Fonts/FontFamilyKey.cs
diff --git a/src/Avalonia.Base/Media/Fonts/FontFamilyLoader.cs b/src/Avalonia.Base/Media/Fonts/FontFamilyLoader.cs
new file mode 100644
index 0000000000..365fb6e412
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/FontFamilyLoader.cs
@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.Fonts
+{
+    public static class FontFamilyLoader
+    {
+        /// <summary>
+        /// Loads all font assets that belong to the specified <see cref="FontFamilyKey"/>
+        /// </summary>
+        /// <param name="fontFamilyKey"></param>
+        /// <returns></returns>
+        public static IEnumerable<Uri> LoadFontAssets(FontFamilyKey fontFamilyKey) =>
+            IsFontTtfOrOtf(fontFamilyKey.Source) ?
+                GetFontAssetsByExpression(fontFamilyKey) :
+                GetFontAssetsBySource(fontFamilyKey);
+
+        /// <summary>
+        /// Searches for font assets at a given location and returns a quantity of found assets
+        /// </summary>
+        /// <param name="fontFamilyKey"></param>
+        /// <returns></returns>
+        private static IEnumerable<Uri> GetFontAssetsBySource(FontFamilyKey fontFamilyKey)
+        {
+            var assetLoader = AvaloniaLocator.Current.GetRequiredService<IAssetLoader>();
+            var availableAssets = assetLoader.GetAssets(fontFamilyKey.Source, fontFamilyKey.BaseUri);
+            return availableAssets.Where(x => IsFontTtfOrOtf(x));
+        }
+
+        /// <summary>
+        /// Searches for font assets at a given location and only accepts assets that fit to a given filename expression.
+        /// <para>File names can target multiple files with * wildcard. For example "FontFile*.ttf"</para>
+        /// </summary>
+        /// <param name="fontFamilyKey"></param>
+        /// <returns></returns>
+        private static IEnumerable<Uri> GetFontAssetsByExpression(FontFamilyKey fontFamilyKey)
+        {
+            var (fileNameWithoutExtension, extension) = GetFileName(fontFamilyKey, out var location);
+            var filePattern = CreateFilePattern(fontFamilyKey, location, fileNameWithoutExtension);
+
+            var assetLoader = AvaloniaLocator.Current.GetRequiredService<IAssetLoader>();
+            var availableResources = assetLoader.GetAssets(location, fontFamilyKey.BaseUri);
+
+            return availableResources.Where(x => IsContainsFile(x, filePattern, extension));
+        }
+
+        private static (string fileNameWithoutExtension, string extension) GetFileName(
+            FontFamilyKey fontFamilyKey, out Uri location)
+        {
+            if (fontFamilyKey.Source.IsAbsoluteResm())
+            {
+                var fileName = GetFileNameAndExtension(fontFamilyKey.Source.GetUnescapeAbsolutePath(), '.');
+
+                var uriLocation = fontFamilyKey.Source.GetUnescapeAbsoluteUri()
+                    .Replace("." + fileName.fileNameWithoutExtension + fileName.extension, string.Empty);
+                location = new Uri(uriLocation, UriKind.RelativeOrAbsolute);
+
+                return fileName;
+            }
+
+            var filename = GetFileNameAndExtension(fontFamilyKey.Source.OriginalString);
+            var fullFilename = filename.fileNameWithoutExtension + filename.extension;
+
+            if (fontFamilyKey.BaseUri != null)
+            {
+                var relativePath = fontFamilyKey.Source.OriginalString
+                    .Replace(fullFilename, string.Empty);
+
+                location = new Uri(fontFamilyKey.BaseUri, relativePath);
+            }
+            else
+            {
+                var uriString = fontFamilyKey.Source
+                    .GetUnescapeAbsoluteUri()
+                    .Replace(fullFilename, string.Empty);
+                location = new Uri(uriString);
+            }
+
+            return filename;
+        }
+
+        private static string CreateFilePattern(
+            FontFamilyKey fontFamilyKey, Uri location, string fileNameWithoutExtension)
+        {
+            var path = location.GetUnescapeAbsolutePath();
+            var file = GetSubString(fileNameWithoutExtension, '*');
+            return fontFamilyKey.Source.IsAbsoluteResm()
+                ? path + "." + file
+                : path + file;
+        }
+
+        private static bool IsContainsFile(Uri x, string filePattern, string fileExtension)
+        {
+            var path = x.GetUnescapeAbsolutePath();
+            return path.IndexOf(filePattern, StringComparison.Ordinal) >= 0
+                   && path.EndsWith(fileExtension, StringComparison.Ordinal);
+        }
+
+        private static bool IsFontTtfOrOtf(Uri uri)
+        {
+            var sourceWithoutArguments = GetSubString(uri.OriginalString, '?');
+            return sourceWithoutArguments.EndsWith(".ttf", StringComparison.Ordinal)
+                   || sourceWithoutArguments.EndsWith(".otf", StringComparison.Ordinal);
+        }
+
+        private static (string fileNameWithoutExtension, string extension) GetFileNameAndExtension(
+            string path, char directorySeparator = '/')
+        {
+            var pathAsSpan = path.AsSpan();
+            pathAsSpan = IsPathRooted(pathAsSpan, directorySeparator) ?
+                pathAsSpan.Slice(1, path.Length - 1) :
+                pathAsSpan;
+
+            var extension = GetFileExtension(pathAsSpan);
+            if (extension.Length == pathAsSpan.Length)
+                return (extension.ToString(), string.Empty);
+
+            var fileName = GetFileName(pathAsSpan, directorySeparator, extension.Length);
+            return (fileName.ToString(), extension.ToString());
+        }
+
+        private static bool IsPathRooted(ReadOnlySpan<char> path, char directorySeparator) =>
+            path.Length > 0 && path[0] == directorySeparator;
+
+        private static ReadOnlySpan<char> GetFileExtension(ReadOnlySpan<char> path)
+        {
+            for (var i = path.Length - 1; i > 0; --i)
+            {
+                if (path[i] == '.')
+                    return path.Slice(i, path.Length - i);
+            }
+
+            return path;
+        }
+
+        private static ReadOnlySpan<char> GetFileName(ReadOnlySpan<char> path, char directorySeparator, int extensionLength)
+        {
+            for (var i = path.Length - extensionLength - 1; i >= 0; --i)
+            {
+                if (path[i] == directorySeparator)
+                    return path.Slice(i + 1, path.Length - i - extensionLength - 1);
+            }
+
+            return path.Slice(0, path.Length - extensionLength);
+        }
+
+        private static string GetSubString(string path, char separator)
+        {
+            for (var i = 0; i < path.Length; i++)
+            {
+                if (path[i] == separator)
+                    return path.Substring(0, i);
+            }
+
+            return path;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/FormattedText.cs b/src/Avalonia.Base/Media/FormattedText.cs
new file mode 100644
index 0000000000..7bdf59def0
--- /dev/null
+++ b/src/Avalonia.Base/Media/FormattedText.cs
@@ -0,0 +1,1400 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// The FormattedText class is targeted at programmers needing to add some simple text to a MIL visual.
+    /// </summary>
+    public class FormattedText
+    {
+        public const double DefaultRealToIdeal = 28800.0 / 96;
+        public const double DefaultIdealToReal = 1 / DefaultRealToIdeal;
+        public const int IdealInfiniteWidth = 0x3FFFFFFE;
+        public const double RealInfiniteWidth = IdealInfiniteWidth * DefaultIdealToReal;
+
+        public const double GreatestMultiplierOfEm = 100;
+
+        private const double MaxFontEmSize = RealInfiniteWidth / GreatestMultiplierOfEm;
+
+        // properties and format runs
+        private ReadOnlySlice<char> _text;
+        private readonly SpanVector _formatRuns = new SpanVector(null);
+        private SpanPosition _latestPosition;
+
+        private GenericTextParagraphProperties _defaultParaProps;
+
+        private double _maxTextWidth = double.PositiveInfinity;
+        private double[]? _maxTextWidths;
+        private double _maxTextHeight = double.PositiveInfinity;
+        private int _maxLineCount = int.MaxValue;
+        private TextTrimming _trimming = TextTrimming.WordEllipsis;
+
+        // text source callbacks
+        private TextSourceImplementation? _textSourceImpl;
+
+        // cached metrics
+        private CachedMetrics? _metrics;
+
+        /// <summary>
+        /// Construct a FormattedText object.
+        /// </summary>
+        /// <param name="textToFormat">String of text to be displayed.</param>
+        /// <param name="culture">Culture of text.</param>
+        /// <param name="flowDirection">Flow direction of text.</param>
+        /// <param name="typeface">Type face used to display text.</param>
+        /// <param name="emSize">Font em size in visual units (1/96 of an inch).</param>
+        /// <param name="foreground">Foreground brush used to render text.</param>
+        public FormattedText(
+            string textToFormat,
+            CultureInfo culture,
+            FlowDirection flowDirection,
+            Typeface typeface,
+            double emSize,
+            IBrush? foreground)
+        {
+            if (culture is null)
+            {
+                throw new ArgumentNullException(nameof(culture));
+            }
+
+            ValidateFlowDirection(flowDirection, nameof(flowDirection));
+
+            ValidateFontSize(emSize);
+
+            _text = textToFormat != null ?
+                new ReadOnlySlice<char>(textToFormat.AsMemory()) :
+                throw new ArgumentNullException(nameof(textToFormat));
+
+            var runProps = new GenericTextRunProperties(
+                typeface,
+                emSize,
+                null, // decorations
+                foreground,
+                null, // highlight background
+                BaselineAlignment.Baseline,
+                culture
+            );
+
+            _latestPosition = _formatRuns.SetValue(0, _text.Length, runProps, _latestPosition);
+
+            _defaultParaProps = new GenericTextParagraphProperties(
+                flowDirection,
+                TextAlignment.Left,
+                false,
+                false,
+                runProps,
+                TextWrapping.WrapWithOverflow,
+                0, // line height not specified
+                0 // indentation not specified
+            );
+
+            InvalidateMetrics();
+        }
+
+        private static void ValidateFontSize(double emSize)
+        {
+            if (emSize <= 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(emSize), "The parameter value must be greater than zero.");
+            }
+
+            if (emSize > MaxFontEmSize)
+            {
+                throw new ArgumentOutOfRangeException(nameof(emSize), $"The parameter value cannot be greater than '{MaxFontEmSize}'");
+            }
+
+            if (double.IsNaN(emSize))
+            {
+                throw new ArgumentOutOfRangeException(nameof(emSize), "The parameter value must be a number.");
+            }
+        }
+
+        private static void ValidateFlowDirection(FlowDirection flowDirection, string parameterName)
+        {
+            if ((int)flowDirection < 0 || (int)flowDirection > (int)FlowDirection.RightToLeft)
+            {
+                throw new InvalidEnumArgumentException(parameterName, (int)flowDirection, typeof(FlowDirection));
+            }
+        }
+
+        private int ValidateRange(int startIndex, int count)
+        {
+            if (startIndex < 0 || startIndex > _text.Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(startIndex));
+            }
+
+            var limit = startIndex + count;
+
+            if (count < 0 || limit < startIndex || limit > _text.Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(count));
+            }
+
+            return limit;
+        }
+
+        private void InvalidateMetrics()
+        {
+            _metrics = null;
+        }
+
+        /// <summary>
+        /// Sets foreground brush used for drawing text
+        /// </summary>
+        /// <param name="foregroundBrush">Foreground brush</param>
+        public void SetForegroundBrush(IBrush foregroundBrush)
+        {
+            SetForegroundBrush(foregroundBrush, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets foreground brush used for drawing text
+        /// </summary>
+        /// <param name="foregroundBrush">Foreground brush</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetForegroundBrush(IBrush? foregroundBrush, int startIndex, int count)
+        {
+            var limit = ValidateRange(startIndex, count);
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                if (runProps.ForegroundBrush == foregroundBrush)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    runProps.Typeface,
+                    runProps.FontRenderingEmSize,
+                    runProps.TextDecorations,
+                    foregroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                );
+
+#pragma warning restore 6506
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
+                    newProps, formatRider.SpanPosition);
+            }
+        }
+
+        /// <summary>
+        /// Sets or changes the font family for the text object 
+        /// </summary>
+        /// <param name="fontFamily">Font family name</param>
+        public void SetFontFamily(string fontFamily)
+        {
+            SetFontFamily(fontFamily, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the font family for the text object 
+        /// </summary>
+        /// <param name="fontFamily">Font family name</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetFontFamily(string fontFamily, int startIndex, int count)
+        {
+            if (fontFamily == null)
+            {
+                throw new ArgumentNullException(nameof(fontFamily));
+            }
+
+            SetFontFamily(new FontFamily(fontFamily), startIndex, count);
+        }
+
+        /// <summary>
+        /// Sets or changes the font family for the text object 
+        /// </summary>
+        /// <param name="fontFamily">Font family</param>
+        public void SetFontFamily(FontFamily fontFamily)
+        {
+            SetFontFamily(fontFamily, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the font family for the text object 
+        /// </summary>
+        /// <param name="fontFamily">Font family</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetFontFamily(FontFamily fontFamily, int startIndex, int count)
+        {
+            if (fontFamily == null)
+            {
+                throw new ArgumentNullException(nameof(fontFamily));
+            }
+
+            var limit = ValidateRange(startIndex, count);
+
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                var oldTypeface = runProps.Typeface;
+
+                if (fontFamily.Equals(oldTypeface.FontFamily))
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    new Typeface(fontFamily, oldTypeface.Style, oldTypeface.Weight),
+                    runProps.FontRenderingEmSize,
+                    runProps.TextDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                    );
+
+#pragma warning restore 6506
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
+                    newProps, formatRider.SpanPosition);
+
+                InvalidateMetrics();
+            }
+        }
+
+
+        /// <summary>
+        /// Sets or changes the font em size measured in MIL units
+        /// </summary>
+        /// <param name="emSize">Font em size</param>
+        public void SetFontSize(double emSize)
+        {
+            SetFontSize(emSize, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the font em size measured in MIL units
+        /// </summary>
+        /// <param name="emSize">Font em size</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetFontSize(double emSize, int startIndex, int count)
+        {
+            ValidateFontSize(emSize);
+
+            var limit = ValidateRange(startIndex, count);
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                if (runProps.FontRenderingEmSize == emSize)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    runProps.Typeface,
+                    emSize,
+                    runProps.TextDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                );
+
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
+                    newProps, formatRider.SpanPosition);
+
+#pragma warning restore 6506
+                InvalidateMetrics();
+            }
+        }
+
+        /// <summary>
+        /// Sets or changes the culture for the text object.
+        /// </summary>
+        /// <param name="culture">The new culture for the text object.</param>
+        public void SetCulture(CultureInfo culture)
+        {
+            SetCulture(culture, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the culture for the text object.
+        /// </summary>
+        /// <param name="culture">The new culture for the text object.</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetCulture(CultureInfo culture, int startIndex, int count)
+        {
+            if (culture is null)
+            {
+                throw new ArgumentNullException(nameof(culture));
+            }
+
+            var limit = ValidateRange(startIndex, count);
+
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506 
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                if (runProps.CultureInfo == culture)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    runProps.Typeface,
+                    runProps.FontRenderingEmSize,
+                    runProps.TextDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    culture
+                );
+
+#pragma warning restore 6506
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
+                    newProps, formatRider.SpanPosition);
+
+                InvalidateMetrics();
+            }
+        }
+
+        /// <summary>
+        /// Sets or changes the font weight
+        /// </summary>
+        /// <param name="weight">Font weight</param>
+        public void SetFontWeight(FontWeight weight)
+        {
+            SetFontWeight(weight, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the font weight
+        /// </summary>
+        /// <param name="weight">Font weight</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetFontWeight(FontWeight weight, int startIndex, int count)
+        {
+            var limit = ValidateRange(startIndex, count);
+
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506 
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                var oldTypeface = runProps.Typeface;
+
+                if (oldTypeface.Weight == weight)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    new Typeface(oldTypeface.FontFamily, oldTypeface.Style, weight),
+                    runProps.FontRenderingEmSize,
+                    runProps.TextDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                    );
+#pragma warning restore 6506 
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition, newProps, formatRider.SpanPosition);
+
+                InvalidateMetrics();
+            }
+        }
+
+        /// <summary>
+        /// Sets or changes the font style
+        /// </summary>
+        /// <param name="style">Font style</param>
+        public void SetFontStyle(FontStyle style)
+        {
+            SetFontStyle(style, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the font style
+        /// </summary>
+        /// <param name="style">Font style</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetFontStyle(FontStyle style, int startIndex, int count)
+        {
+            var limit = ValidateRange(startIndex, count);
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506 
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                var oldTypeface = runProps.Typeface;
+
+                if (oldTypeface.Style == style)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    new Typeface(oldTypeface.FontFamily, style, oldTypeface.Weight),
+                    runProps.FontRenderingEmSize,
+                    runProps.TextDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                    );
+#pragma warning restore 6506
+
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition, newProps, formatRider.SpanPosition);
+
+                InvalidateMetrics(); // invalidate cached metrics
+            }
+        }
+
+        /// <summary>
+        /// Sets or changes the type face
+        /// </summary>
+        /// <param name="typeface">Typeface</param>
+        public void SetFontTypeface(Typeface typeface)
+        {
+            SetFontTypeface(typeface, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the type face
+        /// </summary>
+        /// <param name="typeface">Typeface</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetFontTypeface(Typeface typeface, int startIndex, int count)
+        {
+            var limit = ValidateRange(startIndex, count);
+
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506 
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                if (runProps.Typeface == typeface)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    typeface,
+                    runProps.FontRenderingEmSize,
+                    runProps.TextDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                    );
+#pragma warning restore 6506
+
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
+                    newProps, formatRider.SpanPosition);
+
+                InvalidateMetrics();
+            }
+        }
+
+        /// <summary>
+        /// Sets or changes the text decorations
+        /// </summary>
+        /// <param name="textDecorations">Text decorations</param>
+        public void SetTextDecorations(TextDecorationCollection textDecorations)
+        {
+            SetTextDecorations(textDecorations, 0, _text.Length);
+        }
+
+        /// <summary>
+        /// Sets or changes the text decorations
+        /// </summary>
+        /// <param name="textDecorations">Text decorations</param>
+        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
+        /// <param name="count">The number of characters the change should be applied to.</param>
+        public void SetTextDecorations(TextDecorationCollection textDecorations, int startIndex, int count)
+        {
+            var limit = ValidateRange(startIndex, count);
+
+            for (var i = startIndex; i < limit;)
+            {
+                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
+
+                i = Math.Min(limit, i + formatRider.Length);
+
+#pragma warning disable 6506 
+                // Presharp warns that runProps is not validated, but it can never be null 
+                // because the rider is already checked to be in range
+
+                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
+                {
+                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
+                }
+
+                if (runProps.TextDecorations == textDecorations)
+                {
+                    continue;
+                }
+
+                var newProps = new GenericTextRunProperties(
+                    runProps.Typeface,
+                    runProps.FontRenderingEmSize,
+                    textDecorations,
+                    runProps.ForegroundBrush,
+                    runProps.BackgroundBrush,
+                    runProps.BaselineAlignment,
+                    runProps.CultureInfo
+                    );
+#pragma warning restore 6506
+
+                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
+                    newProps, formatRider.SpanPosition);
+            }
+        }
+
+        /// Note: enumeration is temporarily made private
+        /// because of PS #828532
+        /// 
+        /// <summary>
+        /// Strongly typed enumerator used for enumerating text lines
+        /// </summary>
+        private struct LineEnumerator : IEnumerator, IDisposable
+        {
+            private int _lineCount;
+            private double _totalHeight;
+            private TextLine? _nextLine;
+            private readonly TextFormatter _formatter;
+            private readonly FormattedText _that;
+            private readonly ITextSource _textSource;
+
+            // these are needed because _currentLine can be disposed before the next MoveNext() call
+            private double _previousHeight;
+
+            // line break before _currentLine, needed in case we have to reformat it with collapsing symbol
+            private TextLineBreak? _previousLineBreak;
+
+            internal LineEnumerator(FormattedText text)
+            {
+                _previousHeight = 0;
+                Length = 0;
+                _previousLineBreak = null;
+
+                Position = 0;
+                _lineCount = 0;
+                _totalHeight = 0;
+                Current = null;
+                _nextLine = null;
+                _formatter = TextFormatter.Current;
+                _that = text;
+                _textSource = _that._textSourceImpl ??= new TextSourceImplementation(_that);
+            }
+
+            public void Dispose()
+            {
+                Current = null;
+
+                _nextLine = null;
+            }
+
+            private int Position { get; set; }
+
+            private int Length { get; set; }
+
+            /// <summary>
+            /// Gets the current text line in the collection
+            /// </summary>
+            public TextLine? Current { get; private set; }
+
+            /// <summary>
+            /// Gets the current text line in the collection
+            /// </summary>
+            object? IEnumerator.Current => Current;
+
+            /// <summary>
+            /// Gets the paragraph width used to format the current text line
+            /// </summary>
+            internal double CurrentParagraphWidth
+            {
+                get
+                {
+                    return MaxLineLength(_lineCount);
+                }
+            }
+
+            private double MaxLineLength(int line)
+            {
+                if (_that._maxTextWidths == null)
+                    return _that._maxTextWidth;
+                return _that._maxTextWidths[Math.Min(line, _that._maxTextWidths.Length - 1)];
+            }
+
+            /// <summary>
+            /// Advances the enumerator to the next text line of the collection
+            /// </summary>
+            /// <returns>true if the enumerator was successfully advanced to the next element;
+            /// false if the enumerator has passed the end of the collection</returns>
+            public bool MoveNext()
+            {
+                if (Current == null)
+                {   // this is the first line
+                    if (_that._text.Length == 0)
+                    {
+                        return false;
+                    }
+
+                    Current = FormatLine(
+                        _textSource,
+                        Position,
+                        MaxLineLength(_lineCount),
+                        _that._defaultParaProps!,
+                        null // no previous line break
+                        );
+
+                    // check if this line fits the text height
+                    if (_totalHeight + Current.Height > _that._maxTextHeight)
+                    {
+                        Current = null;
+
+                        return false;
+                    }
+                    Debug.Assert(_nextLine == null);
+                }
+                else
+                {
+                    // there is no next line or it didn't fit
+                    // either way we're finished
+                    if (_nextLine == null)
+                    {
+                        return false;
+                    }
+
+                    _totalHeight += _previousHeight;
+                    Position += Length;
+                    ++_lineCount;
+
+                    Current = _nextLine;
+                    _nextLine = null;
+                }
+
+                var currentLineBreak = Current.TextLineBreak;
+
+                // this line is guaranteed to fit the text height
+                Debug.Assert(_totalHeight + Current.Height <= _that._maxTextHeight);
+
+                // now, check if the next line fits, we need to do this on this iteration
+                // because we might need to add ellipsis to the current line
+                // as a result of the next line measurement
+
+                // maybe there is no next line at all
+                if (Position + Current.Length < _that._text.Length)
+                {
+                    bool nextLineFits;
+
+                    if (_lineCount + 1 >= _that._maxLineCount)
+                    {
+                        nextLineFits = false;
+                    }
+                    else
+                    {
+                        _nextLine = FormatLine(
+                            _textSource,
+                            Position + Current.Length,
+                            MaxLineLength(_lineCount + 1),
+                            _that._defaultParaProps,
+                            currentLineBreak
+                            );
+
+                        nextLineFits = (_totalHeight + Current.Height + _nextLine.Height <= _that._maxTextHeight);
+                    }
+
+                    if (!nextLineFits)
+                    {
+                        _nextLine = null;
+
+                        if (_that._trimming != TextTrimming.None && !Current.HasCollapsed)
+                        {
+                            // recreate the current line with ellipsis added
+                            // Note: Paragraph ellipsis is not supported today. We'll workaround
+                            // it here by faking a non-wrap text on finite column width.
+                            var currentWrap = _that._defaultParaProps!.TextWrapping;
+
+                            _that._defaultParaProps.SetTextWrapping(TextWrapping.NoWrap);
+
+                            Current = FormatLine(
+                                _that._textSourceImpl!,
+                                Position,
+                                MaxLineLength(_lineCount),
+                                _that._defaultParaProps,
+                                _previousLineBreak
+                                );
+
+                            currentLineBreak = Current.TextLineBreak;
+
+                            _that._defaultParaProps.SetTextWrapping(currentWrap);
+                        }
+                    }
+                }
+
+                _previousHeight = Current.Height;
+
+                Length = Current.Length;
+
+                _previousLineBreak = currentLineBreak;
+
+                return true;
+            }
+
+            /// <summary>
+            /// Wrapper of TextFormatter.FormatLine that auto-collapses the line if needed.
+            /// </summary>
+            private TextLine FormatLine(ITextSource textSource, int textSourcePosition, double maxLineLength, TextParagraphProperties paraProps, TextLineBreak? lineBreak)
+            {
+                var line = _formatter.FormatLine(
+                    textSource,
+                    textSourcePosition,
+                    maxLineLength,
+                    paraProps,
+                    lineBreak
+                    );
+
+                if (_that._trimming != TextTrimming.None && line.HasOverflowed && line.Length > 0)
+                {
+                    // what I really need here is the last displayed text run of the line
+                    // textSourcePosition + line.Length - 1 works except the end of paragraph case,
+                    // where line length includes the fake paragraph break run
+                    Debug.Assert(_that._text.Length > 0 && textSourcePosition + line.Length <= _that._text.Length + 1);
+
+                    var thatFormatRider = new SpanRider(
+                        _that._formatRuns,
+                        _that._latestPosition,
+                        Math.Min(textSourcePosition + line.Length - 1, _that._text.Length - 1)
+                        );
+
+                    var lastRunProps = (GenericTextRunProperties)thatFormatRider.CurrentElement!;
+
+                    TextCollapsingProperties collapsingProperties = _that._trimming.CreateCollapsingProperties(new TextCollapsingCreateInfo(maxLineLength, lastRunProps));
+
+                    var collapsedLine = line.Collapse(collapsingProperties);
+
+                    line = collapsedLine;
+                }
+                return line;
+            }
+
+
+            /// <summary>
+            /// Sets the enumerator to its initial position,
+            /// which is before the first element in the collection
+            /// </summary>
+            public void Reset()
+            {
+                Position = 0;
+                _lineCount = 0;
+                _totalHeight = 0;
+                Current = null;
+                _nextLine = null;
+            }
+        }
+
+        /// <summary>
+        /// Returns an enumerator that can iterate through the text line collection
+        /// </summary>
+        private LineEnumerator GetEnumerator()
+        {
+            return new LineEnumerator(this);
+        }
+#if NEVER
+        /// <summary>
+        /// Returns an enumerator that can iterate through the text line collection
+        /// </summary>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+#endif
+
+        private void AdvanceLineOrigin(ref Point lineOrigin, TextLine currentLine)
+        {
+            var height = currentLine.Height;
+
+            // advance line origin according to the flow direction
+            switch (_defaultParaProps.FlowDirection)
+            {
+                case FlowDirection.LeftToRight:
+                case FlowDirection.RightToLeft:
+                    lineOrigin = lineOrigin.WithY(lineOrigin.Y + height);
+                    break;
+            }
+        }
+
+        private class CachedMetrics
+        {
+            // vertical
+            public double Height;
+            public double Baseline;
+
+            // horizontal
+            public double Width;
+            public double WidthIncludingTrailingWhitespace;
+
+            // vertical bounding box metrics
+            public double Extent;
+            public double OverhangAfter;
+
+            // horizontal bounding box metrics
+            public double OverhangLeading;
+            public double OverhangTrailing;
+        }
+
+        /// <summary>
+        /// Defines the flow direction
+        /// </summary>
+        public FlowDirection FlowDirection
+        {
+            set
+            {
+                ValidateFlowDirection(value, "value");
+                _defaultParaProps.SetFlowDirection(value);
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _defaultParaProps.FlowDirection;
+            }
+        }
+
+        /// <summary>
+        /// Defines the alignment of text within the column
+        /// </summary>
+        public TextAlignment TextAlignment
+        {
+            set
+            {
+                _defaultParaProps.SetTextAlignment(value);
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _defaultParaProps.TextAlignment;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the height of, or the spacing between, each line where
+        /// zero represents the default line height.
+        /// </summary>
+        public double LineHeight
+        {
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value), "Parameter must be greater than or equal to zero.");
+                }
+
+                _defaultParaProps.SetLineHeight(value);
+
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _defaultParaProps.LineHeight;
+            }
+        }
+
+        /// <summary>
+        /// The MaxTextWidth property defines the alignment edges for the FormattedText.
+        /// For example, left aligned text is wrapped such that the leftmost glyph alignment point
+        /// on each line falls exactly on the left edge of the rectangle.
+        /// Note that for many fonts, especially in italic style, some glyph strokes may extend beyond the edges of the alignment rectangle.
+        /// For this reason, it is recommended that clients draw text with at least 1/6 em (i.e of the font size) unused margin space either side.
+        /// Zero value of MaxTextWidth is equivalent to the maximum possible paragraph width.
+        /// </summary>
+        public double MaxTextWidth
+        {
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value), "Parameter must be greater than or equal to zero.");
+                }
+
+                _maxTextWidth = value;
+
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _maxTextWidth;
+            }
+        }
+
+        /// <summary>
+        /// Sets the array of lengths,
+        /// which will be applied to each line of text in turn.
+        /// If the text covers more lines than there are entries in the length array,
+        /// the last entry is reused as many times as required.
+        /// The maxTextWidths array overrides the MaxTextWidth property.
+        /// </summary>
+        /// <param name="maxTextWidths">The max text width array</param>
+        public void SetMaxTextWidths(double[] maxTextWidths)
+        {
+            if (maxTextWidths == null || maxTextWidths.Length <= 0)
+            {
+                throw new ArgumentNullException(nameof(maxTextWidths));
+            }
+
+            _maxTextWidths = maxTextWidths;
+
+            InvalidateMetrics();
+        }
+
+        /// <summary>
+        /// Obtains a copy of the array of lengths,
+        /// which will be applied to each line of text in turn.
+        /// If the text covers more lines than there are entries in the length array,
+        /// the last entry is reused as many times as required.
+        /// The maxTextWidths array overrides the MaxTextWidth property.
+        /// </summary>
+        /// <returns>The copy of max text width array</returns>
+        public double[] GetMaxTextWidths()
+        {
+            return _maxTextWidths != null ? (double[])_maxTextWidths.Clone() : Array.Empty<double>();
+        }
+
+        /// <summary>
+        /// Sets the maximum length of a column of text.
+        /// The last line of text displayed is the last whole line that will fit within this limit,
+        /// or the nth line as specified by MaxLineCount, whichever occurs first.
+        /// Use the Trimming property to control how the omission of text is indicated.
+        /// </summary>
+        public double MaxTextHeight
+        {
+            set
+            {
+                if (value <= 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value), $"'{nameof(MaxTextHeight)}' property value must be greater than zero.");
+                }
+
+                if (double.IsNaN(value))
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value), $"'{nameof(MaxTextHeight)}' property value cannot be NaN.");
+                }
+
+                _maxTextHeight = value;
+
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _maxTextHeight;
+            }
+        }
+
+        /// <summary>
+        /// Defines the maximum number of lines to display.
+        /// The last line of text displayed is the lineCount-1'th line,
+        /// or the last whole line that will fit within the count set by MaxTextHeight,
+        /// whichever occurs first.
+        /// Use the Trimming property to control how the omission of text is indicated
+        /// </summary>
+        public int MaxLineCount
+        {
+            set
+            {
+                if (value <= 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value), "The parameter value must be greater than zero.");
+                }
+
+                _maxLineCount = value;
+
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _maxLineCount;
+            }
+        }
+
+        /// <summary>
+        /// Defines how omission of text is indicated.
+        /// CharacterEllipsis trimming allows partial words to be displayed,
+        /// while WordEllipsis removes whole words to fit.
+        /// Both guarantee to include an ellipsis ('...') at the end of the lines
+        /// where text has been trimmed as a result of line and column limits.
+        /// </summary>
+        public TextTrimming Trimming
+        {
+            set
+            {
+                _trimming = value;
+
+                _defaultParaProps.SetTextWrapping(_trimming == TextTrimming.None ?
+                    TextWrapping.Wrap :
+                    TextWrapping.WrapWithOverflow);
+
+                InvalidateMetrics();
+            }
+            get
+            {
+                return _trimming;
+            }
+        }
+
+        /// <summary>
+        /// Lazily initializes the cached metrics EXCEPT for black box metrics and
+        /// returns the CachedMetrics structure.
+        /// </summary>
+        private CachedMetrics Metrics
+        {
+            get
+            {
+                return _metrics ??= DrawAndCalculateMetrics(
+                    null, // drawing context
+                    new Point(), // drawing offset
+                    false);
+            }
+        }
+
+        /// <summary>
+        /// Lazily initializes the cached metrics INCLUDING black box metrics and
+        /// returns the CachedMetrics structure.
+        /// </summary>
+        private CachedMetrics BlackBoxMetrics
+        {
+            get
+            {
+                if (_metrics == null || double.IsNaN(_metrics.Extent))
+                {
+                    // We need to obtain the metrics, including black box metrics.
+
+                    _metrics = DrawAndCalculateMetrics(
+                        null,           // drawing context
+                        new Point(),    // drawing offset
+                        true);          // calculate black box metrics
+                }
+                return _metrics;
+            }
+        }
+
+        /// <summary>
+        /// The distance from the top of the first line to the bottom of the last line.
+        /// </summary>
+        public double Height
+        {
+            get
+            {
+                return Metrics.Height;
+            }
+        }
+
+        /// <summary>
+        /// The distance from the topmost black pixel of the first line
+        /// to the bottommost black pixel of the last line. 
+        /// </summary>
+        public double Extent
+        {
+            get
+            {
+                return BlackBoxMetrics.Extent;
+            }
+        }
+
+        /// <summary>
+        /// The distance from the top of the first line to the baseline of the first line.
+        /// </summary>
+        public double Baseline
+        {
+            get
+            {
+                return Metrics.Baseline;
+            }
+        }
+
+        /// <summary>
+        /// The distance from the bottom of the last line to the extent bottom.
+        /// </summary>
+        public double OverhangAfter
+        {
+            get
+            {
+                return BlackBoxMetrics.OverhangAfter;
+            }
+        }
+
+        /// <summary>
+        /// The maximum distance from the leading black pixel to the leading alignment point of a line.
+        /// </summary>
+        public double OverhangLeading
+        {
+            get
+            {
+                return BlackBoxMetrics.OverhangLeading;
+            }
+        }
+
+        /// <summary>
+        /// The maximum distance from the trailing black pixel to the trailing alignment point of a line.
+        /// </summary>
+        public double OverhangTrailing
+        {
+            get
+        {
+                return BlackBoxMetrics.OverhangTrailing;
+            }
+        }
+
+        /// <summary>
+        /// The maximum advance width between the leading and trailing alignment points of a line,
+        /// excluding the width of whitespace characters at the end of the line.
+        /// </summary>
+        public double Width
+        {
+            get
+            {
+                return Metrics.Width;
+            }
+        }
+
+        /// <summary>
+        /// The maximum advance width between the leading and trailing alignment points of a line,
+        /// including the width of whitespace characters at the end of the line.
+        /// </summary>
+        public double WidthIncludingTrailingWhitespace
+        {
+            get
+            {
+                return Metrics.WidthIncludingTrailingWhitespace;
+            }
+        }
+
+        /// <summary>
+        /// Draws the text object
+        /// </summary>
+        internal void Draw(DrawingContext drawingContext, Point origin)
+        {
+            var lineOrigin = origin;
+
+            if (_metrics != null && !double.IsNaN(_metrics.Extent))
+            {
+                // we can't use foreach because it requires GetEnumerator and associated classes to be public
+                // foreach (TextLine currentLine in this)
+                using (var enumerator = GetEnumerator())
+                {
+                    while (enumerator.MoveNext())
+                    {
+                        var currentLine = enumerator.Current!;
+
+                        currentLine.Draw(drawingContext, lineOrigin);
+
+                        AdvanceLineOrigin(ref lineOrigin, currentLine);
+                    }
+                }
+            }
+            else
+            {
+                // Calculate metrics as we draw to avoid formatting again if we need metrics later; we compute
+                // black box metrics too because these are already known as a side-effect of drawing
+
+                _metrics = DrawAndCalculateMetrics(drawingContext, origin, true);
+            }
+        }
+
+        private CachedMetrics DrawAndCalculateMetrics(DrawingContext? drawingContext, Point drawingOffset, bool getBlackBoxMetrics)
+        {
+            var metrics = new CachedMetrics();
+
+            if (_text.Length == 0)
+            {
+                return metrics;
+            }
+
+            // we can't use foreach because it requires GetEnumerator and associated classes to be public
+            // foreach (TextLine currentLine in this)
+
+            using (var enumerator = GetEnumerator())
+            {
+                var first = true;
+
+                double accBlackBoxLeft, accBlackBoxTop, accBlackBoxRight, accBlackBoxBottom;
+                accBlackBoxLeft = accBlackBoxTop = double.MaxValue;
+                accBlackBoxRight = accBlackBoxBottom = double.MinValue;
+
+                var origin = new Point(0, 0);
+
+                // Holds the TextLine.Start of the longest line. Thus it will hold the minimum value 
+                // of TextLine.Start among all the lines that forms the text. The overhangs (leading and trailing) 
+                // are calculated with an offset as a result of the same issue with TextLine.Start. 
+                // So, we compute this offset and remove it later from the values of the overhangs.
+                var lineStartOfLongestLine = double.MaxValue;
+
+                while (enumerator.MoveNext())
+                {
+                    // enumerator will dispose the currentLine
+                    var currentLine = enumerator.Current!;
+
+                    // if we're drawing, do it first as this will compute black box metrics as a side-effect
+                    if (drawingContext != null)
+                    {
+                        currentLine.Draw(drawingContext,
+                            new Point(origin.X + drawingOffset.X, origin.Y + drawingOffset.Y));
+                    }
+
+                    if (getBlackBoxMetrics)
+                    {
+                        var blackBoxLeft = origin.X + currentLine.Start + currentLine.OverhangLeading;
+                        var blackBoxRight = origin.X + currentLine.Start + currentLine.Width - currentLine.OverhangTrailing;
+                        var blackBoxBottom = origin.Y + currentLine.Height + currentLine.OverhangAfter;
+                        var blackBoxTop = blackBoxBottom - currentLine.Extent;
+
+                        accBlackBoxLeft = Math.Min(accBlackBoxLeft, blackBoxLeft);
+                        accBlackBoxRight = Math.Max(accBlackBoxRight, blackBoxRight);
+                        accBlackBoxBottom = Math.Max(accBlackBoxBottom, blackBoxBottom);
+                        accBlackBoxTop = Math.Min(accBlackBoxTop, blackBoxTop);
+
+                        metrics.OverhangAfter = currentLine.OverhangAfter;
+                    }
+
+                    metrics.Height += currentLine.Height;
+                    metrics.Width = Math.Max(metrics.Width, currentLine.Width);
+                    metrics.WidthIncludingTrailingWhitespace = Math.Max(metrics.WidthIncludingTrailingWhitespace, currentLine.WidthIncludingTrailingWhitespace);
+                    lineStartOfLongestLine = Math.Min(lineStartOfLongestLine, currentLine.Start);
+
+                    if (first)
+                    {
+                        metrics.Baseline = currentLine.Baseline;
+                        first = false;
+                    }
+
+                    AdvanceLineOrigin(ref origin, currentLine);
+                }
+
+                if (getBlackBoxMetrics)
+                {
+                    metrics.Extent = accBlackBoxBottom - accBlackBoxTop;
+                    metrics.OverhangLeading = accBlackBoxLeft - lineStartOfLongestLine;
+                    metrics.OverhangTrailing = metrics.Width - (accBlackBoxRight - lineStartOfLongestLine);
+                }
+                else
+                {
+                    // indicate that black box metrics are not known
+                    metrics.Extent = double.NaN;
+                }
+            }
+
+            return metrics;
+        }
+
+        private class TextSourceImplementation : ITextSource
+        {
+            private readonly FormattedText _that;
+
+            public TextSourceImplementation(FormattedText text)
+            {
+                _that = text;
+            }
+
+            /// <inheritdoc/>
+            public TextRun? GetTextRun(int textSourceCharacterIndex)
+            {
+                if (textSourceCharacterIndex >= _that._text.Length)
+                {
+                    return null;
+                }
+
+                var thatFormatRider = new SpanRider(_that._formatRuns, _that._latestPosition, textSourceCharacterIndex);
+
+                TextRunProperties properties = (GenericTextRunProperties)thatFormatRider.CurrentElement!;
+
+                var textCharacters = new TextCharacters(_that._text, textSourceCharacterIndex, thatFormatRider.Length,
+                    properties);
+
+                return textCharacters;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Geometry.cs b/src/Avalonia.Base/Media/Geometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Geometry.cs
rename to src/Avalonia.Base/Media/Geometry.cs
diff --git a/src/Avalonia.Base/Media/GeometryDrawing.cs b/src/Avalonia.Base/Media/GeometryDrawing.cs
new file mode 100644
index 0000000000..08e62df2cc
--- /dev/null
+++ b/src/Avalonia.Base/Media/GeometryDrawing.cs
@@ -0,0 +1,75 @@
+using Avalonia.Media.Immutable;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a drawing operation that combines 
+    /// a geometry with and brush and/or pen to produce rendered content.
+    /// </summary>
+    public class GeometryDrawing : Drawing
+    {
+        // Adding the Pen's stroke thickness here could yield wrong results due to transforms.
+        private static readonly IPen s_boundsPen = new ImmutablePen(Colors.Black.ToUint32(), 0);
+
+        /// <summary>
+        /// Defines the <see cref="Geometry"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Geometry> GeometryProperty =
+            AvaloniaProperty.Register<GeometryDrawing, Geometry>(nameof(Geometry));
+
+        /// <summary>
+        /// Defines the <see cref="Brush"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush> BrushProperty =
+            AvaloniaProperty.Register<GeometryDrawing, IBrush>(nameof(Brush), Brushes.Transparent);
+
+        /// <summary>
+        /// Defines the <see cref="Pen"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Pen> PenProperty =
+            AvaloniaProperty.Register<GeometryDrawing, Pen>(nameof(Pen));
+
+        /// <summary>
+        /// Gets or sets the <see cref="Avalonia.Media.Geometry"/> that describes the shape of this <see cref="GeometryDrawing"/>.
+        /// </summary>
+        [Content]
+        public Geometry Geometry
+        {
+            get => GetValue(GeometryProperty);
+            set => SetValue(GeometryProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Avalonia.Media.IBrush"/> used to fill the interior of the shape described by this <see cref="GeometryDrawing"/>.
+        /// </summary>
+        public IBrush Brush
+        {
+            get => GetValue(BrushProperty);
+            set => SetValue(BrushProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Avalonia.Media.IPen"/> used to stroke this <see cref="GeometryDrawing"/>.
+        /// </summary>
+        public IPen Pen
+        {
+            get => GetValue(PenProperty);
+            set => SetValue(PenProperty, value);
+        }
+
+        public override void Draw(DrawingContext context)
+        {
+            if (Geometry != null)
+            {
+                context.DrawGeometry(Brush, Pen, Geometry);
+            }
+        }
+
+        public override Rect GetBounds()
+        {
+            IPen pen = Pen ?? s_boundsPen;
+			return Geometry?.GetRenderBounds(pen) ?? Rect.Empty;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/GlyphRun.cs b/src/Avalonia.Base/Media/GlyphRun.cs
new file mode 100644
index 0000000000..25c35a28e5
--- /dev/null
+++ b/src/Avalonia.Base/Media/GlyphRun.cs
@@ -0,0 +1,795 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    ///     Represents a sequence of glyphs from a single face of a single font at a single size, and with a single rendering style.
+    /// </summary>
+    public sealed class GlyphRun : IDisposable
+    {
+        private static readonly IComparer<int> s_ascendingComparer = Comparer<int>.Default;
+        private static readonly IComparer<int> s_descendingComparer = new ReverseComparer<int>();
+
+        private IGlyphRunImpl? _glyphRunImpl;
+        private GlyphTypeface _glyphTypeface;
+        private double _fontRenderingEmSize;
+        private int _biDiLevel;
+        private Point? _baselineOrigin;
+        private GlyphRunMetrics? _glyphRunMetrics;
+
+        private ReadOnlySlice<char> _characters;
+
+        private IReadOnlyList<ushort> _glyphIndices;
+        private IReadOnlyList<double>? _glyphAdvances;
+        private IReadOnlyList<Vector>? _glyphOffsets;
+        private IReadOnlyList<int>? _glyphClusters;
+
+        private int _offsetToFirstCharacter;
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="GlyphRun"/> class by specifying properties of the class.
+        /// </summary>
+        /// <param name="glyphTypeface">The glyph typeface.</param>
+        /// <param name="fontRenderingEmSize">The rendering em size.</param>
+        /// <param name="glyphIndices">The glyph indices.</param>
+        /// <param name="glyphAdvances">The glyph advances.</param>
+        /// <param name="glyphOffsets">The glyph offsets.</param>
+        /// <param name="characters">The characters.</param>
+        /// <param name="glyphClusters">The glyph clusters.</param>
+        /// <param name="biDiLevel">The bidi level.</param>
+        public GlyphRun(
+            GlyphTypeface glyphTypeface,
+            double fontRenderingEmSize,
+            ReadOnlySlice<char> characters,
+            IReadOnlyList<ushort> glyphIndices,
+            IReadOnlyList<double>? glyphAdvances = null,
+            IReadOnlyList<Vector>? glyphOffsets = null,
+            IReadOnlyList<int>? glyphClusters = null,
+            int biDiLevel = 0)
+        {
+            _glyphTypeface = glyphTypeface;
+
+            FontRenderingEmSize = fontRenderingEmSize;
+
+            Characters = characters;
+
+            _glyphIndices = glyphIndices;
+
+            GlyphAdvances = glyphAdvances;
+
+            GlyphOffsets = glyphOffsets;
+
+            GlyphClusters = glyphClusters;
+
+            BiDiLevel = biDiLevel;
+        }
+
+        /// <summary>
+        ///     Gets the <see cref="Media.GlyphTypeface"/> for the <see cref="GlyphRun"/>.
+        /// </summary>
+        public GlyphTypeface GlyphTypeface => _glyphTypeface;
+
+        /// <summary>
+        ///     Gets or sets the em size used for rendering the <see cref="GlyphRun"/>.
+        /// </summary>
+        public double FontRenderingEmSize
+        {
+            get => _fontRenderingEmSize;
+            set => Set(ref _fontRenderingEmSize, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets the conservative bounding box of the <see cref="GlyphRun"/>.
+        /// </summary>
+        public Size Size => new Size(Metrics.WidthIncludingTrailingWhitespace, Metrics.Height);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public GlyphRunMetrics Metrics
+        {
+            get
+            {
+                _glyphRunMetrics ??= CreateGlyphRunMetrics();
+
+                return _glyphRunMetrics.Value;
+            }
+        }
+
+        /// <summary>
+        ///     Gets or sets the baseline origin of the<see cref="GlyphRun"/>.
+        /// </summary>
+        public Point BaselineOrigin
+        {
+            get
+            {
+                _baselineOrigin ??= CalculateBaselineOrigin();
+
+                return _baselineOrigin.Value;
+            }
+            set => Set(ref _baselineOrigin, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets an array of <see cref="ushort"/> values that represent the glyph indices in the rendering physical font.
+        /// </summary>
+        public IReadOnlyList<ushort> GlyphIndices
+        {
+            get => _glyphIndices;
+            set => Set(ref _glyphIndices, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets an array of <see cref="double"/> values that represent the advances corresponding to the glyph indices.
+        /// </summary>
+        public IReadOnlyList<double>? GlyphAdvances
+        {
+            get => _glyphAdvances;
+            set => Set(ref _glyphAdvances, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets an array of <see cref="Vector"/> values representing the offsets of the glyphs in the <see cref="GlyphRun"/>.
+        /// </summary>
+        public IReadOnlyList<Vector>? GlyphOffsets
+        {
+            get => _glyphOffsets;
+            set => Set(ref _glyphOffsets, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets the list of UTF16 code points that represent the Unicode content of the <see cref="GlyphRun"/>.
+        /// </summary>
+        public ReadOnlySlice<char> Characters
+        {
+            get => _characters;
+            set => Set(ref _characters, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets a list of <see cref="int"/> values representing a mapping from character index to glyph index.
+        /// </summary>
+        public IReadOnlyList<int>? GlyphClusters
+        {
+            get => _glyphClusters;
+            set => Set(ref _glyphClusters, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets the bidirectional nesting level of the <see cref="GlyphRun"/>.
+        /// </summary>
+        public int BiDiLevel
+        {
+            get => _biDiLevel;
+            set => Set(ref _biDiLevel, value);
+        }
+
+        /// <summary>
+        /// Gets the scale of the current <see cref="Media.GlyphTypeface"/>
+        /// </summary>
+        internal double Scale => FontRenderingEmSize / GlyphTypeface.DesignEmHeight;
+
+        /// <summary>
+        /// Returns <c>true</c> if the text direction is left-to-right. Otherwise, returns <c>false</c>.
+        /// </summary>
+        public bool IsLeftToRight => ((BiDiLevel & 1) == 0);
+
+        /// <summary>
+        /// The platform implementation of the <see cref="GlyphRun"/>.
+        /// </summary>
+        public IGlyphRunImpl GlyphRunImpl
+        {
+            get
+            {
+                if (_glyphRunImpl == null)
+                {
+                    Initialize();
+                }
+
+                return _glyphRunImpl!;
+            }
+        }
+
+        /// <summary>
+        /// Obtains geometry for the glyph run.
+        /// </summary>
+        /// <returns>The geometry returned contains the combined geometry of all glyphs in the glyph run.</returns>
+        public Geometry BuildGeometry()
+        {
+            var platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
+
+            var geometryImpl = platformRenderInterface.BuildGlyphRunGeometry(this, out var scale);
+
+            var geometry = new PlatformGeometry(geometryImpl);
+
+            var transform = new MatrixTransform(Matrix.CreateTranslation(geometry.Bounds.Left, -geometry.Bounds.Top) * scale);
+
+            geometry.Transform = transform;
+
+            return geometry;
+        }
+
+        /// <summary>
+        /// Retrieves the offset from the leading edge of the <see cref="GlyphRun"/>
+        /// to the leading or trailing edge of a caret stop containing the specified character hit.
+        /// </summary>
+        /// <param name="characterHit">The <see cref="CharacterHit"/> to use for computing the offset.</param>
+        /// <returns>
+        /// A <see cref="double"/> that represents the offset from the leading edge of the <see cref="GlyphRun"/>
+        /// to the leading or trailing edge of a caret stop containing the character hit.
+        /// </returns>
+        public double GetDistanceFromCharacterHit(CharacterHit characterHit)
+        {
+            var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength - _offsetToFirstCharacter;
+
+            var distance = 0.0;
+
+            if (IsLeftToRight)
+            {
+                if (GlyphClusters != null)
+                {
+                    if (characterIndex < GlyphClusters[0])
+                    {
+                        return 0;
+                    }
+
+                    if (characterIndex > GlyphClusters[GlyphClusters.Count - 1])
+                    {
+                        return Metrics.WidthIncludingTrailingWhitespace;
+                    }
+                }
+
+                var glyphIndex = FindGlyphIndex(characterIndex);
+
+                if (GlyphClusters != null)
+                {
+                    var currentCluster = GlyphClusters[glyphIndex];
+
+                    //Move to the end of the glyph cluster
+                    if (characterHit.TrailingLength > 0)
+                    {
+                        while (glyphIndex + 1 < GlyphClusters.Count && GlyphClusters[glyphIndex + 1] == currentCluster)
+                        {
+                            glyphIndex++;
+                        }
+                    }
+                }
+
+                for (var i = 0; i < glyphIndex; i++)
+                {
+                    distance += GetGlyphAdvance(i, out _);
+                }
+
+                return distance;
+            }
+            else
+            {
+                //RightToLeft
+                var glyphIndex = FindGlyphIndex(characterIndex);
+
+                if (GlyphClusters != null)
+                {
+                    if (characterIndex > GlyphClusters[0])
+                    {
+                        return 0;
+                    }
+
+                    if (characterIndex <= GlyphClusters[GlyphClusters.Count - 1])
+                    {
+                        return Size.Width;
+                    }
+                }
+
+                for (var i = glyphIndex + 1; i < GlyphIndices.Count; i++)
+                {
+                    distance += GetGlyphAdvance(i, out _);
+                }
+
+                return Size.Width - distance;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the <see cref="CharacterHit"/> value that represents the character hit of the caret of the <see cref="GlyphRun"/>.
+        /// </summary>
+        /// <param name="distance">Offset to use for computing the caret character hit.</param>
+        /// <param name="isInside">Determines whether the character hit is inside the <see cref="GlyphRun"/>.</param>
+        /// <returns>
+        /// A <see cref="CharacterHit"/> value that represents the character hit that is closest to the distance value.
+        /// The out parameter <c>isInside</c> returns <c>true</c> if the character hit is inside the <see cref="GlyphRun"/>; otherwise, <c>false</c>.
+        /// </returns>
+        public CharacterHit GetCharacterHitFromDistance(double distance, out bool isInside)
+        {
+            var characterIndex = 0;
+
+            // Before
+            if (distance <= 0)
+            {
+                isInside = false;
+
+                if (GlyphClusters != null)
+                {
+                    characterIndex = GlyphClusters[characterIndex];
+                }
+
+                var firstCharacterHit = FindNearestCharacterHit(characterIndex, out _);
+
+                return IsLeftToRight ? new CharacterHit(firstCharacterHit.FirstCharacterIndex) : firstCharacterHit;
+            }
+
+            //After
+            if (distance >= Size.Width)
+            {
+                isInside = false;
+
+                characterIndex = GlyphIndices.Count - 1;
+
+                if (GlyphClusters != null)
+                {
+                    characterIndex = GlyphClusters[characterIndex];
+                }
+
+                var lastCharacterHit = FindNearestCharacterHit(characterIndex, out _);
+
+                return IsLeftToRight ? lastCharacterHit : new CharacterHit(lastCharacterHit.FirstCharacterIndex);
+            }
+
+            //Within
+            var currentX = 0d;
+
+            if (IsLeftToRight)
+            {
+                for (var index = 0; index < GlyphIndices.Count; index++)
+                {
+                    var advance = GetGlyphAdvance(index, out var cluster);
+
+                    characterIndex = cluster;
+
+                    if (distance > currentX && distance <= currentX + advance)
+                    {
+                        break;
+                    }
+
+                    currentX += advance;
+                }
+            }
+            else
+            {
+                currentX = Size.Width;
+
+                for (var index = GlyphIndices.Count - 1; index >= 0; index--)
+                {
+                    var advance = GetGlyphAdvance(index, out var cluster);
+
+                    characterIndex = cluster;
+
+                    if (currentX - advance < distance)
+                    {
+                        break;
+                    }
+
+                    currentX -= advance;
+                }
+            }
+
+            isInside = true;
+
+            var characterHit = FindNearestCharacterHit(characterIndex, out var width);
+
+            var delta = width / 2;
+            var offset = IsLeftToRight ? distance - currentX : currentX - distance;
+
+            var isTrailing = offset > delta;
+
+            return isTrailing ? characterHit : new CharacterHit(characterHit.FirstCharacterIndex);
+        }
+
+        /// <summary>
+        /// Retrieves the next valid caret character hit in the logical direction in the <see cref="GlyphRun"/>.
+        /// </summary>
+        /// <param name="characterHit">The <see cref="CharacterHit"/> to use for computing the next hit value.</param>
+        /// <returns>
+        /// A <see cref="CharacterHit"/> that represents the next valid caret character hit in the logical direction.
+        /// If the return value is equal to <c>characterHit</c>, no further navigation is possible in the <see cref="GlyphRun"/>.
+        /// </returns>
+        public CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit)
+        {
+            if (characterHit.TrailingLength == 0)
+            {
+                characterHit = FindNearestCharacterHit(characterHit.FirstCharacterIndex, out _);
+
+                var textPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+
+                return textPosition > _characters.End ?
+                    characterHit :
+                    new CharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength);
+            }
+
+            var nextCharacterHit =
+                FindNearestCharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength, out _);
+
+            if (characterHit == nextCharacterHit)
+            {
+                return characterHit;
+            }
+
+            return characterHit.TrailingLength > 0 ?
+                nextCharacterHit :
+                new CharacterHit(nextCharacterHit.FirstCharacterIndex);
+        }
+
+        /// <summary>
+        /// Retrieves the previous valid caret character hit in the logical direction in the <see cref="GlyphRun"/>.
+        /// </summary>
+        /// <param name="characterHit">The <see cref="CharacterHit"/> to use for computing the previous hit value.</param>
+        /// <returns>
+        /// A cref="CharacterHit"/> that represents the previous valid caret character hit in the logical direction.
+        /// If the return value is equal to <c>characterHit</c>, no further navigation is possible in the <see cref="GlyphRun"/>.
+        /// </returns>
+        public CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit)
+        {
+            if (characterHit.TrailingLength != 0)
+            {
+                return new CharacterHit(characterHit.FirstCharacterIndex);
+            }
+
+            var previousCharacterHit = FindNearestCharacterHit(characterHit.FirstCharacterIndex - 1, out _);
+
+            return new CharacterHit(previousCharacterHit.FirstCharacterIndex);
+        }
+
+        /// <summary>
+        /// Finds a glyph index for given character index.
+        /// </summary>
+        /// <param name="characterIndex">The character index.</param>
+        /// <returns>
+        /// The glyph index.
+        /// </returns>
+        public int FindGlyphIndex(int characterIndex)
+        {
+            if (GlyphClusters == null)
+            {
+                return characterIndex;
+            }
+
+            if (IsLeftToRight)
+            {
+                if (characterIndex < GlyphClusters[0])
+                {
+                    return 0;
+                }
+
+                if (characterIndex > GlyphClusters[GlyphClusters.Count - 1])
+                {
+                    return GlyphClusters.Count - 1;
+                }
+            }
+            else
+            {
+                if (characterIndex < GlyphClusters[GlyphClusters.Count - 1])
+                {
+                    return GlyphClusters.Count - 1;
+                }
+
+                if (characterIndex > GlyphClusters[0])
+                {
+                    return 0;
+                }
+            }
+
+            var comparer = IsLeftToRight ? s_ascendingComparer : s_descendingComparer;
+
+            var clusters = GlyphClusters;
+
+            // Find the start of the cluster at the character index.
+            var start = clusters.BinarySearch(characterIndex, comparer);
+
+            // No cluster found.
+            if (start < 0)
+            {
+                while (characterIndex > 0 && start < 0)
+                {
+                    characterIndex--;
+
+                    start = clusters.BinarySearch(characterIndex, comparer);
+                }
+
+                if (start < 0)
+                {
+                    return -1;
+                }
+            }
+
+            if (IsLeftToRight)
+            {
+                while (start > 0 && clusters[start - 1] == clusters[start])
+                {
+                    start--;
+                }
+            }
+            else
+            {
+                while (start + 1 < clusters.Count && clusters[start + 1] == clusters[start])
+                {
+                    start++;
+                }
+            }
+
+            return start;
+        }
+
+        /// <summary>
+        /// Finds the nearest <see cref="CharacterHit"/> at given index.
+        /// </summary>
+        /// <param name="index">The index.</param>
+        /// <param name="width">The width of found cluster.</param>
+        /// <returns>
+        /// The nearest <see cref="CharacterHit"/>.
+        /// </returns>
+        public CharacterHit FindNearestCharacterHit(int index, out double width)
+        {
+            width = 0.0;
+
+            var start = FindGlyphIndex(index);
+
+            if (GlyphClusters == null)
+            {
+                width = GetGlyphAdvance(index, out _);
+
+                return new CharacterHit(start, 1);
+            }
+
+            var cluster = GlyphClusters[start];
+
+            var nextCluster = cluster;
+
+            var currentIndex = start;
+
+            while (nextCluster == cluster)
+            {
+                width += GetGlyphAdvance(currentIndex, out _);
+
+                if (IsLeftToRight)
+                {
+                    currentIndex++;
+
+                    if (currentIndex == GlyphClusters.Count)
+                    {
+                        break;
+                    }
+                }
+                else
+                {
+                    currentIndex--;
+
+                    if (currentIndex < 0)
+                    {
+                        break;
+                    }
+                }
+
+                nextCluster = GlyphClusters[currentIndex];
+            }           
+
+            int trailingLength;
+
+            if (nextCluster == cluster)
+            {
+                trailingLength = Characters.Start + Characters.Length - _offsetToFirstCharacter - cluster;
+            }
+            else
+            {
+                trailingLength = nextCluster - cluster;
+            }
+
+            return new CharacterHit(_offsetToFirstCharacter + cluster, trailingLength);
+        }
+
+        /// <summary>
+        /// Gets a glyph's width.
+        /// </summary>
+        /// <param name="index">The glyph index.</param>
+        /// <param name="cluster">The current cluster.</param>
+        /// <returns>The glyph's width.</returns>
+        private double GetGlyphAdvance(int index, out int cluster)
+        {
+            cluster = GlyphClusters != null ? GlyphClusters[index] : index;
+
+            if (GlyphAdvances != null)
+            {
+                return GlyphAdvances[index];
+            }
+
+            var glyph = GlyphIndices[index];
+
+            return GlyphTypeface.GetGlyphAdvance(glyph) * Scale;
+        }
+
+        /// <summary>
+        /// Calculates the default baseline origin of the <see cref="GlyphRun"/>.
+        /// </summary>
+        /// <returns>The baseline origin.</returns>
+        private Point CalculateBaselineOrigin()
+        {
+            return new Point(0, -GlyphTypeface.Ascent * Scale);
+        }
+
+        private GlyphRunMetrics CreateGlyphRunMetrics()
+        {
+            if (GlyphClusters != null && GlyphClusters.Count > 0)
+            {
+                var firstCluster = GlyphClusters[0];
+
+                _offsetToFirstCharacter = Math.Max(0, Characters.Start - firstCluster);
+            }
+
+            var height = (GlyphTypeface.Descent - GlyphTypeface.Ascent + GlyphTypeface.LineGap) * Scale;
+            var widthIncludingTrailingWhitespace = 0d;
+
+            var trailingWhitespaceLength = GetTrailingWhitespaceLength(out var newLineLength, out var glyphCount);
+
+            for (var index = 0; index < GlyphIndices.Count; index++)
+            {
+                var advance = GetGlyphAdvance(index, out _);
+
+                widthIncludingTrailingWhitespace += advance;
+            }
+
+            var width = widthIncludingTrailingWhitespace;
+
+            if (IsLeftToRight)
+            {
+                for (var index = GlyphIndices.Count - glyphCount; index < GlyphIndices.Count; index++)
+                {
+                    width -= GetGlyphAdvance(index, out _);
+                }
+            }
+            else
+            {
+                for (var index = 0; index < glyphCount; index++)
+                {
+                    width -= GetGlyphAdvance(index, out _);
+                }
+            }
+
+            return new GlyphRunMetrics(width, widthIncludingTrailingWhitespace, trailingWhitespaceLength, newLineLength,
+                height);
+        }
+
+        private int GetTrailingWhitespaceLength(out int newLineLength, out int glyphCount)
+        {
+            glyphCount = 0;
+            newLineLength = 0;
+
+            if (Characters.IsEmpty)
+            {
+                return 0;
+            }
+
+            var trailingWhitespaceLength = 0;
+
+            if (GlyphClusters == null)
+            {
+                for (var i = _characters.Length - 1; i >= 0;)
+                {
+                    var codepoint = Codepoint.ReadAt(_characters, i, out var count);
+
+                    if (!codepoint.IsWhiteSpace)
+                    {
+                        break;
+                    }
+
+                    if (codepoint.IsBreakChar)
+                    {
+                        newLineLength++;
+                    }
+
+                    trailingWhitespaceLength++;
+
+                    i -= count;
+                    glyphCount++;
+                }
+            }
+            else
+            {
+                for (var i = GlyphClusters.Count - 1; i >= 0; i--)
+                {
+                    var currentCluster = GlyphClusters[i];
+                    var characterIndex = Math.Max(0, currentCluster - _characters.BufferOffset);
+                    var codepoint = Codepoint.ReadAt(_characters, characterIndex, out _);
+
+                    if (!codepoint.IsWhiteSpace)
+                    {
+                        break;
+                    }
+
+                    var clusterLength = 1;
+
+                    while(i - 1 >= 0)
+                    {
+                        var nextCluster = GlyphClusters[i - 1];
+
+                        if(currentCluster == nextCluster)
+                        {
+                            clusterLength++;
+                            i--;
+
+                            continue;
+                        }
+
+                        break;
+                    }
+
+                    if (codepoint.IsBreakChar)
+                    {
+                        newLineLength += clusterLength;
+                    }
+
+                    trailingWhitespaceLength += clusterLength;
+                   
+                    glyphCount++;                   
+                }
+            }
+
+            return trailingWhitespaceLength;
+        }
+
+        private void Set<T>(ref T field, T value)
+        {
+            if (_glyphRunImpl != null)
+            {
+                throw new InvalidOperationException("GlyphRun can't be changed after it has been initialized.'");
+            }
+
+            _glyphRunMetrics = null;
+
+            _baselineOrigin = null;
+
+            field = value;
+        }
+
+        /// <summary>
+        /// Initializes the <see cref="GlyphRun"/>.
+        /// </summary>
+        private void Initialize()
+        {
+            if (GlyphIndices == null)
+            {
+                throw new InvalidOperationException();
+            }
+
+            var glyphCount = GlyphIndices.Count;
+
+            if (GlyphAdvances != null && GlyphAdvances.Count > 0 && GlyphAdvances.Count != glyphCount)
+            {
+                throw new InvalidOperationException();
+            }
+
+            if (GlyphOffsets != null && GlyphOffsets.Count > 0 && GlyphOffsets.Count != glyphCount)
+            {
+                throw new InvalidOperationException();
+            }
+
+            var platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
+
+            _glyphRunImpl = platformRenderInterface.CreateGlyphRun(this);
+        }
+
+        void IDisposable.Dispose()
+        {
+            _glyphRunImpl?.Dispose();
+        }
+
+        private class ReverseComparer<T> : IComparer<T>
+        {
+            public int Compare(T? x, T? y)
+            {
+                return Comparer<T>.Default.Compare(y, x);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/GlyphRunDrawing.cs b/src/Avalonia.Base/Media/GlyphRunDrawing.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/GlyphRunDrawing.cs
rename to src/Avalonia.Base/Media/GlyphRunDrawing.cs
diff --git a/src/Avalonia.Visuals/Media/GlyphRunMetrics.cs b/src/Avalonia.Base/Media/GlyphRunMetrics.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/GlyphRunMetrics.cs
rename to src/Avalonia.Base/Media/GlyphRunMetrics.cs
diff --git a/src/Avalonia.Visuals/Media/GlyphTypeface.cs b/src/Avalonia.Base/Media/GlyphTypeface.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/GlyphTypeface.cs
rename to src/Avalonia.Base/Media/GlyphTypeface.cs
diff --git a/src/Avalonia.Visuals/Media/GradientBrush.cs b/src/Avalonia.Base/Media/GradientBrush.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/GradientBrush.cs
rename to src/Avalonia.Base/Media/GradientBrush.cs
diff --git a/src/Avalonia.Visuals/Media/GradientSpreadMethod.cs b/src/Avalonia.Base/Media/GradientSpreadMethod.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/GradientSpreadMethod.cs
rename to src/Avalonia.Base/Media/GradientSpreadMethod.cs
diff --git a/src/Avalonia.Visuals/Media/GradientStop.cs b/src/Avalonia.Base/Media/GradientStop.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/GradientStop.cs
rename to src/Avalonia.Base/Media/GradientStop.cs
diff --git a/src/Avalonia.Base/Media/GradientStops.cs b/src/Avalonia.Base/Media/GradientStops.cs
new file mode 100644
index 0000000000..c3d0bb5ceb
--- /dev/null
+++ b/src/Avalonia.Base/Media/GradientStops.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Collections;
+using Avalonia.Media.Immutable;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// A collection of <see cref="GradientStop"/>s.
+    /// </summary>
+    public class GradientStops : AvaloniaList<GradientStop>
+    {
+        public GradientStops()
+        {
+            ResetBehavior = ResetBehavior.Remove;
+        }
+
+        public IReadOnlyList<ImmutableGradientStop> ToImmutable()
+        {
+            return this.Select(x => new ImmutableGradientStop(x.Offset, x.Color)).ToArray();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/HslColor.cs b/src/Avalonia.Base/Media/HslColor.cs
new file mode 100644
index 0000000000..e8a4d6f94f
--- /dev/null
+++ b/src/Avalonia.Base/Media/HslColor.cs
@@ -0,0 +1,519 @@
+// Color conversion portions of this source file are adapted from the Windows Community Toolkit project.
+// (https://github.com/CommunityToolkit/WindowsCommunityToolkit)
+//
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+using System.Globalization;
+using System.Text;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Defines a color using the hue/saturation/lightness (HSL) model.
+    /// This uses a cylindrical-coordinate representation of a color.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct HslColor : IEquatable<HslColor>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HslColor"/> struct.
+        /// </summary>
+        /// <param name="alpha">The Alpha (transparency) component in the range from 0..1.</param>
+        /// <param name="hue">The Hue component in the range from 0..360.
+        /// Note that 360 is equivalent to 0 and will be adjusted automatically.</param>
+        /// <param name="saturation">The Saturation component in the range from 0..1.</param>
+        /// <param name="lightness">The Lightness component in the range from 0..1.</param>
+        public HslColor(
+            double alpha,
+            double hue,
+            double saturation,
+            double lightness)
+        {
+            A = MathUtilities.Clamp(alpha,      0.0, 1.0);
+            H = MathUtilities.Clamp(hue,        0.0, 360.0);
+            S = MathUtilities.Clamp(saturation, 0.0, 1.0);
+            L = MathUtilities.Clamp(lightness,  0.0, 1.0);
+
+            // The maximum value of Hue is technically 360 minus epsilon (just below 360).
+            // This is because, in a color circle, 360 degrees is equivalent to 0 degrees.
+            // However, that is too tricky to work with in code and isn't as intuitive.
+            // Therefore, since 360 == 0, just wrap 360 if needed back to 0.
+            H = (H == 360.0 ? 0 : H);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HslColor"/> struct.
+        /// </summary>
+        /// <remarks>
+        /// This constructor exists only for internal use where performance is critical.
+        /// Whether or not the component values are in the correct ranges must be known.
+        /// </remarks>
+        /// <param name="alpha">The Alpha (transparency) component in the range from 0..1.</param>
+        /// <param name="hue">The Hue component in the range from 0..360.
+        /// Note that 360 is equivalent to 0 and will be adjusted automatically.</param>
+        /// <param name="saturation">The Saturation component in the range from 0..1.</param>
+        /// <param name="lightness">The Lightness component in the range from 0..1.</param>
+        /// <param name="clampValues">Whether to clamp component values to their required ranges.</param>
+        internal HslColor(
+            double alpha,
+            double hue,
+            double saturation,
+            double lightness,
+            bool clampValues)
+        {
+            if (clampValues)
+            {
+                A = MathUtilities.Clamp(alpha,      0.0, 1.0);
+                H = MathUtilities.Clamp(hue,        0.0, 360.0);
+                S = MathUtilities.Clamp(saturation, 0.0, 1.0);
+                L = MathUtilities.Clamp(lightness,  0.0, 1.0);
+
+                // See comments in constructor above
+                H = (H == 360.0 ? 0 : H);
+            }
+            else
+            {
+                A = alpha;
+                H = hue;
+                S = saturation;
+                L = lightness;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HslColor"/> struct.
+        /// </summary>
+        /// <param name="color">The RGB color to convert to HSL.</param>
+        public HslColor(Color color)
+        {
+            var hsl = Color.ToHsl(color);
+
+            A = hsl.A;
+            H = hsl.H;
+            S = hsl.S;
+            L = hsl.L;
+        }
+
+        /// <summary>
+        /// Gets the Alpha (transparency) component in the range from 0..1 (percentage).
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0 is fully transparent.</item>
+        ///   <item>1 is fully opaque.</item>
+        /// </list>
+        /// </remarks>
+        public double A { get; }
+
+        /// <summary>
+        /// Gets the Hue component in the range from 0..360 (degrees).
+        /// This is the color's location, in degrees, on a color wheel/circle from 0 to 360.
+        /// Note that 360 is equivalent to 0 and will be adjusted automatically.
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0/360 degrees is Red.</item>
+        ///   <item>60 degrees is Yellow.</item>
+        ///   <item>120 degrees is Green.</item>
+        ///   <item>180 degrees is Cyan.</item>
+        ///   <item>240 degrees is Blue.</item>
+        ///   <item>300 degrees is Magenta.</item>
+        /// </list>
+        /// </remarks>
+        public double H { get; }
+
+        /// <summary>
+        /// Gets the Saturation component in the range from 0..1 (percentage).
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0 is a shade of gray (no color).</item>
+        ///   <item>1 is the full color.</item>
+        /// </list>
+        /// </remarks>
+        public double S { get; }
+
+        /// <summary>
+        /// Gets the Lightness component in the range from 0..1 (percentage).
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0 is fully black.</item>
+        ///   <item>1 is fully white.</item>
+        /// </list>
+        /// </remarks>
+        public double L { get; }
+
+        /// <inheritdoc/>
+        public bool Equals(HslColor other)
+        {
+            return other.A == A &&
+                   other.H == H &&
+                   other.S == S &&
+                   other.L == L;
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object? obj)
+        {
+            if (obj is HslColor hslColor)
+            {
+                return Equals(hslColor);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets a hashcode for this object.
+        /// Hashcode is not guaranteed to be unique.
+        /// </summary>
+        /// <returns>The hashcode for this object.</returns>
+        public override int GetHashCode()
+        {
+            // Same algorithm as Color
+            // This is used instead of HashCode.Combine() due to .NET Standard 2.0 requirements
+            unchecked
+            {
+                int hashCode = A.GetHashCode();
+                hashCode = (hashCode * 397) ^ H.GetHashCode();
+                hashCode = (hashCode * 397) ^ S.GetHashCode();
+                hashCode = (hashCode * 397) ^ L.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// Returns the RGB color model equivalent of this HSL color.
+        /// </summary>
+        /// <returns>The RGB equivalent color.</returns>
+        public Color ToRgb()
+        {
+            // Use the by-component conversion method directly for performance
+            return HslColor.ToRgb(H, S, L, A);
+        }
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+
+            // Use a format similar to CSS. However:
+            //   - To ensure precision is never lost, allow decimal places.
+            //     This is especially important for round-trip serialization.
+            //   - To maintain numerical consistency, do not use percent.
+            //
+            // Example:
+            //
+            // hsla(hue, saturation, lightness, alpha)
+            // hsla(230, 1.0, 0.5, 1.0)
+            //
+
+            sb.Append("hsva(");
+            sb.Append(H.ToString(CultureInfo.InvariantCulture));
+            sb.Append(", ");
+            sb.Append(S.ToString(CultureInfo.InvariantCulture));
+            sb.Append(", ");
+            sb.Append(L.ToString(CultureInfo.InvariantCulture));
+            sb.Append(", ");
+            sb.Append(A.ToString(CultureInfo.InvariantCulture));
+            sb.Append(')');
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Parses an HSL color string.
+        /// </summary>
+        /// <param name="s">The HSL color string to parse.</param>
+        /// <returns>The parsed <see cref="HslColor"/>.</returns>
+        public static HslColor Parse(string s)
+        {
+            if (s is null)
+            {
+                throw new ArgumentNullException(nameof(s));
+            }
+
+            if (TryParse(s, out HslColor hslColor))
+            {
+                return hslColor;
+            }
+
+            throw new FormatException($"Invalid HSL color string: '{s}'.");
+        }
+
+        /// <summary>
+        /// Parses an HSL color string.
+        /// </summary>
+        /// <param name="s">The HSL color string to parse.</param>
+        /// <param name="hslColor">The parsed <see cref="HslColor"/>.</param>
+        /// <returns>True if parsing was successful; otherwise, false.</returns>
+        public static bool TryParse(string s, out HslColor hslColor)
+        {
+            bool prefixMatched = false;
+
+            hslColor = default;
+
+            if (s is null)
+            {
+                return false;
+            }
+
+            string workingString = s.Trim();
+
+            if (workingString.Length == 0 ||
+                workingString.IndexOf(",", StringComparison.Ordinal) < 0)
+            {
+                return false;
+            }
+
+            // Note: The length checks are also an important optimization.
+            // The shortest possible format is "hsl(0,0,0)", Length = 10.
+
+            if (workingString.Length >= 11 &&
+                workingString.StartsWith("hsla(", StringComparison.OrdinalIgnoreCase) &&
+                workingString.EndsWith(")", StringComparison.Ordinal))
+            {
+                workingString = workingString.Substring(5, workingString.Length - 6);
+                prefixMatched = true;
+            }
+
+            if (prefixMatched == false &&
+                workingString.Length >= 10 &&
+                workingString.StartsWith("hsl(", StringComparison.OrdinalIgnoreCase) &&
+                workingString.EndsWith(")", StringComparison.Ordinal))
+            {
+                workingString = workingString.Substring(4, workingString.Length - 5);
+                prefixMatched = true;
+            }
+
+            if (prefixMatched == false)
+            {
+                return false;
+            }
+
+            string[] components = workingString.Split(',');
+
+            if (components.Length == 3) // HSL
+            {
+                if (double.TryParse(components[0], NumberStyles.Number, CultureInfo.InvariantCulture, out double hue) &&
+                    TryInternalParse(components[1], out double saturation) &&
+                    TryInternalParse(components[2], out double lightness))
+                {
+                    hslColor = new HslColor(1.0, hue, saturation, lightness);
+                    return true;
+                }
+            }
+            else if (components.Length == 4) // HSLA
+            {
+                if (double.TryParse(components[0], NumberStyles.Number, CultureInfo.InvariantCulture, out double hue) &&
+                    TryInternalParse(components[1], out double saturation) &&
+                    TryInternalParse(components[2], out double lightness) &&
+                    TryInternalParse(components[3], out double alpha))
+                {
+                    hslColor = new HslColor(alpha, hue, saturation, lightness);
+                    return true;
+                }
+            }
+
+            // Local function to specially parse a double value with an optional percentage sign
+            bool TryInternalParse(string inString, out double outDouble)
+            {
+                // The percent sign, if it exists, must be at the end of the number
+                int percentIndex = inString.IndexOf("%", StringComparison.Ordinal);
+
+                if (percentIndex >= 0)
+                {
+                    var result = double.TryParse(
+                        inString.Substring(0, percentIndex),
+                        NumberStyles.Number,
+                        CultureInfo.InvariantCulture,
+                        out double percentage);
+
+                    outDouble = percentage / 100.0;
+                    return result;
+                }
+                else
+                {
+                    return double.TryParse(
+                        inString,
+                        NumberStyles.Number,
+                        CultureInfo.InvariantCulture,
+                        out outDouble);
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HslColor"/> from individual color component values.
+        /// </summary>
+        /// <remarks>
+        /// This exists for symmetry with the <see cref="Color"/> struct; however, the
+        /// appropriate constructor should commonly be used instead.
+        /// </remarks>
+        /// <param name="a">The Alpha (transparency) component in the range from 0..1.</param>
+        /// <param name="h">The Hue component in the range from 0..360.</param>
+        /// <param name="s">The Saturation component in the range from 0..1.</param>
+        /// <param name="l">The Lightness component in the range from 0..1.</param>
+        /// <returns>A new <see cref="HslColor"/> built from the individual color component values.</returns>
+        public static HslColor FromAhsl(double a, double h, double s, double l)
+        {
+            return new HslColor(a, h, s, l);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HslColor"/> from individual color component values.
+        /// </summary>
+        /// <remarks>
+        /// This exists for symmetry with the <see cref="Color"/> struct; however, the
+        /// appropriate constructor should commonly be used instead.
+        /// </remarks>
+        /// <param name="h">The Hue component in the range from 0..360.</param>
+        /// <param name="s">The Saturation component in the range from 0..1.</param>
+        /// <param name="l">The Lightness component in the range from 0..1.</param>
+        /// <returns>A new <see cref="HslColor"/> built from the individual color component values.</returns>
+        public static HslColor FromHsl(double h, double s, double l)
+        {
+            return new HslColor(1.0, h, s, l);
+        }
+
+        /// <summary>
+        /// Converts the given HSL color to its RGB color equivalent.
+        /// </summary>
+        /// <param name="hslColor">The color in the HSL color model.</param>
+        /// <returns>A new RGB <see cref="Color"/> equivalent to the given HSLA values.</returns>
+        public static Color ToRgb(HslColor hslColor)
+        {
+            return HslColor.ToRgb(hslColor.H, hslColor.S, hslColor.L, hslColor.A);
+        }
+
+        /// <summary>
+        /// Converts the given HSLA color component values to their RGB color equivalent.
+        /// </summary>
+        /// <param name="hue">The Hue component in the HSL color model in the range from 0..360.</param>
+        /// <param name="saturation">The Saturation component in the HSL color model in the range from 0..1.</param>
+        /// <param name="lightness">The Lightness component in the HSL color model in the range from 0..1.</param>
+        /// <param name="alpha">The Alpha component in the range from 0..1.</param>
+        /// <returns>A new RGB <see cref="Color"/> equivalent to the given HSLA values.</returns>
+        public static Color ToRgb(
+            double hue,
+            double saturation,
+            double lightness,
+            double alpha = 1.0)
+        {
+            // Note: Conversion code is originally based on ColorHelper in the Windows Community Toolkit (licensed MIT)
+            // https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/main/Microsoft.Toolkit.Uwp/Helpers/ColorHelper.cs
+            // It has been modified to ensure input ranges and not throw exceptions.
+
+            // We want the hue to be between 0 and 359,
+            // so we first ensure that that's the case.
+            while (hue >= 360.0)
+            {
+                hue -= 360.0;
+            }
+
+            while (hue < 0.0)
+            {
+                hue += 360.0;
+            }
+
+            // We similarly clamp saturation, lightness and alpha between 0 and 1.
+            saturation = saturation < 0.0 ? 0.0 : saturation;
+            saturation = saturation > 1.0 ? 1.0 : saturation;
+
+            lightness = lightness < 0.0 ? 0.0 : lightness;
+            lightness = lightness > 1.0 ? 1.0 : lightness;
+
+            alpha = alpha < 0.0 ? 0.0 : alpha;
+            alpha = alpha > 1.0 ? 1.0 : alpha;
+
+            double chroma = (1 - Math.Abs((2 * lightness) - 1)) * saturation;
+            double h1 = hue / 60;
+            double x = chroma * (1 - Math.Abs((h1 % 2) - 1));
+            double m = lightness - (0.5 * chroma);
+            double r1, g1, b1;
+
+            if (h1 < 1)
+            {
+                r1 = chroma;
+                g1 = x;
+                b1 = 0;
+            }
+            else if (h1 < 2)
+            {
+                r1 = x;
+                g1 = chroma;
+                b1 = 0;
+            }
+            else if (h1 < 3)
+            {
+                r1 = 0;
+                g1 = chroma;
+                b1 = x;
+            }
+            else if (h1 < 4)
+            {
+                r1 = 0;
+                g1 = x;
+                b1 = chroma;
+            }
+            else if (h1 < 5)
+            {
+                r1 = x;
+                g1 = 0;
+                b1 = chroma;
+            }
+            else
+            {
+                r1 = chroma;
+                g1 = 0;
+                b1 = x;
+            }
+
+            return Color.FromArgb(
+                (byte)Math.Round(255 * alpha),
+                (byte)Math.Round(255 * (r1 + m)),
+                (byte)Math.Round(255 * (g1 + m)),
+                (byte)Math.Round(255 * (b1 + m)));
+        }
+
+        /// <summary>
+        /// Indicates whether the values of two specified <see cref="HslColor"/> objects are equal.
+        /// </summary>
+        /// <param name="left">The first object to compare.</param>
+        /// <param name="right">The second object to compare.</param>
+        /// <returns>True if left and right are equal; otherwise, false.</returns>
+        public static bool operator ==(HslColor left, HslColor right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Indicates whether the values of two specified <see cref="HslColor"/> objects are not equal.
+        /// </summary>
+        /// <param name="left">The first object to compare.</param>
+        /// <param name="right">The second object to compare.</param>
+        /// <returns>True if left and right are not equal; otherwise, false.</returns>
+        public static bool operator !=(HslColor left, HslColor right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Explicit conversion from an <see cref="HslColor"/> to a <see cref="Color"/>.
+        /// </summary>
+        /// <param name="hslColor">The <see cref="HslColor"/> to convert.</param>
+        public static explicit operator Color(HslColor hslColor)
+        {
+            return hslColor.ToRgb();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/HsvColor.cs b/src/Avalonia.Base/Media/HsvColor.cs
new file mode 100644
index 0000000000..924ef4778b
--- /dev/null
+++ b/src/Avalonia.Base/Media/HsvColor.cs
@@ -0,0 +1,567 @@
+// Color conversion portions of this source file are adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+using System.Globalization;
+using System.Text;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Defines a color using the hue/saturation/value (HSV) model.
+    /// This uses a cylindrical-coordinate representation of a color.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct HsvColor : IEquatable<HsvColor>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HsvColor"/> struct.
+        /// </summary>
+        /// <param name="alpha">The Alpha (transparency) component in the range from 0..1.</param>
+        /// <param name="hue">The Hue component in the range from 0..360.
+        /// Note that 360 is equivalent to 0 and will be adjusted automatically.</param>
+        /// <param name="saturation">The Saturation component in the range from 0..1.</param>
+        /// <param name="value">The Value component in the range from 0..1.</param>
+        public HsvColor(
+            double alpha,
+            double hue,
+            double saturation,
+            double value)
+        {
+            A = MathUtilities.Clamp(alpha,      0.0, 1.0);
+            H = MathUtilities.Clamp(hue,        0.0, 360.0);
+            S = MathUtilities.Clamp(saturation, 0.0, 1.0);
+            V = MathUtilities.Clamp(value,      0.0, 1.0);
+
+            // The maximum value of Hue is technically 360 minus epsilon (just below 360).
+            // This is because, in a color circle, 360 degrees is equivalent to 0 degrees.
+            // However, that is too tricky to work with in code and isn't as intuitive.
+            // Therefore, since 360 == 0, just wrap 360 if needed back to 0.
+            H = (H == 360.0 ? 0 : H);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HsvColor"/> struct.
+        /// </summary>
+        /// <remarks>
+        /// This constructor exists only for internal use where performance is critical.
+        /// Whether or not the component values are in the correct ranges must be known.
+        /// </remarks>
+        /// <param name="alpha">The Alpha (transparency) component in the range from 0..1.</param>
+        /// <param name="hue">The Hue component in the range from 0..360.
+        /// Note that 360 is equivalent to 0 and will be adjusted automatically.</param>
+        /// <param name="saturation">The Saturation component in the range from 0..1.</param>
+        /// <param name="value">The Value component in the range from 0..1.</param>
+        /// <param name="clampValues">Whether to clamp component values to their required ranges.</param>
+        internal HsvColor(
+            double alpha,
+            double hue,
+            double saturation,
+            double value,
+            bool clampValues)
+        {
+            if (clampValues)
+            {
+                A = MathUtilities.Clamp(alpha,      0.0, 1.0);
+                H = MathUtilities.Clamp(hue,        0.0, 360.0);
+                S = MathUtilities.Clamp(saturation, 0.0, 1.0);
+                V = MathUtilities.Clamp(value,      0.0, 1.0);
+
+                // See comments in constructor above
+                H = (H == 360.0 ? 0 : H);
+            }
+            else
+            {
+                A = alpha;
+                H = hue;
+                S = saturation;
+                V = value;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HsvColor"/> struct.
+        /// </summary>
+        /// <param name="color">The RGB color to convert to HSV.</param>
+        public HsvColor(Color color)
+        {
+            var hsv = Color.ToHsv(color);
+
+            A = hsv.A;
+            H = hsv.H;
+            S = hsv.S;
+            V = hsv.V;
+        }
+
+        /// <summary>
+        /// Gets the Alpha (transparency) component in the range from 0..1 (percentage).
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0 is fully transparent.</item>
+        ///   <item>1 is fully opaque.</item>
+        /// </list>
+        /// </remarks>
+        public double A { get; }
+
+        /// <summary>
+        /// Gets the Hue component in the range from 0..360 (degrees).
+        /// This is the color's location, in degrees, on a color wheel/circle from 0 to 360.
+        /// Note that 360 is equivalent to 0 and will be adjusted automatically.
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0/360 degrees is Red.</item>
+        ///   <item>60 degrees is Yellow.</item>
+        ///   <item>120 degrees is Green.</item>
+        ///   <item>180 degrees is Cyan.</item>
+        ///   <item>240 degrees is Blue.</item>
+        ///   <item>300 degrees is Magenta.</item>
+        /// </list>
+        /// </remarks>
+        public double H { get; }
+
+        /// <summary>
+        /// Gets the Saturation component in the range from 0..1 (percentage).
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0 is a shade of gray (no color).</item>
+        ///   <item>1 is the full color.</item>
+        /// </list>
+        /// </remarks>
+        public double S { get; }
+
+        /// <summary>
+        /// Gets the Value (or Brightness/Intensity) component in the range from 0..1 (percentage).
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        ///   <item>0 is fully black and shows no color.</item>
+        ///   <item>1 is the brightest and shows full color.</item>
+        /// </list>
+        /// </remarks>
+        public double V { get; }
+
+        /// <inheritdoc/>
+        public bool Equals(HsvColor other)
+        {
+            return other.A == A &&
+                   other.H == H &&
+                   other.S == S &&
+                   other.V == V;
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object? obj)
+        {
+            if (obj is HsvColor hsvColor)
+            {
+                return Equals(hsvColor);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets a hashcode for this object.
+        /// Hashcode is not guaranteed to be unique.
+        /// </summary>
+        /// <returns>The hashcode for this object.</returns>
+        public override int GetHashCode()
+        {
+            // Same algorithm as Color
+            // This is used instead of HashCode.Combine() due to .NET Standard 2.0 requirements
+            unchecked
+            {
+                int hashCode = A.GetHashCode();
+                hashCode = (hashCode * 397) ^ H.GetHashCode();
+                hashCode = (hashCode * 397) ^ S.GetHashCode();
+                hashCode = (hashCode * 397) ^ V.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// Returns the RGB color model equivalent of this HSV color.
+        /// </summary>
+        /// <returns>The RGB equivalent color.</returns>
+        public Color ToRgb()
+        {
+            // Use the by-component conversion method directly for performance
+            return HsvColor.ToRgb(H, S, V, A);
+        }
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+
+            // Use a format similar to CSS. However:
+            //   - To ensure precision is never lost, allow decimal places.
+            //     This is especially important for round-trip serialization.
+            //   - To maintain numerical consistency, do not use percent.
+            //
+            // Example:
+            //
+            // hsva(hue, saturation, value, alpha)
+            // hsva(230, 1.0, 0.5, 1.0)
+            //
+
+            sb.Append("hsva(");
+            sb.Append(H.ToString(CultureInfo.InvariantCulture));
+            sb.Append(", ");
+            sb.Append(S.ToString(CultureInfo.InvariantCulture));
+            sb.Append(", ");
+            sb.Append(V.ToString(CultureInfo.InvariantCulture));
+            sb.Append(", ");
+            sb.Append(A.ToString(CultureInfo.InvariantCulture));
+            sb.Append(')');
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Parses an HSV color string.
+        /// </summary>
+        /// <param name="s">The HSV color string to parse.</param>
+        /// <returns>The parsed <see cref="HsvColor"/>.</returns>
+        public static HsvColor Parse(string s)
+        {
+            if (s is null)
+            {
+                throw new ArgumentNullException(nameof(s));
+            }
+
+            if (TryParse(s, out HsvColor hsvColor))
+            {
+                return hsvColor;
+            }
+
+            throw new FormatException($"Invalid HSV color string: '{s}'.");
+        }
+
+        /// <summary>
+        /// Parses an HSV color string.
+        /// </summary>
+        /// <param name="s">The HSV color string to parse.</param>
+        /// <param name="hsvColor">The parsed <see cref="HsvColor"/>.</param>
+        /// <returns>True if parsing was successful; otherwise, false.</returns>
+        public static bool TryParse(string s, out HsvColor hsvColor)
+        {
+            bool prefixMatched = false;
+
+            hsvColor = default;
+
+            if (s is null)
+            {
+                return false;
+            }
+
+            string workingString = s.Trim();
+
+            if (workingString.Length == 0 ||
+                workingString.IndexOf(",", StringComparison.Ordinal) < 0)
+            {
+                return false;
+            }
+
+            // Note: The length checks are also an important optimization.
+            // The shortest possible format is "hsv(0,0,0)", Length = 10.
+
+            if (workingString.Length >= 11 &&
+                workingString.StartsWith("hsva(", StringComparison.OrdinalIgnoreCase) &&
+                workingString.EndsWith(")", StringComparison.Ordinal))
+            {
+                workingString = workingString.Substring(5, workingString.Length - 6);
+                prefixMatched = true;
+            }
+
+            if (prefixMatched == false &&
+                workingString.Length >= 10 &&
+                workingString.StartsWith("hsv(", StringComparison.OrdinalIgnoreCase) &&
+                workingString.EndsWith(")", StringComparison.Ordinal))
+            {
+                workingString = workingString.Substring(4, workingString.Length - 5);
+                prefixMatched = true;
+            }
+
+            if (prefixMatched == false)
+            {
+                return false;
+            }
+
+            string[] components = workingString.Split(',');
+
+            if (components.Length == 3) // HSV
+            {
+                if (double.TryParse(components[0], NumberStyles.Number, CultureInfo.InvariantCulture, out double hue) &&
+                    TryInternalParse(components[1], out double saturation) &&
+                    TryInternalParse(components[2], out double value))
+                {
+                    hsvColor = new HsvColor(1.0, hue, saturation, value);
+                    return true;
+                }
+            }
+            else if (components.Length == 4) // HSVA
+            {
+                if (double.TryParse(components[0], NumberStyles.Number, CultureInfo.InvariantCulture, out double hue) &&
+                    TryInternalParse(components[1], out double saturation) &&
+                    TryInternalParse(components[2], out double value) &&
+                    TryInternalParse(components[3], out double alpha))
+                {
+                    hsvColor = new HsvColor(alpha, hue, saturation, value);
+                    return true;
+                }
+            }
+
+            // Local function to specially parse a double value with an optional percentage sign
+            bool TryInternalParse(string inString, out double outDouble)
+            {
+                // The percent sign, if it exists, must be at the end of the number
+                int percentIndex = inString.IndexOf("%", StringComparison.Ordinal);
+
+                if (percentIndex >= 0)
+                {
+                    var result = double.TryParse(
+                        inString.Substring(0, percentIndex),
+                        NumberStyles.Number,
+                        CultureInfo.InvariantCulture,
+                        out double percentage);
+
+                    outDouble = percentage / 100.0;
+                    return result;
+                }
+                else
+                {
+                    return double.TryParse(
+                        inString,
+                        NumberStyles.Number,
+                        CultureInfo.InvariantCulture,
+                        out outDouble);
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HsvColor"/> from individual color component values.
+        /// </summary>
+        /// <remarks>
+        /// This exists for symmetry with the <see cref="Color"/> struct; however, the
+        /// appropriate constructor should commonly be used instead.
+        /// </remarks>
+        /// <param name="a">The Alpha (transparency) component in the range from 0..1.</param>
+        /// <param name="h">The Hue component in the range from 0..360.</param>
+        /// <param name="s">The Saturation component in the range from 0..1.</param>
+        /// <param name="v">The Value component in the range from 0..1.</param>
+        /// <returns>A new <see cref="HsvColor"/> built from the individual color component values.</returns>
+        public static HsvColor FromAhsv(double a, double h, double s, double v)
+        {
+            return new HsvColor(a, h, s, v);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HsvColor"/> from individual color component values.
+        /// </summary>
+        /// <remarks>
+        /// This exists for symmetry with the <see cref="Color"/> struct; however, the
+        /// appropriate constructor should commonly be used instead.
+        /// </remarks>
+        /// <param name="h">The Hue component in the range from 0..360.</param>
+        /// <param name="s">The Saturation component in the range from 0..1.</param>
+        /// <param name="v">The Value component in the range from 0..1.</param>
+        /// <returns>A new <see cref="HsvColor"/> built from the individual color component values.</returns>
+        public static HsvColor FromHsv(double h, double s, double v)
+        {
+            return new HsvColor(1.0, h, s, v);
+        }
+
+        /// <summary>
+        /// Converts the given HSV color to its RGB color equivalent.
+        /// </summary>
+        /// <param name="hsvColor">The color in the HSV color model.</param>
+        /// <returns>A new RGB <see cref="Color"/> equivalent to the given HSVA values.</returns>
+        public static Color ToRgb(HsvColor hsvColor)
+        {
+            return HsvColor.ToRgb(hsvColor.H, hsvColor.S, hsvColor.V, hsvColor.A);
+        }
+
+        /// <summary>
+        /// Converts the given HSVA color component values to their RGB color equivalent.
+        /// </summary>
+        /// <param name="hue">The Hue component in the HSV color model in the range from 0..360.</param>
+        /// <param name="saturation">The Saturation component in the HSV color model in the range from 0..1.</param>
+        /// <param name="value">The Value component in the HSV color model in the range from 0..1.</param>
+        /// <param name="alpha">The Alpha component in the range from 0..1.</param>
+        /// <returns>A new RGB <see cref="Color"/> equivalent to the given HSVA values.</returns>
+        public static Color ToRgb(
+            double hue,
+            double saturation,
+            double value,
+            double alpha = 1.0)
+        {
+            // Note: Conversion code is originally based on the C++ in WinUI (licensed MIT)
+            // https://github.com/microsoft/microsoft-ui-xaml/blob/main/dev/Common/ColorConversion.cpp
+            // This was used because it is the best documented and likely most optimized for performance
+            // Alpha support was added
+
+            // We want the hue to be between 0 and 359,
+            // so we first ensure that that's the case.
+            while (hue >= 360.0)
+            {
+                hue -= 360.0;
+            }
+
+            while (hue < 0.0)
+            {
+                hue += 360.0;
+            }
+
+            // We similarly clamp saturation, value and alpha between 0 and 1.
+            saturation = saturation < 0.0 ? 0.0 : saturation;
+            saturation = saturation > 1.0 ? 1.0 : saturation;
+
+            value = value < 0.0 ? 0.0 : value;
+            value = value > 1.0 ? 1.0 : value;
+
+            alpha = alpha < 0.0 ? 0.0 : alpha;
+            alpha = alpha > 1.0 ? 1.0 : alpha;
+
+            // The first thing that we need to do is to determine the chroma (see above for its definition).
+            // Remember from above that:
+            //
+            // 1. The chroma is the difference between the maximum and the minimum of the RGB channels,
+            // 2. The value is the maximum of the RGB channels, and
+            // 3. The saturation comes from dividing the chroma by the maximum of the RGB channels (i.e., the value).
+            //
+            // From these facts, you can see that we can retrieve the chroma by simply multiplying the saturation and the value,
+            // and we can retrieve the minimum of the RGB channels by subtracting the chroma from the value.
+            var chroma = saturation * value;
+            var min = value - chroma;
+
+            // If the chroma is zero, then we have a greyscale color.  In that case, the maximum and the minimum RGB channels
+            // have the same value (and, indeed, all of the RGB channels are the same), so we can just immediately return
+            // the minimum value as the value of all the channels.
+            if (chroma == 0)
+            {
+                return Color.FromArgb(
+                    (byte)Math.Round(alpha * 255),
+                    (byte)Math.Round(min * 255),
+                    (byte)Math.Round(min * 255),
+                    (byte)Math.Round(min * 255));
+            }
+
+            // If the chroma is not zero, then we need to continue.  The first step is to figure out
+            // what section of the color wheel we're located in.  In order to do that, we'll divide the hue by 60.
+            // The resulting value means we're in one of the following locations:
+            //
+            // 0 - Between red and yellow.
+            // 1 - Between yellow and green.
+            // 2 - Between green and cyan.
+            // 3 - Between cyan and blue.
+            // 4 - Between blue and purple.
+            // 5 - Between purple and red.
+            //
+            // In each of these sextants, one of the RGB channels is completely present, one is partially present, and one is not present.
+            // For example, as we transition between red and yellow, red is completely present, green is becoming increasingly present, and blue is not present.
+            // Then, as we transition from yellow and green, green is now completely present, red is becoming decreasingly present, and blue is still not present.
+            // As we transition from green to cyan, green is still completely present, blue is becoming increasingly present, and red is no longer present.  And so on.
+            //
+            // To convert from hue to RGB value, we first need to figure out which of the three channels is in which configuration
+            // in the sextant that we're located in.  Next, we figure out what value the completely-present color should have.
+            // We know that chroma = (max - min), and we know that this color is the max color, so to find its value we simply add
+            // min to chroma to retrieve max.  Finally, we consider how far we've transitioned from the pure form of that color
+            // to the next color (e.g., how far we are from pure red towards yellow), and give a value to the partially present channel
+            // equal to the minimum plus the chroma (i.e., the max minus the min), multiplied by the percentage towards the new color.
+            // This gets us a value between the maximum and the minimum representing the partially present channel.
+            // Finally, the not-present color must be equal to the minimum value, since it is the one least participating in the overall color.
+            int sextant = (int)(hue / 60);
+            double intermediateColorPercentage = (hue / 60) - sextant;
+            double max = chroma + min;
+
+            double r = 0;
+            double g = 0;
+            double b = 0;
+
+            switch (sextant)
+            {
+                case 0:
+                    r = max;
+                    g = min + (chroma * intermediateColorPercentage);
+                    b = min;
+                    break;
+                case 1:
+                    r = min + (chroma * (1 - intermediateColorPercentage));
+                    g = max;
+                    b = min;
+                    break;
+                case 2:
+                    r = min;
+                    g = max;
+                    b = min + (chroma * intermediateColorPercentage);
+                    break;
+                case 3:
+                    r = min;
+                    g = min + (chroma * (1 - intermediateColorPercentage));
+                    b = max;
+                    break;
+                case 4:
+                    r = min + (chroma * intermediateColorPercentage);
+                    g = min;
+                    b = max;
+                    break;
+                case 5:
+                    r = max;
+                    g = min;
+                    b = min + (chroma * (1 - intermediateColorPercentage));
+                    break;
+            }
+
+            return Color.FromArgb(
+                (byte)Math.Round(alpha * 255),
+                (byte)Math.Round(r * 255),
+                (byte)Math.Round(g * 255),
+                (byte)Math.Round(b * 255));
+        }
+
+        /// <summary>
+        /// Indicates whether the values of two specified <see cref="HsvColor"/> objects are equal.
+        /// </summary>
+        /// <param name="left">The first object to compare.</param>
+        /// <param name="right">The second object to compare.</param>
+        /// <returns>True if left and right are equal; otherwise, false.</returns>
+        public static bool operator ==(HsvColor left, HsvColor right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Indicates whether the values of two specified <see cref="HsvColor"/> objects are not equal.
+        /// </summary>
+        /// <param name="left">The first object to compare.</param>
+        /// <param name="right">The second object to compare.</param>
+        /// <returns>True if left and right are not equal; otherwise, false.</returns>
+        public static bool operator !=(HsvColor left, HsvColor right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Explicit conversion from an <see cref="HsvColor"/> to a <see cref="Color"/>.
+        /// </summary>
+        /// <param name="hsvColor">The <see cref="HsvColor"/> to convert.</param>
+        public static explicit operator Color(HsvColor hsvColor)
+        {
+            return hsvColor.ToRgb();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/IAffectsRender.cs b/src/Avalonia.Base/Media/IAffectsRender.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/IAffectsRender.cs
rename to src/Avalonia.Base/Media/IAffectsRender.cs
diff --git a/src/Avalonia.Base/Media/IBrush.cs b/src/Avalonia.Base/Media/IBrush.cs
new file mode 100644
index 0000000000..e32894f67c
--- /dev/null
+++ b/src/Avalonia.Base/Media/IBrush.cs
@@ -0,0 +1,28 @@
+using System.ComponentModel;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes how an area is painted.
+    /// </summary>
+    [TypeConverter(typeof(BrushConverter))]
+    [NotClientImplementable]
+    public interface IBrush
+    {
+        /// <summary>
+        /// Gets the opacity of the brush.
+        /// </summary>
+        double Opacity { get; }
+
+        /// <summary>
+        /// Gets the transform of the brush.
+        /// </summary>
+        ITransform? Transform { get; }
+
+        /// <summary>
+        /// Gets the origin of the brushes <see cref="Transform"/>
+        /// </summary>
+        RelativePoint TransformOrigin { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IConicGradientBrush.cs b/src/Avalonia.Base/Media/IConicGradientBrush.cs
new file mode 100644
index 0000000000..6a397b86d4
--- /dev/null
+++ b/src/Avalonia.Base/Media/IConicGradientBrush.cs
@@ -0,0 +1,22 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Paints an area with a conic gradient.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IConicGradientBrush : IGradientBrush
+    {
+        /// <summary>
+        /// Gets the center point for the gradient.
+        /// </summary>
+        RelativePoint Center { get; }
+
+        /// <summary>
+        /// Gets the starting angle for the gradient in degrees, measured from
+        /// the point above the center point.
+        /// </summary>
+        double Angle { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IDashStyle.cs b/src/Avalonia.Base/Media/IDashStyle.cs
new file mode 100644
index 0000000000..7208216603
--- /dev/null
+++ b/src/Avalonia.Base/Media/IDashStyle.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents the sequence of dashes and gaps that will be applied by a <see cref="Pen"/>.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IDashStyle
+    {
+        /// <summary>
+        /// Gets or sets the length of alternating dashes and gaps.
+        /// </summary>
+        IReadOnlyList<double> Dashes { get; }
+
+        /// <summary>
+        /// Gets or sets how far in the dash sequence the stroke will start.
+        /// </summary>
+        double Offset { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IExperimentalAcrylicMaterial.cs b/src/Avalonia.Base/Media/IExperimentalAcrylicMaterial.cs
new file mode 100644
index 0000000000..38048fb255
--- /dev/null
+++ b/src/Avalonia.Base/Media/IExperimentalAcrylicMaterial.cs
@@ -0,0 +1,36 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Experimental Interface for producing Acrylic-like materials.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IExperimentalAcrylicMaterial
+    {
+        /// <summary>
+        /// Gets the <see cref="AcrylicBackgroundSource"/> of the material.
+        /// </summary>
+        AcrylicBackgroundSource BackgroundSource { get; }
+
+        /// <summary>
+        /// Gets the TintColor of the material.
+        /// </summary>
+        Color TintColor { get; }
+
+        /// <summary>
+        /// Gets the TintOpacity of the material.
+        /// </summary>
+        double TintOpacity { get; }
+
+        /// <summary>
+        /// Gets the effective material color.
+        /// </summary>
+        Color MaterialColor { get; }        
+
+        /// <summary>
+        /// Gets the fallback color.
+        /// </summary>
+        Color FallbackColor { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IGradientBrush.cs b/src/Avalonia.Base/Media/IGradientBrush.cs
new file mode 100644
index 0000000000..9b78a4af78
--- /dev/null
+++ b/src/Avalonia.Base/Media/IGradientBrush.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// A brush that draws with a gradient.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IGradientBrush : IBrush
+    {
+        /// <summary>
+        /// Gets the brush's gradient stops.
+        /// </summary>
+        IReadOnlyList<IGradientStop> GradientStops { get; }
+
+        /// <summary>
+        /// Gets the brush's spread method that defines how to draw a gradient that doesn't fill
+        /// the bounds of the destination control.
+        /// </summary>
+        GradientSpreadMethod SpreadMethod { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IGradientStop.cs b/src/Avalonia.Base/Media/IGradientStop.cs
new file mode 100644
index 0000000000..64b952f3bc
--- /dev/null
+++ b/src/Avalonia.Base/Media/IGradientStop.cs
@@ -0,0 +1,21 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes the location and color of a transition point in a gradient.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IGradientStop
+    {
+        /// <summary>
+        /// Gets the gradient stop color.
+        /// </summary>
+        Color Color { get; }
+
+        /// <summary>
+        /// Gets the gradient stop offset.
+        /// </summary>
+        double Offset { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IImage.cs b/src/Avalonia.Base/Media/IImage.cs
new file mode 100644
index 0000000000..cbe25b7b58
--- /dev/null
+++ b/src/Avalonia.Base/Media/IImage.cs
@@ -0,0 +1,28 @@
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a raster or vector image.
+    /// </summary>
+    public interface IImage
+    {
+        /// <summary>
+        /// Gets the size of the image, in device independent pixels.
+        /// </summary>
+        Size Size { get; }
+
+        /// <summary>
+        /// Draws the image to a <see cref="DrawingContext"/>.
+        /// </summary>
+        /// <param name="context">The drawing context.</param>
+        /// <param name="sourceRect">The rect in the image to draw.</param>
+        /// <param name="destRect">The rect in the output to draw to.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        void Draw(
+            DrawingContext context,
+            Rect sourceRect,
+            Rect destRect,
+            BitmapInterpolationMode bitmapInterpolationMode);
+    }
+}
diff --git a/src/Avalonia.Base/Media/IImageBrush.cs b/src/Avalonia.Base/Media/IImageBrush.cs
new file mode 100644
index 0000000000..732f1957d0
--- /dev/null
+++ b/src/Avalonia.Base/Media/IImageBrush.cs
@@ -0,0 +1,17 @@
+using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Paints an area with an <see cref="IBitmap"/>.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IImageBrush : ITileBrush
+    {
+        /// <summary>
+        /// Gets the image to draw.
+        /// </summary>
+        IBitmap Source { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/ILinearGradientBrush.cs b/src/Avalonia.Base/Media/ILinearGradientBrush.cs
new file mode 100644
index 0000000000..4f4a55db36
--- /dev/null
+++ b/src/Avalonia.Base/Media/ILinearGradientBrush.cs
@@ -0,0 +1,21 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// A brush that draws with a linear gradient.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ILinearGradientBrush : IGradientBrush
+    {
+        /// <summary>
+        /// Gets or sets the start point for the gradient.
+        /// </summary>
+        RelativePoint StartPoint { get; }
+
+        /// <summary>
+        /// Gets or sets the end point for the gradient.
+        /// </summary>
+        RelativePoint EndPoint { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IMutableBrush.cs b/src/Avalonia.Base/Media/IMutableBrush.cs
new file mode 100644
index 0000000000..fef124ba36
--- /dev/null
+++ b/src/Avalonia.Base/Media/IMutableBrush.cs
@@ -0,0 +1,18 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a mutable brush which can return an immutable clone of itself.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IMutableBrush : IBrush, IAffectsRender
+    {
+        /// <summary>
+        /// Creates an immutable clone of the brush.
+        /// </summary>
+        /// <returns>The immutable clone.</returns>
+        IBrush ToImmutable();
+    }
+}
diff --git a/src/Avalonia.Base/Media/IMutableExperimentalAcrylicMaterial.cs b/src/Avalonia.Base/Media/IMutableExperimentalAcrylicMaterial.cs
new file mode 100644
index 0000000000..f954a8c52a
--- /dev/null
+++ b/src/Avalonia.Base/Media/IMutableExperimentalAcrylicMaterial.cs
@@ -0,0 +1,17 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a mutable brush which can return an immutable clone of itself.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IMutableExperimentalAcrylicMaterial : IExperimentalAcrylicMaterial, IAffectsRender
+    {
+        /// <summary>
+        /// Creates an immutable clone of the brush.
+        /// </summary>
+        /// <returns>The immutable clone.</returns>
+        IExperimentalAcrylicMaterial ToImmutable();
+    }
+}
diff --git a/src/Avalonia.Base/Media/IMutableTransform.cs b/src/Avalonia.Base/Media/IMutableTransform.cs
new file mode 100644
index 0000000000..22526eed17
--- /dev/null
+++ b/src/Avalonia.Base/Media/IMutableTransform.cs
@@ -0,0 +1,13 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    public interface IMutableTransform : ITransform
+    {
+        /// <summary>
+        /// Raised when the transform changes.
+        /// </summary>
+        event EventHandler Changed;
+    }
+}
diff --git a/src/Avalonia.Base/Media/IPen.cs b/src/Avalonia.Base/Media/IPen.cs
new file mode 100644
index 0000000000..eca1cb507a
--- /dev/null
+++ b/src/Avalonia.Base/Media/IPen.cs
@@ -0,0 +1,42 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes how a stroke is drawn.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IPen
+    {
+        /// <summary>
+        /// Gets the brush used to draw the stroke.
+        /// </summary>
+        IBrush? Brush { get; }
+
+        /// <summary>
+        /// Gets the style of dashed lines drawn with a <see cref="Pen"/> object.
+        /// </summary>
+        IDashStyle? DashStyle { get; }
+
+        /// <summary>
+        /// Gets the type of shape to use on both ends of a line.
+        /// </summary>
+        PenLineCap LineCap { get; }
+
+        /// <summary>
+        /// Gets a value describing how to join consecutive line or curve segments in a 
+        /// <see cref="PathFigure"/> contained in a <see cref="PathGeometry"/> object.
+        /// </summary>
+        PenLineJoin LineJoin { get; }
+
+        /// <summary>
+        /// Gets the limit of the thickness of the join on a mitered corner.
+        /// </summary>
+        double MiterLimit { get; }
+
+        /// <summary>
+        /// Gets the stroke thickness.
+        /// </summary>
+        double Thickness { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/IRadialGradientBrush.cs b/src/Avalonia.Base/Media/IRadialGradientBrush.cs
new file mode 100644
index 0000000000..0f025e98bc
--- /dev/null
+++ b/src/Avalonia.Base/Media/IRadialGradientBrush.cs
@@ -0,0 +1,27 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Paints an area with a radial gradient.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IRadialGradientBrush : IGradientBrush
+    {
+        /// <summary>
+        /// Gets the start point for the gradient.
+        /// </summary>
+        RelativePoint Center { get; }
+
+        /// <summary>
+        /// Gets the location of the two-dimensional focal point that defines the beginning of the
+        /// gradient.
+        /// </summary>
+        RelativePoint GradientOrigin { get; }
+
+        /// <summary>
+        /// Gets the horizontal and vertical radius of the outermost circle of the radial gradient.
+        /// </summary>
+        double Radius { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/ISolidColorBrush.cs b/src/Avalonia.Base/Media/ISolidColorBrush.cs
new file mode 100644
index 0000000000..29e11210f1
--- /dev/null
+++ b/src/Avalonia.Base/Media/ISolidColorBrush.cs
@@ -0,0 +1,16 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Fills an area with a solid color.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ISolidColorBrush : IBrush
+    {
+        /// <summary>
+        /// Gets the color of the brush.
+        /// </summary>
+        Color Color { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/ITileBrush.cs b/src/Avalonia.Base/Media/ITileBrush.cs
new file mode 100644
index 0000000000..cb5a591003
--- /dev/null
+++ b/src/Avalonia.Base/Media/ITileBrush.cs
@@ -0,0 +1,51 @@
+using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// A brush which displays a repeating image.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ITileBrush : IBrush
+    {
+        /// <summary>
+        /// Gets the horizontal alignment of a tile in the destination.
+        /// </summary>
+        AlignmentX AlignmentX { get; }
+
+        /// <summary>
+        /// Gets the horizontal alignment of a tile in the destination.
+        /// </summary>
+        AlignmentY AlignmentY { get; }
+
+        /// <summary>
+        /// Gets the rectangle on the destination in which to paint a tile.
+        /// </summary>
+        RelativeRect DestinationRect { get; }
+
+        /// <summary>
+        /// Gets the rectangle of the source image that will be displayed.
+        /// </summary>
+        RelativeRect SourceRect { get; }
+
+        /// <summary>
+        /// Gets a value indicating how the source rectangle will be stretched to fill the
+        /// destination rect.
+        /// </summary>
+        Stretch Stretch { get; }
+
+        /// <summary>
+        /// Gets the brush's tile mode.
+        /// </summary>
+        TileMode TileMode { get; }
+
+        /// <summary>
+        /// Gets the bitmap interpolation mode.
+        /// </summary>
+        /// <value>
+        /// The bitmap interpolation mode.
+        /// </value>
+        BitmapInterpolationMode BitmapInterpolationMode { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/ITransform.cs b/src/Avalonia.Base/Media/ITransform.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/ITransform.cs
rename to src/Avalonia.Base/Media/ITransform.cs
diff --git a/src/Avalonia.Base/Media/IVisualBrush.cs b/src/Avalonia.Base/Media/IVisualBrush.cs
new file mode 100644
index 0000000000..b8900bbd73
--- /dev/null
+++ b/src/Avalonia.Base/Media/IVisualBrush.cs
@@ -0,0 +1,17 @@
+using Avalonia.Metadata;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Paints an area with an <see cref="IVisual"/>.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IVisualBrush : ITileBrush
+    {
+        /// <summary>
+        /// Gets the visual to draw.
+        /// </summary>
+        IVisual Visual { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/ImageBrush.cs b/src/Avalonia.Base/Media/ImageBrush.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/ImageBrush.cs
rename to src/Avalonia.Base/Media/ImageBrush.cs
diff --git a/src/Avalonia.Visuals/Media/ImageDrawing.cs b/src/Avalonia.Base/Media/ImageDrawing.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/ImageDrawing.cs
rename to src/Avalonia.Base/Media/ImageDrawing.cs
diff --git a/src/Avalonia.Base/Media/Imaging/Bitmap.cs b/src/Avalonia.Base/Media/Imaging/Bitmap.cs
new file mode 100644
index 0000000000..5f1617d778
--- /dev/null
+++ b/src/Avalonia.Base/Media/Imaging/Bitmap.cs
@@ -0,0 +1,174 @@
+using System;
+using System.IO;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.Imaging
+{
+    /// <summary>
+    /// Holds a bitmap image.
+    /// </summary>
+    public class Bitmap : IBitmap
+    {
+        /// <summary>
+        /// Loads a Bitmap from a stream and decodes at the desired width. Aspect ratio is maintained.
+        /// This is more efficient than loading and then resizing.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
+        /// <param name="width">The desired width of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
+        /// <returns>An instance of the <see cref="Bitmap"/> class.</returns>
+        public static Bitmap DecodeToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return new Bitmap(GetFactory().LoadBitmapToWidth(stream, width, interpolationMode));
+        }
+
+        /// <summary>
+        /// Loads a Bitmap from a stream and decodes at the desired height. Aspect ratio is maintained.
+        /// This is more efficient than loading and then resizing.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
+        /// <param name="height">The desired height of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
+        /// <returns>An instance of the <see cref="Bitmap"/> class.</returns>
+        public static Bitmap DecodeToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return new Bitmap(GetFactory().LoadBitmapToHeight(stream, height, interpolationMode));
+        }
+
+        /// <summary>
+        /// Creates a Bitmap scaled to a specified size from the current bitmap.
+        /// </summary>        
+        /// <param name="destinationSize">The destination size.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
+        /// <returns>An instance of the <see cref="Bitmap"/> class.</returns>
+        public Bitmap CreateScaledBitmap(PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return new Bitmap(GetFactory().ResizeBitmap(PlatformImpl.Item, destinationSize, interpolationMode));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Bitmap"/> class.
+        /// </summary>
+        /// <param name="fileName">The filename of the bitmap.</param>
+        public Bitmap(string fileName)
+        {
+            PlatformImpl = RefCountable.Create(GetFactory().LoadBitmap(fileName));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Bitmap"/> class.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param>
+        public Bitmap(Stream stream)
+        {
+            PlatformImpl = RefCountable.Create(GetFactory().LoadBitmap(stream));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Bitmap"/> class.
+        /// </summary>
+        /// <param name="impl">A platform-specific bitmap implementation.</param>
+        public Bitmap(IRef<IBitmapImpl> impl)
+        {
+            PlatformImpl = impl.Clone();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Bitmap"/> class.
+        /// </summary>
+        /// <param name="impl">A platform-specific bitmap implementation. Bitmap class takes the ownership.</param>
+        protected Bitmap(IBitmapImpl impl)
+        {
+            PlatformImpl = RefCountable.Create(impl);
+        }
+
+        /// <inheritdoc/>
+        public virtual void Dispose()
+        {
+            PlatformImpl.Dispose();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Bitmap"/> class.
+        /// </summary>
+        /// <param name="format">The pixel format.</param>
+        /// <param name="data">The pointer to the source bytes.</param>
+        /// <param name="size">The size of the bitmap in device pixels.</param>
+        /// <param name="dpi">The DPI of the bitmap.</param>
+        /// <param name="stride">The number of bytes per row.</param>
+        [Obsolete("Use overload taking an AlphaFormat.")]
+        public Bitmap(PixelFormat format, IntPtr data, PixelSize size, Vector dpi, int stride)
+        {
+            var ri = GetFactory();
+            PlatformImpl = RefCountable.Create(ri
+                .LoadBitmap(format, ri.DefaultAlphaFormat, data, size, dpi, stride));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Bitmap"/> class.
+        /// </summary>
+        /// <param name="format">The pixel format.</param>
+        /// <param name="alphaFormat">The alpha format.</param>
+        /// <param name="data">The pointer to the source bytes.</param>
+        /// <param name="size">The size of the bitmap in device pixels.</param>
+        /// <param name="dpi">The DPI of the bitmap.</param>
+        /// <param name="stride">The number of bytes per row.</param>
+        public Bitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
+        {
+            PlatformImpl = RefCountable.Create(GetFactory().LoadBitmap(format, alphaFormat, data, size, dpi, stride));
+        }
+
+        /// <inheritdoc/>
+        public Vector Dpi => PlatformImpl.Item.Dpi;
+
+        /// <inheritdoc/>
+        public Size Size => PlatformImpl.Item.PixelSize.ToSizeWithDpi(Dpi);
+
+        /// <inheritdoc/>
+        public PixelSize PixelSize => PlatformImpl.Item.PixelSize;
+
+        /// <summary>
+        /// Gets the platform-specific bitmap implementation.
+        /// </summary>
+        public IRef<IBitmapImpl> PlatformImpl { get; }
+
+        /// <summary>
+        /// Saves the bitmap to a file.
+        /// </summary>
+        /// <param name="fileName">The filename.</param>
+        public void Save(string fileName)
+        {
+            PlatformImpl.Item.Save(fileName);
+        }
+
+        /// <summary>
+        /// Saves the bitmap to a stream.
+        /// </summary>
+        /// <param name="stream">The stream.</param>
+        public void Save(Stream stream)
+        {
+            PlatformImpl.Item.Save(stream);
+        }
+
+        /// <inheritdoc/>
+        void IImage.Draw(
+            DrawingContext context,
+            Rect sourceRect,
+            Rect destRect,
+            BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            context.PlatformImpl.DrawBitmap(
+                PlatformImpl,
+                1,
+                sourceRect,
+                destRect,
+                bitmapInterpolationMode);
+        }
+
+        private static IPlatformRenderInterface GetFactory()
+        {
+            return AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Imaging/BitmapBlendingMode.cs b/src/Avalonia.Base/Media/Imaging/BitmapBlendingMode.cs
new file mode 100644
index 0000000000..eb39020939
--- /dev/null
+++ b/src/Avalonia.Base/Media/Imaging/BitmapBlendingMode.cs
@@ -0,0 +1,57 @@
+namespace Avalonia.Media.Imaging
+{
+    /// <summary>
+    /// Controls the way the bitmaps are drawn together.
+    /// </summary>
+    public enum BitmapBlendingMode
+    {
+        /// <summary>
+        /// Source is placed over the destination.
+        /// </summary>
+        SourceOver,
+        /// <summary>
+        /// Only the source will be present.
+        /// </summary>
+        Source,
+        /// <summary>
+        /// Only the destination will be present.
+        /// </summary>
+        Destination,
+        /// <summary>
+        /// Destination is placed over the source.
+        /// </summary>
+        DestinationOver,
+        /// <summary>
+        /// The source that overlaps the destination, replaces the destination.
+        /// </summary>
+        SourceIn,
+        /// <summary>
+        /// Destination which overlaps the source, replaces the source.
+        /// </summary>
+        DestinationIn,
+        /// <summary>
+        /// Source is placed, where it falls outside of the destination.
+        /// </summary>
+        SourceOut,
+        /// <summary>
+        /// Destination is placed, where it falls outside of the source.
+        /// </summary>
+        DestinationOut,
+        /// <summary>
+        /// Source which overlaps the destination, replaces the destination.
+        /// </summary>
+        SourceAtop,
+        /// <summary>
+        /// Destination which overlaps the source replaces the source.
+        /// </summary>
+        DestinationAtop,
+        /// <summary>
+        /// The non-overlapping regions of source and destination are combined.
+        /// </summary>
+        Xor,
+        /// <summary>
+        /// Display the sum of the source image and destination image.
+        /// </summary>
+        Plus,
+    }
+}
diff --git a/src/Avalonia.Base/Media/Imaging/BitmapInterpolationMode.cs b/src/Avalonia.Base/Media/Imaging/BitmapInterpolationMode.cs
new file mode 100644
index 0000000000..7cdb5d8b9f
--- /dev/null
+++ b/src/Avalonia.Base/Media/Imaging/BitmapInterpolationMode.cs
@@ -0,0 +1,28 @@
+namespace Avalonia.Media.Imaging
+{
+    /// <summary>
+    /// Controls the performance and quality of bitmap scaling.
+    /// </summary>
+    public enum BitmapInterpolationMode
+    {
+        /// <summary>
+        /// Uses the default behavior of the underling render backend.
+        /// </summary>
+        Default,
+
+        /// <summary>
+        /// The best performance but worst image quality.
+        /// </summary>
+        LowQuality,
+
+        /// <summary>
+        /// Good performance and decent image quality.
+        /// </summary>
+        MediumQuality,      
+
+        /// <summary>
+        /// Highest quality but worst performance.
+        /// </summary>
+        HighQuality
+    }
+}
diff --git a/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs b/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs
new file mode 100644
index 0000000000..70f9fbf567
--- /dev/null
+++ b/src/Avalonia.Base/Media/Imaging/CroppedBitmap.cs
@@ -0,0 +1,96 @@
+using System;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media.Imaging
+{
+    /// <summary>
+    /// Crops a Bitmap.
+    /// </summary>
+    public class CroppedBitmap : AvaloniaObject, IImage, IAffectsRender, IDisposable
+    {
+        /// <summary>
+        /// Defines the <see cref="Source"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IImage?> SourceProperty =
+            AvaloniaProperty.Register<CroppedBitmap, IImage?>(nameof(Source));
+
+        /// <summary>
+        /// Defines the <see cref="SourceRect"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PixelRect> SourceRectProperty =
+            AvaloniaProperty.Register<CroppedBitmap, PixelRect>(nameof(SourceRect));
+
+        public event EventHandler? Invalidated;
+
+        static CroppedBitmap()
+        {
+            SourceRectProperty.Changed.AddClassHandler<CroppedBitmap>((x, e) => x.SourceRectChanged(e));
+            SourceProperty.Changed.AddClassHandler<CroppedBitmap>((x, e) => x.SourceChanged(e));
+        }
+
+        /// <summary>
+        /// Gets or sets the source for the bitmap.
+        /// </summary>
+        public IImage? Source
+        {
+            get => GetValue(SourceProperty);
+            set => SetValue(SourceProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the rectangular area that the bitmap is cropped to.
+        /// </summary>
+        public PixelRect SourceRect
+        {
+            get => GetValue(SourceRectProperty);
+            set => SetValue(SourceRectProperty, value);
+        }
+
+        public CroppedBitmap()
+        {
+            Source = null;
+            SourceRect = default;
+        }
+
+        public CroppedBitmap(IImage source, PixelRect sourceRect)
+        {
+            Source = source;
+            SourceRect = sourceRect;
+        }
+
+        private void SourceChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.NewValue == null)
+                return;
+            if (!(e.NewValue is IBitmap))
+                throw new ArgumentException("Only IBitmap supported as source");
+            Invalidated?.Invoke(this, e);
+        }
+
+        private void SourceRectChanged(AvaloniaPropertyChangedEventArgs e) => Invalidated?.Invoke(this, e);
+
+        public virtual void Dispose()
+        {
+            (Source as IBitmap)?.Dispose();
+        }
+
+        public Size Size {
+            get
+            {
+                if (Source is not IBitmap bmp)
+                    return Size.Empty;
+                if (SourceRect.IsEmpty)
+                    return Source.Size;
+                return SourceRect.Size.ToSizeWithDpi(bmp.Dpi);
+            }
+        }
+
+        public void Draw(DrawingContext context, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            if (Source is not IBitmap bmp)
+                return;
+            var topLeft = SourceRect.TopLeft.ToPointWithDpi(bmp.Dpi);
+            Source.Draw(context, sourceRect.Translate(new Vector(topLeft.X, topLeft.Y)), destRect, bitmapInterpolationMode);           
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Imaging/IBitmap.cs b/src/Avalonia.Base/Media/Imaging/IBitmap.cs
new file mode 100644
index 0000000000..bd04d5ce86
--- /dev/null
+++ b/src/Avalonia.Base/Media/Imaging/IBitmap.cs
@@ -0,0 +1,46 @@
+using System;
+using System.IO;
+using Avalonia.Metadata;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.Imaging
+{
+    /// <summary>
+    /// Represents a bitmap image.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IBitmap : IImage, IDisposable
+    {
+        /// <summary>
+        /// Gets the dots per inch (DPI) of the image.
+        /// </summary>
+        /// <remarks>
+        /// Note that Skia does not currently support reading the DPI of an image so this value
+        /// will always be 96dpi on Skia.
+        /// </remarks>
+        Vector Dpi { get; }
+
+        /// <summary>
+        /// Gets the size of the bitmap, in device pixels.
+        /// </summary>
+        PixelSize PixelSize { get; }
+
+        /// <summary>
+        /// Gets the platform-specific bitmap implementation.
+        /// </summary>
+        IRef<IBitmapImpl> PlatformImpl { get; }
+
+        /// <summary>
+        /// Saves the bitmap to a file.
+        /// </summary>
+        /// <param name="fileName">The filename.</param>
+        void Save(string fileName);
+
+        /// <summary>
+        /// Saves the bitmap to a stream in png format.
+        /// </summary>
+        /// <param name="stream">The stream.</param>
+        void Save(Stream stream);
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs b/src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs
rename to src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs
diff --git a/src/Avalonia.Base/Media/Imaging/WriteableBitmap.cs b/src/Avalonia.Base/Media/Imaging/WriteableBitmap.cs
new file mode 100644
index 0000000000..1f39b1344d
--- /dev/null
+++ b/src/Avalonia.Base/Media/Imaging/WriteableBitmap.cs
@@ -0,0 +1,97 @@
+using System;
+using System.IO;
+using Avalonia.Platform;
+
+namespace Avalonia.Media.Imaging
+{
+    /// <summary>
+    /// Holds a writeable bitmap image.
+    /// </summary>
+    public class WriteableBitmap : Bitmap
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WriteableBitmap"/> class.
+        /// </summary>
+        /// <param name="size">The size of the bitmap in device pixels.</param>
+        /// <param name="dpi">The DPI of the bitmap.</param>
+        /// <param name="format">The pixel format (optional).</param>
+        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
+        [Obsolete("Use overload taking an AlphaFormat.")]
+        public WriteableBitmap(PixelSize size, Vector dpi, PixelFormat? format = null)
+            : base(CreatePlatformImpl(size, dpi, format, null))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WriteableBitmap"/> class.
+        /// </summary>
+        /// <param name="size">The size of the bitmap in device pixels.</param>
+        /// <param name="dpi">The DPI of the bitmap.</param>
+        /// <param name="format">The pixel format (optional).</param>
+        /// <param name="alphaFormat">The alpha format (optional).</param>
+        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
+        public WriteableBitmap(PixelSize size, Vector dpi, PixelFormat format, AlphaFormat alphaFormat) 
+            : base(CreatePlatformImpl(size, dpi, format, alphaFormat))
+        {
+        }
+
+        private WriteableBitmap(IWriteableBitmapImpl impl) : base(impl)
+        {
+            
+        }
+
+        public ILockedFramebuffer Lock() => ((IWriteableBitmapImpl) PlatformImpl.Item).Lock();
+
+        public static WriteableBitmap Decode(Stream stream)
+        {
+            var ri = GetFactory();
+
+            return new WriteableBitmap(ri.LoadWriteableBitmap(stream));
+        }
+        
+        /// <summary>
+        /// Loads a WriteableBitmap from a stream and decodes at the desired width. Aspect ratio is maintained.
+        /// This is more efficient than loading and then resizing.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
+        /// <param name="width">The desired width of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
+        /// <returns>An instance of the <see cref="WriteableBitmap"/> class.</returns>
+        public new static WriteableBitmap DecodeToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            var ri = GetFactory();
+
+            return new WriteableBitmap(ri.LoadWriteableBitmapToWidth(stream, width, interpolationMode));
+        }
+
+        /// <summary>
+        /// Loads a Bitmap from a stream and decodes at the desired height. Aspect ratio is maintained.
+        /// This is more efficient than loading and then resizing.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
+        /// <param name="height">The desired height of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
+        /// <returns>An instance of the <see cref="WriteableBitmap"/> class.</returns>
+        public new static WriteableBitmap DecodeToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            var ri = GetFactory();
+
+            return new WriteableBitmap(ri.LoadWriteableBitmapToHeight(stream, height, interpolationMode));
+        }
+
+        private static IBitmapImpl CreatePlatformImpl(PixelSize size, in Vector dpi, PixelFormat? format, AlphaFormat? alphaFormat)
+        {
+            var ri = GetFactory();
+
+            PixelFormat finalFormat = format ?? ri.DefaultPixelFormat;
+            AlphaFormat finalAlphaFormat = alphaFormat ?? ri.DefaultAlphaFormat;
+
+            return ri.CreateWriteableBitmap(size, dpi, finalFormat, finalAlphaFormat);
+        }
+
+        private static IPlatformRenderInterface GetFactory()
+        {
+            return AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableConicGradientBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableConicGradientBrush.cs
new file mode 100644
index 0000000000..70232f0a63
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableConicGradientBrush.cs
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// A brush that draws with a sweep gradient.
+    /// </summary>
+    public class ImmutableConicGradientBrush : ImmutableGradientBrush, IConicGradientBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableConicGradientBrush"/> class.
+        /// </summary>
+        /// <param name="gradientStops">The gradient stops.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="spreadMethod">The spread method.</param>
+        /// <param name="center">The center point for the gradient.</param>
+        /// <param name="angle">The starting angle for the gradient.</param>
+        public ImmutableConicGradientBrush(
+            IReadOnlyList<ImmutableGradientStop> gradientStops,
+            double opacity = 1,
+            ImmutableTransform? transform = null,
+            RelativePoint? transformOrigin = null,
+            GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
+            RelativePoint? center = null,
+            double angle = 0)
+            : base(gradientStops, opacity, transform, transformOrigin, spreadMethod)
+        {
+            Center = center ?? RelativePoint.Center;
+            Angle = angle;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableConicGradientBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        public ImmutableConicGradientBrush(ConicGradientBrush source)
+            : base(source)
+        {
+            Center = source.Center;
+            Angle = source.Angle;
+        }
+
+        /// <inheritdoc/>
+        public RelativePoint Center { get; }
+
+        /// <inheritdoc/>
+        public double Angle { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableDashStyle.cs b/src/Avalonia.Base/Media/Immutable/ImmutableDashStyle.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Immutable/ImmutableDashStyle.cs
rename to src/Avalonia.Base/Media/Immutable/ImmutableDashStyle.cs
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableGradientBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableGradientBrush.cs
new file mode 100644
index 0000000000..1e95acbf22
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableGradientBrush.cs
@@ -0,0 +1,62 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// A brush that draws with a gradient.
+    /// </summary>
+    public abstract class ImmutableGradientBrush : IGradientBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableGradientBrush"/> class.
+        /// </summary>
+        /// <param name="gradientStops">The gradient stops.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="spreadMethod">The spread method.</param>
+        protected ImmutableGradientBrush(
+            IReadOnlyList<ImmutableGradientStop> gradientStops,
+            double opacity,
+            ImmutableTransform? transform,
+            RelativePoint? transformOrigin,
+            GradientSpreadMethod spreadMethod)
+        {
+            GradientStops = gradientStops;
+            Opacity = opacity;
+            Transform = transform;
+            TransformOrigin = transformOrigin.HasValue ? transformOrigin.Value : RelativePoint.TopLeft;
+            SpreadMethod = spreadMethod;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableGradientBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        protected ImmutableGradientBrush(GradientBrush source)
+            : this(source.GradientStops.ToImmutable(), source.Opacity, source.Transform?.ToImmutable(), 
+                  source.TransformOrigin, source.SpreadMethod)
+        {
+
+        }
+
+        /// <inheritdoc/>
+        public IReadOnlyList<IGradientStop> GradientStops { get; }
+
+        /// <inheritdoc/>
+        public double Opacity { get; }
+
+        /// <summary>
+        /// Gets the transform of the brush.
+        /// </summary>
+        public ITransform? Transform { get; }
+
+        /// <summary>
+        /// Gets the transform origin of the brush
+        /// </summary>
+        public RelativePoint TransformOrigin { get; }
+
+        /// <inheritdoc/>
+        public GradientSpreadMethod SpreadMethod { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientStop.cs b/src/Avalonia.Base/Media/Immutable/ImmutableGradientStop.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Immutable/ImmutableGradientStop.cs
rename to src/Avalonia.Base/Media/Immutable/ImmutableGradientStop.cs
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableImageBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableImageBrush.cs
new file mode 100644
index 0000000000..f9892bf60c
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableImageBrush.cs
@@ -0,0 +1,66 @@
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// Paints an area with an <see cref="IBitmap"/>.
+    /// </summary>
+    internal class ImmutableImageBrush : ImmutableTileBrush, IImageBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableImageBrush"/> class.
+        /// </summary>
+        /// <param name="source">The image to draw.</param>
+        /// <param name="alignmentX">The horizontal alignment of a tile in the destination.</param>
+        /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
+        /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
+        /// <param name="stretch">
+        /// How the source rectangle will be stretched to fill the destination rect.
+        /// </param>
+        /// <param name="tileMode">The tile mode.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        public ImmutableImageBrush(
+            IBitmap source,
+            AlignmentX alignmentX = AlignmentX.Center,
+            AlignmentY alignmentY = AlignmentY.Center,
+            RelativeRect? destinationRect = null,
+            double opacity = 1,
+            ImmutableTransform? transform = null,
+            RelativePoint transformOrigin = new RelativePoint(),
+            RelativeRect? sourceRect = null,
+            Stretch stretch = Stretch.Uniform,
+            TileMode tileMode = TileMode.None,
+            BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default)
+            : base(
+                  alignmentX,
+                  alignmentY,
+                  destinationRect ?? RelativeRect.Fill,
+                  opacity,
+                  transform,
+                  transformOrigin,
+                  sourceRect ?? RelativeRect.Fill,
+                  stretch,
+                  tileMode,
+                  bitmapInterpolationMode)
+        {
+            Source = source;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableImageBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        public ImmutableImageBrush(IImageBrush source)
+            : base(source)
+        {
+            Source = source.Source;
+        }
+
+        /// <inheritdoc/>
+        public IBitmap Source { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableLinearGradientBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableLinearGradientBrush.cs
new file mode 100644
index 0000000000..3c26b5c009
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableLinearGradientBrush.cs
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// A brush that draws with a linear gradient.
+    /// </summary>
+    public class ImmutableLinearGradientBrush : ImmutableGradientBrush, ILinearGradientBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableLinearGradientBrush"/> class.
+        /// </summary>
+        /// <param name="gradientStops">The gradient stops.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="spreadMethod">The spread method.</param>
+        /// <param name="startPoint">The start point for the gradient.</param>
+        /// <param name="endPoint">The end point for the gradient.</param>
+        public ImmutableLinearGradientBrush(
+            IReadOnlyList<ImmutableGradientStop> gradientStops,
+            double opacity = 1,
+            ImmutableTransform? transform = null,
+            RelativePoint? transformOrigin = null,
+            GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
+            RelativePoint? startPoint = null,
+            RelativePoint? endPoint = null)
+            : base(gradientStops, opacity, transform, transformOrigin, spreadMethod)
+        {
+            StartPoint = startPoint ?? RelativePoint.TopLeft;
+            EndPoint = endPoint ?? RelativePoint.BottomRight;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableLinearGradientBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        public ImmutableLinearGradientBrush(LinearGradientBrush source)
+            : base(source)
+        {
+            StartPoint = source.StartPoint;
+            EndPoint = source.EndPoint;
+        }
+
+        /// <inheritdoc/>
+        public RelativePoint StartPoint { get; }
+
+        /// <inheritdoc/>
+        public RelativePoint EndPoint { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutablePen.cs b/src/Avalonia.Base/Media/Immutable/ImmutablePen.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Immutable/ImmutablePen.cs
rename to src/Avalonia.Base/Media/Immutable/ImmutablePen.cs
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableRadialGradientBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableRadialGradientBrush.cs
new file mode 100644
index 0000000000..e08d2810f8
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableRadialGradientBrush.cs
@@ -0,0 +1,62 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// A brush that draws with a radial gradient.
+    /// </summary>
+    public class ImmutableRadialGradientBrush : ImmutableGradientBrush, IRadialGradientBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableRadialGradientBrush"/> class.
+        /// </summary>
+        /// <param name="gradientStops">The gradient stops.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="spreadMethod">The spread method.</param>
+        /// <param name="center">The start point for the gradient.</param>
+        /// <param name="gradientOrigin">
+        /// The location of the two-dimensional focal point that defines the beginning of the gradient.
+        /// </param>
+        /// <param name="radius">
+        /// The horizontal and vertical radius of the outermost circle of the radial gradient.
+        /// </param>
+        public ImmutableRadialGradientBrush(
+            IReadOnlyList<ImmutableGradientStop> gradientStops,
+            double opacity = 1,
+            ImmutableTransform? transform = null,
+            RelativePoint? transformOrigin = null,
+            GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
+            RelativePoint? center = null,
+            RelativePoint? gradientOrigin = null,
+            double radius = 0.5)
+            : base(gradientStops, opacity, transform, transformOrigin, spreadMethod)
+        {
+            Center = center ?? RelativePoint.Center;
+            GradientOrigin = gradientOrigin ?? RelativePoint.Center;
+            Radius = radius;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableRadialGradientBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        public ImmutableRadialGradientBrush(RadialGradientBrush source)
+            : base(source)
+        {
+            Center = source.Center;
+            GradientOrigin = source.GradientOrigin;
+            Radius = source.Radius;
+        }
+
+        /// <inheritdoc/>
+        public RelativePoint Center { get; }
+
+        /// <inheritdoc/>
+        public RelativePoint GradientOrigin { get; }
+
+        /// <inheritdoc/>
+        public double Radius { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableSolidColorBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableSolidColorBrush.cs
new file mode 100644
index 0000000000..6755dfd236
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableSolidColorBrush.cs
@@ -0,0 +1,100 @@
+using System;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// Fills an area with a solid color.
+    /// </summary>
+    public class ImmutableSolidColorBrush : ISolidColorBrush, IEquatable<ImmutableSolidColorBrush>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
+        /// </summary>
+        /// <param name="color">The color to use.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        public ImmutableSolidColorBrush(Color color, double opacity = 1, ImmutableTransform? transform = null)
+        {
+            Color = color;
+            Opacity = opacity;
+            Transform = null;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
+        /// </summary>
+        /// <param name="color">The color to use.</param>
+        public ImmutableSolidColorBrush(uint color)
+            : this(Color.FromUInt32(color))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        public ImmutableSolidColorBrush(ISolidColorBrush source)
+            : this(source.Color, source.Opacity, source.Transform?.ToImmutable())
+        {
+        }
+
+        /// <summary>
+        /// Gets the color of the brush.
+        /// </summary>
+        public Color Color { get; }
+
+        /// <summary>
+        /// Gets the opacity of the brush.
+        /// </summary>
+        public double Opacity { get; }
+
+        /// <summary>
+        /// Gets the transform of the brush.
+        /// </summary>
+        public ITransform? Transform { get; }
+
+        /// <summary>
+        /// Gets the transform origin of the brush
+        /// </summary>
+        public RelativePoint TransformOrigin { get; }
+
+        public bool Equals(ImmutableSolidColorBrush? other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return Color.Equals(other.Color) && Opacity.Equals(other.Opacity) && (Transform == null && other.Transform == null ? true : (Transform != null && Transform.Equals(other.Transform)));
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is ImmutableSolidColorBrush other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (Color.GetHashCode() * 397) ^ Opacity.GetHashCode() ^ (Transform is null ? 0 : Transform.GetHashCode());
+            }
+        }
+
+        public static bool operator ==(ImmutableSolidColorBrush left, ImmutableSolidColorBrush right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(ImmutableSolidColorBrush left, ImmutableSolidColorBrush right)
+        {
+            return !Equals(left, right);
+        }
+
+        /// <summary>
+        /// Returns a string representation of the brush.
+        /// </summary>
+        /// <returns>A string representation of the brush.</returns>
+        public override string ToString()
+        {
+            return Color.ToString();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableTextDecoration.cs b/src/Avalonia.Base/Media/Immutable/ImmutableTextDecoration.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Immutable/ImmutableTextDecoration.cs
rename to src/Avalonia.Base/Media/Immutable/ImmutableTextDecoration.cs
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableTileBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableTileBrush.cs
new file mode 100644
index 0000000000..6df27872fc
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableTileBrush.cs
@@ -0,0 +1,102 @@
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// A brush which displays a repeating image.
+    /// </summary>
+    public abstract class ImmutableTileBrush : ITileBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImageBrush"/> class.
+        /// </summary>
+        /// <param name="alignmentX">The horizontal alignment of a tile in the destination.</param>
+        /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
+        /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
+        /// <param name="stretch">
+        /// How the source rectangle will be stretched to fill the destination rect.
+        /// </param>
+        /// <param name="tileMode">The tile mode.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        protected ImmutableTileBrush(
+            AlignmentX alignmentX,
+            AlignmentY alignmentY,
+            RelativeRect destinationRect,
+            double opacity,
+            ImmutableTransform? transform,
+            RelativePoint transformOrigin,
+            RelativeRect sourceRect,
+            Stretch stretch,
+            TileMode tileMode,
+            BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            AlignmentX = alignmentX;
+            AlignmentY = alignmentY;
+            DestinationRect = destinationRect;
+            Opacity = opacity;
+            Transform = transform;
+            TransformOrigin = transformOrigin;
+            SourceRect = sourceRect;
+            Stretch = stretch;
+            TileMode = tileMode;
+            BitmapInterpolationMode = bitmapInterpolationMode;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImageBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        protected ImmutableTileBrush(ITileBrush source)
+            : this(
+                  source.AlignmentX,
+                  source.AlignmentY,
+                  source.DestinationRect,
+                  source.Opacity,
+                  source.Transform?.ToImmutable(),
+                  source.TransformOrigin,
+                  source.SourceRect,
+                  source.Stretch,
+                  source.TileMode,
+                  source.BitmapInterpolationMode)
+        {
+        }
+
+        /// <inheritdoc/>
+        public AlignmentX AlignmentX { get; }
+
+        /// <inheritdoc/>
+        public AlignmentY AlignmentY { get; }
+
+        /// <inheritdoc/>
+        public RelativeRect DestinationRect { get; }
+
+        /// <inheritdoc/>
+        public double Opacity { get; }
+
+        /// <summary>
+        /// Gets the transform of the brush.
+        /// </summary>
+        public ITransform? Transform { get; }
+
+        /// <summary>
+        /// Gets the transform origin of the brush
+        /// </summary>
+        public RelativePoint TransformOrigin { get; }
+
+        /// <inheritdoc/>
+        public RelativeRect SourceRect { get; }
+
+        /// <inheritdoc/>
+        public Stretch Stretch { get; }
+
+        /// <inheritdoc/>
+        public TileMode TileMode { get; }
+
+        /// <inheritdoc/>
+        public BitmapInterpolationMode BitmapInterpolationMode { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs b/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs
new file mode 100644
index 0000000000..d5ff2b8317
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs
@@ -0,0 +1,21 @@
+using Avalonia.VisualTree;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// Represents a transform on an <see cref="IVisual"/>.
+    /// </summary>
+    public class ImmutableTransform : ITransform
+    {
+        public Matrix Value { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableTransform"/> class.
+        /// </summary>
+        /// <param name="matrix">The transform matrix.</param>
+        public ImmutableTransform(Matrix matrix)
+        {
+            Value = matrix;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs
new file mode 100644
index 0000000000..b436dcdb5e
--- /dev/null
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs
@@ -0,0 +1,67 @@
+using Avalonia.Media.Imaging;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// Paints an area with an <see cref="IVisual"/>.
+    /// </summary>
+    internal class ImmutableVisualBrush : ImmutableTileBrush, IVisualBrush
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableImageBrush"/> class.
+        /// </summary>
+        /// <param name="visual">The visual to draw.</param>
+        /// <param name="alignmentX">The horizontal alignment of a tile in the destination.</param>
+        /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
+        /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
+        /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
+        /// <param name="transformOrigin">The transform origin of the brush</param>
+        /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
+        /// <param name="stretch">
+        /// How the source rectangle will be stretched to fill the destination rect.
+        /// </param>
+        /// <param name="tileMode">The tile mode.</param>
+        /// <param name="bitmapInterpolationMode">Controls the quality of interpolation.</param>
+        public ImmutableVisualBrush(
+            IVisual visual,
+            AlignmentX alignmentX = AlignmentX.Center,
+            AlignmentY alignmentY = AlignmentY.Center,
+            RelativeRect? destinationRect = null,
+            double opacity = 1,
+            ImmutableTransform? transform = null,
+            RelativePoint transformOrigin = new RelativePoint(),
+            RelativeRect? sourceRect = null,
+            Stretch stretch = Stretch.Uniform,
+            TileMode tileMode = TileMode.None,
+            Imaging.BitmapInterpolationMode bitmapInterpolationMode = Imaging.BitmapInterpolationMode.Default)
+            : base(
+                  alignmentX,
+                  alignmentY,
+                  destinationRect ?? RelativeRect.Fill,
+                  opacity,
+                  transform,
+                  transformOrigin,
+                  sourceRect ?? RelativeRect.Fill,
+                  stretch,
+                  tileMode,
+                  bitmapInterpolationMode)
+        {
+            Visual = visual;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmutableVisualBrush"/> class.
+        /// </summary>
+        /// <param name="source">The brush from which this brush's properties should be copied.</param>
+        public ImmutableVisualBrush(IVisualBrush source)
+            : base(source)
+        {
+            Visual = source.Visual;
+        }
+
+        /// <inheritdoc/>
+        public IVisual Visual { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/ImmutableExperimentalAcrylicMaterial.cs b/src/Avalonia.Base/Media/ImmutableExperimentalAcrylicMaterial.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/ImmutableExperimentalAcrylicMaterial.cs
rename to src/Avalonia.Base/Media/ImmutableExperimentalAcrylicMaterial.cs
diff --git a/src/Avalonia.Visuals/Media/KnownColors.cs b/src/Avalonia.Base/Media/KnownColors.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/KnownColors.cs
rename to src/Avalonia.Base/Media/KnownColors.cs
diff --git a/src/Avalonia.Visuals/Media/LineGeometry.cs b/src/Avalonia.Base/Media/LineGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/LineGeometry.cs
rename to src/Avalonia.Base/Media/LineGeometry.cs
diff --git a/src/Avalonia.Visuals/Media/LineSegment.cs b/src/Avalonia.Base/Media/LineSegment.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/LineSegment.cs
rename to src/Avalonia.Base/Media/LineSegment.cs
diff --git a/src/Avalonia.Visuals/Media/LinearGradientBrush.cs b/src/Avalonia.Base/Media/LinearGradientBrush.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/LinearGradientBrush.cs
rename to src/Avalonia.Base/Media/LinearGradientBrush.cs
diff --git a/src/Avalonia.Visuals/Media/MaterialExtensions.cs b/src/Avalonia.Base/Media/MaterialExtensions.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/MaterialExtensions.cs
rename to src/Avalonia.Base/Media/MaterialExtensions.cs
diff --git a/src/Avalonia.Visuals/Media/MatrixTransform.cs b/src/Avalonia.Base/Media/MatrixTransform.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/MatrixTransform.cs
rename to src/Avalonia.Base/Media/MatrixTransform.cs
diff --git a/src/Avalonia.Visuals/Media/MediaExtensions.cs b/src/Avalonia.Base/Media/MediaExtensions.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/MediaExtensions.cs
rename to src/Avalonia.Base/Media/MediaExtensions.cs
diff --git a/src/Avalonia.Visuals/Media/PathFigure.cs b/src/Avalonia.Base/Media/PathFigure.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PathFigure.cs
rename to src/Avalonia.Base/Media/PathFigure.cs
diff --git a/src/Avalonia.Visuals/Media/PathGeometry.cs b/src/Avalonia.Base/Media/PathGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PathGeometry.cs
rename to src/Avalonia.Base/Media/PathGeometry.cs
diff --git a/src/Avalonia.Visuals/Media/PathGeometryCollections.cs b/src/Avalonia.Base/Media/PathGeometryCollections.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PathGeometryCollections.cs
rename to src/Avalonia.Base/Media/PathGeometryCollections.cs
diff --git a/src/Avalonia.Visuals/Media/PathMarkupParser.cs b/src/Avalonia.Base/Media/PathMarkupParser.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PathMarkupParser.cs
rename to src/Avalonia.Base/Media/PathMarkupParser.cs
diff --git a/src/Avalonia.Visuals/Media/PathSegment.cs b/src/Avalonia.Base/Media/PathSegment.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PathSegment.cs
rename to src/Avalonia.Base/Media/PathSegment.cs
diff --git a/src/Avalonia.Base/Media/Pen.cs b/src/Avalonia.Base/Media/Pen.cs
new file mode 100644
index 0000000000..66632a973b
--- /dev/null
+++ b/src/Avalonia.Base/Media/Pen.cs
@@ -0,0 +1,239 @@
+using System;
+using Avalonia.Media.Immutable;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes how a stroke is drawn.
+    /// </summary>
+    public sealed class Pen : AvaloniaObject, IPen
+    {
+        /// <summary>
+        /// Defines the <see cref="Brush"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> BrushProperty =
+            AvaloniaProperty.Register<Pen, IBrush?>(nameof(Brush));
+
+        /// <summary>
+        /// Defines the <see cref="Thickness"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> ThicknessProperty =
+            AvaloniaProperty.Register<Pen, double>(nameof(Thickness), 1.0);
+
+        /// <summary>
+        /// Defines the <see cref="DashStyle"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDashStyle?> DashStyleProperty =
+            AvaloniaProperty.Register<Pen, IDashStyle?>(nameof(DashStyle));
+
+        /// <summary>
+        /// Defines the <see cref="LineCap"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PenLineCap> LineCapProperty =
+            AvaloniaProperty.Register<Pen, PenLineCap>(nameof(LineCap));
+
+        /// <summary>
+        /// Defines the <see cref="LineJoin"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PenLineJoin> LineJoinProperty =
+            AvaloniaProperty.Register<Pen, PenLineJoin>(nameof(LineJoin));
+
+        /// <summary>
+        /// Defines the <see cref="MiterLimit"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MiterLimitProperty =
+            AvaloniaProperty.Register<Pen, double>(nameof(MiterLimit), 10.0);
+
+        private EventHandler? _invalidated;
+        private IAffectsRender? _subscribedToBrush;
+        private IAffectsRender? _subscribedToDashes;
+        private TargetWeakEventSubscriber<Pen, EventArgs>? _weakSubscriber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Pen"/> class.
+        /// </summary>
+        public Pen()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Pen"/> class.
+        /// </summary>
+        /// <param name="color">The stroke color.</param>
+        /// <param name="thickness">The stroke thickness.</param>
+        /// <param name="dashStyle">The dash style.</param>
+        /// <param name="lineCap">Specifies the type of graphic shape to use on both ends of a line.</param>
+        /// <param name="lineJoin">The line join.</param>
+        /// <param name="miterLimit">The miter limit.</param>
+        public Pen(
+            uint color,
+            double thickness = 1.0,
+            IDashStyle? dashStyle = null,
+            PenLineCap lineCap = PenLineCap.Flat,
+            PenLineJoin lineJoin = PenLineJoin.Miter,
+            double miterLimit = 10.0) : this(new SolidColorBrush(color), thickness, dashStyle, lineCap, lineJoin, miterLimit)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Pen"/> class.
+        /// </summary>
+        /// <param name="brush">The brush used to draw.</param>
+        /// <param name="thickness">The stroke thickness.</param>
+        /// <param name="dashStyle">The dash style.</param>
+        /// <param name="lineCap">The line cap.</param>
+        /// <param name="lineJoin">The line join.</param>
+        /// <param name="miterLimit">The miter limit.</param>
+        public Pen(
+            IBrush? brush,
+            double thickness = 1.0,
+            IDashStyle? dashStyle = null,
+            PenLineCap lineCap = PenLineCap.Flat,
+            PenLineJoin lineJoin = PenLineJoin.Miter,
+            double miterLimit = 10.0)
+        {
+            Brush = brush;
+            Thickness = thickness;
+            LineCap = lineCap;
+            LineJoin = lineJoin;
+            MiterLimit = miterLimit;
+            DashStyle = dashStyle;
+        }
+
+        /// <summary>
+        /// Gets or sets the brush used to draw the stroke.
+        /// </summary>
+        public IBrush? Brush
+        {
+            get => GetValue(BrushProperty);
+            set => SetValue(BrushProperty, value);
+        }
+
+        private static readonly WeakEvent<IAffectsRender, EventArgs> InvalidatedWeakEvent =
+            WeakEvent.Register<IAffectsRender>(
+                (s, h) => s.Invalidated += h,
+                (s, h) => s.Invalidated -= h);
+
+        /// <summary>
+        /// Gets or sets the stroke thickness.
+        /// </summary>
+        public double Thickness
+        {
+            get => GetValue(ThicknessProperty);
+            set => SetValue(ThicknessProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the style of dashed lines drawn with a <see cref="Pen"/> object.
+        /// </summary>
+        public IDashStyle? DashStyle
+        {
+            get => GetValue(DashStyleProperty);
+            set => SetValue(DashStyleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the type of shape to use on both ends of a line.
+        /// </summary>
+        public PenLineCap LineCap
+        {
+            get => GetValue(LineCapProperty);
+            set => SetValue(LineCapProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the join style for the ends of two consecutive lines drawn with this
+        /// <see cref="Pen"/>.
+        /// </summary>
+        public PenLineJoin LineJoin
+        {
+            get => GetValue(LineJoinProperty);
+            set => SetValue(LineJoinProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the limit of the thickness of the join on a mitered corner.
+        /// </summary>
+        public double MiterLimit
+        {
+            get => GetValue(MiterLimitProperty);
+            set => SetValue(MiterLimitProperty, value);
+        }
+
+        /// <summary>
+        /// Raised when the pen changes.
+        /// </summary>
+        public event EventHandler? Invalidated
+        {
+            add
+            {
+                _invalidated += value;
+                UpdateSubscriptions();
+            }
+            remove
+            {
+                _invalidated -= value; 
+                UpdateSubscriptions();
+            }
+        }
+
+        /// <summary>
+        /// Creates an immutable clone of the brush.
+        /// </summary>
+        /// <returns>The immutable clone.</returns>
+        public ImmutablePen ToImmutable()
+        {
+            return new ImmutablePen(
+                Brush?.ToImmutable(),
+                Thickness,
+                DashStyle?.ToImmutable(),
+                LineCap,
+                LineJoin,
+                MiterLimit);
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            _invalidated?.Invoke(this, EventArgs.Empty);
+            if(change.Property == BrushProperty)
+                UpdateSubscription(ref _subscribedToBrush, Brush);
+            if(change.Property == DashStyleProperty)
+                UpdateSubscription(ref _subscribedToDashes, DashStyle);
+            base.OnPropertyChanged(change);
+        }
+
+        
+        void UpdateSubscription(ref IAffectsRender? field, object? value)
+        {
+            if ((_invalidated == null || field != value) && field != null)
+            {
+                if (_weakSubscriber != null)
+                    InvalidatedWeakEvent.Unsubscribe(field, _weakSubscriber);
+                field = null;
+            }
+
+            if (_invalidated != null && field != value && value is IAffectsRender affectsRender)
+            {
+                if (_weakSubscriber == null)
+                {
+                    _weakSubscriber = new TargetWeakEventSubscriber<Pen, EventArgs>(
+                        this, static (target, _, ev, _) =>
+                        {
+                            if (ev == InvalidatedWeakEvent)
+                                target._invalidated?.Invoke(target, EventArgs.Empty);
+                        });
+                }
+
+                InvalidatedWeakEvent.Subscribe(affectsRender, _weakSubscriber);
+                field = affectsRender;
+            }
+        }
+
+        void UpdateSubscriptions()
+        {
+            UpdateSubscription(ref _subscribedToBrush, Brush);
+            UpdateSubscription(ref _subscribedToDashes, DashStyle);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/PenLineCap.cs b/src/Avalonia.Base/Media/PenLineCap.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PenLineCap.cs
rename to src/Avalonia.Base/Media/PenLineCap.cs
diff --git a/src/Avalonia.Visuals/Media/PenLineJoin.cs b/src/Avalonia.Base/Media/PenLineJoin.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PenLineJoin.cs
rename to src/Avalonia.Base/Media/PenLineJoin.cs
diff --git a/src/Avalonia.Base/Media/PlatformGeometry.cs b/src/Avalonia.Base/Media/PlatformGeometry.cs
new file mode 100644
index 0000000000..f25a14540f
--- /dev/null
+++ b/src/Avalonia.Base/Media/PlatformGeometry.cs
@@ -0,0 +1,24 @@
+using Avalonia.Platform;
+
+namespace Avalonia.Media
+{
+    internal class PlatformGeometry : Geometry
+    {
+        private readonly IGeometryImpl _geometryImpl;
+
+        public PlatformGeometry(IGeometryImpl geometryImpl)
+        {
+            _geometryImpl = geometryImpl;
+        }
+
+        public override Geometry Clone()
+        {
+            return new PlatformGeometry(_geometryImpl);
+        }
+
+        protected override IGeometryImpl? CreateDefiningGeometry()
+        {
+           return _geometryImpl;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/PolyLineSegment.cs b/src/Avalonia.Base/Media/PolyLineSegment.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PolyLineSegment.cs
rename to src/Avalonia.Base/Media/PolyLineSegment.cs
diff --git a/src/Avalonia.Visuals/Media/PolylineGeometry.cs b/src/Avalonia.Base/Media/PolylineGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PolylineGeometry.cs
rename to src/Avalonia.Base/Media/PolylineGeometry.cs
diff --git a/src/Avalonia.Visuals/Media/PreciseEllipticArcHelper.cs b/src/Avalonia.Base/Media/PreciseEllipticArcHelper.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PreciseEllipticArcHelper.cs
rename to src/Avalonia.Base/Media/PreciseEllipticArcHelper.cs
diff --git a/src/Avalonia.Visuals/Media/QuadraticBezierSegment .cs b/src/Avalonia.Base/Media/QuadraticBezierSegment .cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/QuadraticBezierSegment .cs
rename to src/Avalonia.Base/Media/QuadraticBezierSegment .cs
diff --git a/src/Avalonia.Visuals/Media/RadialGradientBrush.cs b/src/Avalonia.Base/Media/RadialGradientBrush.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/RadialGradientBrush.cs
rename to src/Avalonia.Base/Media/RadialGradientBrush.cs
diff --git a/src/Avalonia.Visuals/Media/RectangleGeometry.cs b/src/Avalonia.Base/Media/RectangleGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/RectangleGeometry.cs
rename to src/Avalonia.Base/Media/RectangleGeometry.cs
diff --git a/src/Avalonia.Base/Media/RenderOptions.cs b/src/Avalonia.Base/Media/RenderOptions.cs
new file mode 100644
index 0000000000..5863d0ac58
--- /dev/null
+++ b/src/Avalonia.Base/Media/RenderOptions.cs
@@ -0,0 +1,36 @@
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media
+{ 
+    public class RenderOptions
+    {
+        /// <summary>
+        /// Defines the <see cref="BitmapInterpolationMode"/> property.
+        /// </summary>
+        public static readonly StyledProperty<BitmapInterpolationMode> BitmapInterpolationModeProperty =
+            AvaloniaProperty.RegisterAttached<RenderOptions, AvaloniaObject, BitmapInterpolationMode>(
+                "BitmapInterpolationMode", 
+                BitmapInterpolationMode.MediumQuality,
+                inherits: true);
+
+        /// <summary>
+        /// Gets the value of the BitmapInterpolationMode attached property for a control.
+        /// </summary>
+        /// <param name="element">The control.</param>
+        /// <returns>The control's left coordinate.</returns>
+        public static BitmapInterpolationMode GetBitmapInterpolationMode(AvaloniaObject element)
+        {
+            return element.GetValue(BitmapInterpolationModeProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the BitmapInterpolationMode attached property for a control.
+        /// </summary>
+        /// <param name="element">The control.</param>
+        /// <param name="value">The left value.</param>
+        public static void SetBitmapInterpolationMode(AvaloniaObject element, BitmapInterpolationMode value)
+        {
+            element.SetValue(BitmapInterpolationModeProperty, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/RotateTransform.cs b/src/Avalonia.Base/Media/RotateTransform.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/RotateTransform.cs
rename to src/Avalonia.Base/Media/RotateTransform.cs
diff --git a/src/Avalonia.Visuals/Media/ScaleTransform.cs b/src/Avalonia.Base/Media/ScaleTransform.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/ScaleTransform.cs
rename to src/Avalonia.Base/Media/ScaleTransform.cs
diff --git a/src/Avalonia.Visuals/Media/SkewTransform.cs b/src/Avalonia.Base/Media/SkewTransform.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/SkewTransform.cs
rename to src/Avalonia.Base/Media/SkewTransform.cs
diff --git a/src/Avalonia.Visuals/Media/SolidColorBrush.cs b/src/Avalonia.Base/Media/SolidColorBrush.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/SolidColorBrush.cs
rename to src/Avalonia.Base/Media/SolidColorBrush.cs
diff --git a/src/Avalonia.Visuals/Media/StreamGeometry.cs b/src/Avalonia.Base/Media/StreamGeometry.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/StreamGeometry.cs
rename to src/Avalonia.Base/Media/StreamGeometry.cs
diff --git a/src/Avalonia.Base/Media/StreamGeometryContext.cs b/src/Avalonia.Base/Media/StreamGeometryContext.cs
new file mode 100644
index 0000000000..ed6065eae4
--- /dev/null
+++ b/src/Avalonia.Base/Media/StreamGeometryContext.cs
@@ -0,0 +1,133 @@
+using Avalonia.Platform;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes a geometry using drawing commands.
+    /// </summary>
+    /// <remarks>
+    /// This class is used to define the geometry of a <see cref="StreamGeometry"/>. An instance
+    /// of <see cref="StreamGeometryContext"/> is obtained by calling
+    /// <see cref="StreamGeometry.Open"/>.
+    /// </remarks>
+    /// TODO: This class is just a wrapper around IStreamGeometryContextImpl: is it needed?
+    public class StreamGeometryContext : IGeometryContext
+    {
+        private readonly IStreamGeometryContextImpl _impl;
+
+        private Point _currentPoint;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StreamGeometryContext"/> class.
+        /// </summary>
+        /// <param name="impl">The platform-specific implementation.</param>
+        public StreamGeometryContext(IStreamGeometryContextImpl impl)
+        {
+            _impl = impl;
+        }
+
+        /// <summary>
+        /// Sets path's winding rule (default is EvenOdd). You should call this method before any calls to BeginFigure. If you wonder why, ask Direct2D guys about their design decisions.
+        /// </summary>
+        /// <param name="fillRule"></param>
+
+        public void SetFillRule(FillRule fillRule)
+        {
+            _impl.SetFillRule(fillRule);
+        }
+
+        /// <summary>
+        /// Draws an arc to the specified point.
+        /// </summary>
+        /// <param name="point">The destination point.</param>
+        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
+        /// <param name="rotationAngle">The rotation angle (in radians) of the oval that specifies the curve.</param>
+        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
+        /// <param name="sweepDirection">
+        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
+        /// </param>
+        public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
+        {
+            _impl.ArcTo(point, size, rotationAngle, isLargeArc, sweepDirection);
+            _currentPoint = point;
+        }
+
+
+        /// <summary>
+        /// Draws an arc to the specified point using polylines, quadratic or cubic Bezier curves
+        /// Significantly more precise when drawing elliptic arcs with extreme width:height ratios.        
+        /// </summary>         
+        /// <param name="point">The destination point.</param>
+        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
+        /// <param name="rotationAngle">The rotation angle (in radians) of the oval that specifies the curve.</param>
+        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
+        /// <param name="sweepDirection">
+        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
+        /// </param>
+        public void PreciseArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
+        {
+            PreciseEllipticArcHelper.ArcTo(this, _currentPoint, point, size, rotationAngle, isLargeArc, sweepDirection);
+        }
+
+        /// <summary>
+        /// Begins a new figure.
+        /// </summary>
+        /// <param name="startPoint">The starting point for the figure.</param>
+        /// <param name="isFilled">Whether the figure is filled.</param>
+        public void BeginFigure(Point startPoint, bool isFilled)
+        {
+            _impl.BeginFigure(startPoint, isFilled);
+            _currentPoint = startPoint;
+        }
+
+        /// <summary>
+        /// Draws a Bezier curve to the specified point.
+        /// </summary>
+        /// <param name="point1">The first control point used to specify the shape of the curve.</param>
+        /// <param name="point2">The second control point used to specify the shape of the curve.</param>
+        /// <param name="point3">The destination point for the end of the curve.</param>
+        public void CubicBezierTo(Point point1, Point point2, Point point3)
+        {
+            _impl.CubicBezierTo(point1, point2, point3);
+            _currentPoint = point3;
+        }
+
+        /// <summary>
+        /// Draws a quadratic Bezier curve to the specified point
+        /// </summary>
+        /// <param name="control">The control point used to specify the shape of the curve.</param>
+        /// <param name="endPoint">The destination point for the end of the curve.</param>
+        public void QuadraticBezierTo(Point control, Point endPoint)
+        {
+            _impl.QuadraticBezierTo(control, endPoint);
+            _currentPoint = endPoint;
+        }
+
+        /// <summary>
+        /// Draws a line to the specified point.
+        /// </summary>
+        /// <param name="point">The destination point.</param>
+        public void LineTo(Point point)
+        {
+            _impl.LineTo(point);
+            _currentPoint = point;
+        }
+
+        /// <summary>
+        /// Ends the figure started by <see cref="BeginFigure(Point, bool)"/>.
+        /// </summary>
+        /// <param name="isClosed">Whether the figure is closed.</param>
+        public void EndFigure(bool isClosed)
+        {
+            _impl.EndFigure(isClosed);
+        }
+
+        /// <summary>
+        /// Finishes the drawing session.
+        /// </summary>
+        public void Dispose()
+        {
+            _impl.Dispose();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Stretch.cs b/src/Avalonia.Base/Media/Stretch.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Stretch.cs
rename to src/Avalonia.Base/Media/Stretch.cs
diff --git a/src/Avalonia.Visuals/Media/StretchDirection.cs b/src/Avalonia.Base/Media/StretchDirection.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/StretchDirection.cs
rename to src/Avalonia.Base/Media/StretchDirection.cs
diff --git a/src/Avalonia.Visuals/Media/SweepDirection.cs b/src/Avalonia.Base/Media/SweepDirection.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/SweepDirection.cs
rename to src/Avalonia.Base/Media/SweepDirection.cs
diff --git a/src/Avalonia.Visuals/Media/TextAlignment.cs b/src/Avalonia.Base/Media/TextAlignment.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextAlignment.cs
rename to src/Avalonia.Base/Media/TextAlignment.cs
diff --git a/src/Avalonia.Base/Media/TextCollapsingCreateInfo.cs b/src/Avalonia.Base/Media/TextCollapsingCreateInfo.cs
new file mode 100644
index 0000000000..78f15b724a
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextCollapsingCreateInfo.cs
@@ -0,0 +1,16 @@
+using Avalonia.Media.TextFormatting;
+
+namespace Avalonia.Media
+{
+    public readonly struct TextCollapsingCreateInfo
+    {
+        public readonly double Width;
+        public readonly TextRunProperties TextRunProperties;
+
+        public TextCollapsingCreateInfo(double width, TextRunProperties textRunProperties)
+        {
+            Width = width;
+            TextRunProperties = textRunProperties;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextDecoration.cs b/src/Avalonia.Base/Media/TextDecoration.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextDecoration.cs
rename to src/Avalonia.Base/Media/TextDecoration.cs
diff --git a/src/Avalonia.Base/Media/TextDecorationCollection.cs b/src/Avalonia.Base/Media/TextDecorationCollection.cs
new file mode 100644
index 0000000000..2d7bd17b20
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextDecorationCollection.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Collections;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// A collection that holds <see cref="TextDecoration"/> objects.
+    /// </summary>
+    public class TextDecorationCollection : AvaloniaList<TextDecoration>
+    {
+        public TextDecorationCollection()
+        {
+            
+        }
+
+        public TextDecorationCollection(IEnumerable<TextDecoration> textDecorations) : base(textDecorations)
+        {
+            
+        }
+        
+        /// <summary>
+        /// Parses a <see cref="TextDecorationCollection"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The <see cref="TextDecorationCollection"/>.</returns>
+        public static TextDecorationCollection Parse(string s)
+        {
+            var locations = new List<TextDecorationLocation>();
+
+            using (var tokenizer = new StringTokenizer(s, ',', "Invalid text decoration."))
+            {
+                while (tokenizer.TryReadString(out var name))
+                {
+                    var location = GetTextDecorationLocation(name);
+
+                    if (locations.Contains(location))
+                    {
+                        throw new ArgumentException("Text decoration already specified.", nameof(s));
+                    }
+
+                    locations.Add(location);
+                }
+            }
+
+            var textDecorations = new TextDecorationCollection();
+
+            foreach (var textDecorationLocation in locations)
+            {
+                textDecorations.Add(new TextDecoration { Location = textDecorationLocation });
+            }
+
+            return textDecorations;
+        }
+
+        /// <summary>
+        /// Parses a <see cref="TextDecorationLocation"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The <see cref="TextDecorationLocation"/>.</returns>
+        private static TextDecorationLocation GetTextDecorationLocation(string s)
+        {
+            if (Enum.TryParse<TextDecorationLocation>(s,true, out var location))
+            {
+                return location;
+            }
+
+            throw new ArgumentException("Could not parse text decoration.", nameof(s));
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextDecorationLocation.cs b/src/Avalonia.Base/Media/TextDecorationLocation.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextDecorationLocation.cs
rename to src/Avalonia.Base/Media/TextDecorationLocation.cs
diff --git a/src/Avalonia.Visuals/Media/TextDecorationUnit.cs b/src/Avalonia.Base/Media/TextDecorationUnit.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextDecorationUnit.cs
rename to src/Avalonia.Base/Media/TextDecorationUnit.cs
diff --git a/src/Avalonia.Visuals/Media/TextDecorations.cs b/src/Avalonia.Base/Media/TextDecorations.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextDecorations.cs
rename to src/Avalonia.Base/Media/TextDecorations.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/DrawableTextRun.cs b/src/Avalonia.Base/Media/TextFormatting/DrawableTextRun.cs
new file mode 100644
index 0000000000..e63ed421ba
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/DrawableTextRun.cs
@@ -0,0 +1,25 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A text run that supports drawing content.
+    /// </summary>
+    public abstract class DrawableTextRun : TextRun
+    {
+        /// <summary>
+        /// Gets the size.
+        /// </summary>
+        public abstract Size Size { get; }
+        
+        /// <summary>
+        /// Run baseline in ratio relative to run height
+        /// </summary>
+        public abstract double Baseline { get; }
+
+        /// <summary>
+        /// Draws the <see cref="DrawableTextRun"/> at the given origin.
+        /// </summary>
+        /// <param name="drawingContext">The drawing context.</param>
+        /// <param name="origin">The origin.</param>
+        public abstract void Draw(DrawingContext drawingContext, Point origin);
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/FontMetrics.cs b/src/Avalonia.Base/Media/TextFormatting/FontMetrics.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/FontMetrics.cs
rename to src/Avalonia.Base/Media/TextFormatting/FontMetrics.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs b/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs
new file mode 100644
index 0000000000..97df87d3d9
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    internal readonly struct FormattedTextSource : ITextSource
+    {
+        private readonly ReadOnlySlice<char> _text;
+        private readonly TextRunProperties _defaultProperties;
+        private readonly IReadOnlyList<ValueSpan<TextRunProperties>>? _textModifier;
+
+        public FormattedTextSource(ReadOnlySlice<char> text, TextRunProperties defaultProperties,
+            IReadOnlyList<ValueSpan<TextRunProperties>>? textModifier)
+        {
+            _text = text;
+            _defaultProperties = defaultProperties;
+            _textModifier = textModifier;
+        }
+
+        public TextRun? GetTextRun(int textSourceIndex)
+        {
+            if (textSourceIndex > _text.Length)
+            {
+                return null;
+            }
+
+            var runText = _text.Skip(textSourceIndex);
+
+            if (runText.IsEmpty)
+            {
+                return null;
+            }
+
+            var textStyleRun = CreateTextStyleRun(runText, textSourceIndex, _defaultProperties, _textModifier);
+
+            return new TextCharacters(runText.Take(textStyleRun.Length), textStyleRun.Value);
+        }
+
+        /// <summary>
+        /// Creates a span of text run properties that has modifier applied.
+        /// </summary>
+        /// <param name="text">The text to create the properties for.</param>
+        /// <param name="firstTextSourceIndex">The first text source index.</param>
+        /// <param name="defaultProperties">The default text properties.</param>
+        /// <param name="textModifier">The text properties modifier.</param>
+        /// <returns>
+        /// The created text style run.
+        /// </returns>
+        private static ValueSpan<TextRunProperties> CreateTextStyleRun(ReadOnlySlice<char> text, int firstTextSourceIndex,
+            TextRunProperties defaultProperties, IReadOnlyList<ValueSpan<TextRunProperties>>? textModifier)
+        {
+            if (textModifier == null || textModifier.Count == 0)
+            {
+                return new ValueSpan<TextRunProperties>(firstTextSourceIndex, text.Length, defaultProperties);
+            }
+
+            var currentProperties = defaultProperties;
+
+            var hasOverride = false;
+
+            var i = 0;
+
+            var length = 0;
+
+            for (; i < textModifier.Count; i++)
+            {
+                var propertiesOverride = textModifier[i];
+
+                var textRange = new TextRange(propertiesOverride.Start, propertiesOverride.Length);
+
+                if (textRange.Start + textRange.Length <= firstTextSourceIndex)
+                {
+                    continue;
+                }
+
+                if (textRange.Start > firstTextSourceIndex + text.Length)
+                {
+                    length = text.Length;
+                    break;
+                }
+
+                if (textRange.Start > firstTextSourceIndex)
+                {
+                    if (propertiesOverride.Value != currentProperties)
+                    {
+                        length = Math.Min(Math.Abs(textRange.Start - firstTextSourceIndex), text.Length);
+
+                        break;
+                    }
+                }
+
+                length = Math.Max(0, textRange.Start + textRange.Length - firstTextSourceIndex);
+
+                if (hasOverride)
+                {
+                    continue;
+                }
+
+                hasOverride = true;
+
+                currentProperties = propertiesOverride.Value;
+            }
+
+            if (length < text.Length && i == textModifier.Count)
+            {
+                if (currentProperties == defaultProperties)
+                {
+                    length = text.Length;
+                }
+            }
+
+            if (length == 0 && currentProperties != defaultProperties)
+            {
+                currentProperties = defaultProperties;
+                length = text.Length;
+            }
+
+            return new ValueSpan<TextRunProperties>(firstTextSourceIndex, length, currentProperties);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/GenericTextParagraphProperties.cs b/src/Avalonia.Base/Media/TextFormatting/GenericTextParagraphProperties.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/GenericTextParagraphProperties.cs
rename to src/Avalonia.Base/Media/TextFormatting/GenericTextParagraphProperties.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/GenericTextRunProperties.cs b/src/Avalonia.Base/Media/TextFormatting/GenericTextRunProperties.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/GenericTextRunProperties.cs
rename to src/Avalonia.Base/Media/TextFormatting/GenericTextRunProperties.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/ITextSource.cs b/src/Avalonia.Base/Media/TextFormatting/ITextSource.cs
new file mode 100644
index 0000000000..26966b37bc
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/ITextSource.cs
@@ -0,0 +1,17 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Produces <see cref="TextRun"/> objects that are used by the <see cref="TextFormatter"/>.
+    /// </summary>
+    public interface ITextSource
+    {
+        /// <summary>
+        /// Gets a <see cref="TextRun"/> for specified text source index.
+        /// </summary>
+        /// <param name="textSourceIndex">The text source index.</param>
+        /// <returns>The text run.</returns>
+        TextRun? GetTextRun(int textSourceIndex);
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/LogicalDirection.cs b/src/Avalonia.Base/Media/TextFormatting/LogicalDirection.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/LogicalDirection.cs
rename to src/Avalonia.Base/Media/TextFormatting/LogicalDirection.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ShapeableTextCharacters.cs b/src/Avalonia.Base/Media/TextFormatting/ShapeableTextCharacters.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/ShapeableTextCharacters.cs
rename to src/Avalonia.Base/Media/TextFormatting/ShapeableTextCharacters.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ShapedBuffer.cs b/src/Avalonia.Base/Media/TextFormatting/ShapedBuffer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/ShapedBuffer.cs
rename to src/Avalonia.Base/Media/TextFormatting/ShapedBuffer.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/ShapedTextCharacters.cs b/src/Avalonia.Base/Media/TextFormatting/ShapedTextCharacters.cs
new file mode 100644
index 0000000000..53287a264d
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/ShapedTextCharacters.cs
@@ -0,0 +1,205 @@
+using System;
+using System.Diagnostics;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A text run that holds shaped characters.
+    /// </summary>
+    public sealed class ShapedTextCharacters : DrawableTextRun
+    {
+        private GlyphRun? _glyphRun;
+
+        public ShapedTextCharacters(ShapedBuffer shapedBuffer, TextRunProperties properties)
+        {
+            ShapedBuffer = shapedBuffer;
+            Text = shapedBuffer.Text;
+            Properties = properties;
+            TextSourceLength = Text.Length;
+            FontMetrics = new FontMetrics(properties.Typeface, properties.FontRenderingEmSize);
+        }
+
+        public bool IsReversed { get; private set; }
+
+        public sbyte BidiLevel => ShapedBuffer.BidiLevel;
+
+        public ShapedBuffer ShapedBuffer { get; }
+
+        /// <inheritdoc/>
+        public override ReadOnlySlice<char> Text { get; }
+
+        /// <inheritdoc/>
+        public override TextRunProperties Properties { get; }
+
+        /// <inheritdoc/>
+        public override int TextSourceLength { get; }
+
+        public FontMetrics FontMetrics { get; }
+
+        public override double Baseline => -FontMetrics.Ascent;
+
+        public override Size Size => GlyphRun.Size;
+
+        public GlyphRun GlyphRun
+        {
+            get
+            {
+                if(_glyphRun is null)
+                {
+                    _glyphRun = CreateGlyphRun();
+                }
+
+                return _glyphRun;
+            }
+        }
+
+        /// <inheritdoc/>
+        public override void Draw(DrawingContext drawingContext, Point origin)
+        {
+            using (drawingContext.PushPreTransform(Matrix.CreateTranslation(origin)))
+            {
+                if (GlyphRun.GlyphIndices.Count == 0)
+                {
+                    return;
+                }
+
+                if (Properties.Typeface == default)
+                {
+                    return;
+                }
+
+                if (Properties.ForegroundBrush == null)
+                {
+                    return;
+                }
+
+                if (Properties.BackgroundBrush != null)
+                {
+                    drawingContext.DrawRectangle(Properties.BackgroundBrush, null, new Rect(Size));
+                }
+
+                drawingContext.DrawGlyphRun(Properties.ForegroundBrush, GlyphRun);
+
+                if (Properties.TextDecorations == null)
+                {
+                    return;
+                }
+
+                foreach (var textDecoration in Properties.TextDecorations)
+                {
+                    textDecoration.Draw(drawingContext, GlyphRun, FontMetrics, Properties.ForegroundBrush);
+                }
+            }
+        }
+
+        internal void Reverse()
+        {
+            _glyphRun = null;
+
+            ShapedBuffer.GlyphInfos.Span.Reverse();
+
+            IsReversed = !IsReversed;
+        }
+
+        /// <summary>
+        /// Measures the number of characters that fit into available width.
+        /// </summary>
+        /// <param name="availableWidth">The available width.</param>
+        /// <param name="length">The count of fitting characters.</param>
+        /// <returns>
+        /// <c>true</c> if characters fit into the available width; otherwise, <c>false</c>.
+        /// </returns>
+        internal bool TryMeasureCharacters(double availableWidth, out int length)
+        {
+            length = 0;
+            var currentWidth = 0.0;
+
+            for (var i = 0; i < ShapedBuffer.Length; i++)
+            {
+                var advance = ShapedBuffer.GlyphAdvances[i];
+
+                if (currentWidth + advance > availableWidth)
+                {
+                    break;
+                }
+
+                Codepoint.ReadAt(GlyphRun.Characters, length, out var count);
+
+                length += count;
+                currentWidth += advance;
+            }
+
+            return length > 0;
+        }
+
+        internal bool TryMeasureCharactersBackwards(double availableWidth, out int length, out double width)
+        {
+            length = 0;
+            width = 0;
+
+            for (var i = ShapedBuffer.Length - 1; i >= 0; i--)
+            {
+                var advance = ShapedBuffer.GlyphAdvances[i];
+
+                if (width + advance > availableWidth)
+                {
+                    break;
+                }
+
+                Codepoint.ReadAt(GlyphRun.Characters, length, out var count);
+
+                length += count;
+                width += advance;
+            }
+
+            return length > 0;
+        }
+
+        internal SplitResult<ShapedTextCharacters> Split(int length)
+        {
+            if (IsReversed)
+            {
+                Reverse();
+            }
+
+#if DEBUG
+            if(length == 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length), "length must be greater than zero.");
+            }
+#endif
+            
+            var splitBuffer = ShapedBuffer.Split(length);
+
+            var first = new ShapedTextCharacters(splitBuffer.First, Properties);
+
+            #if DEBUG
+
+            if (first.Text.Length != length)
+            {
+                throw new InvalidOperationException("Split length mismatch.");
+            }
+            
+            #endif
+
+            var second = new ShapedTextCharacters(splitBuffer.Second!, Properties);
+
+            return new SplitResult<ShapedTextCharacters>(first, second);
+        }
+
+        internal GlyphRun CreateGlyphRun()
+        {
+            return new GlyphRun(
+                ShapedBuffer.GlyphTypeface,
+                ShapedBuffer.FontRenderingEmSize,
+                Text,
+                ShapedBuffer.GlyphIndices,
+                ShapedBuffer.GlyphAdvances,
+                ShapedBuffer.GlyphOffsets,
+                ShapedBuffer.GlyphClusters,
+                BidiLevel);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/SplitResult.cs b/src/Avalonia.Base/Media/TextFormatting/SplitResult.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/SplitResult.cs
rename to src/Avalonia.Base/Media/TextFormatting/SplitResult.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextBounds.cs b/src/Avalonia.Base/Media/TextFormatting/TextBounds.cs
new file mode 100644
index 0000000000..93edf68348
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextBounds.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// The bounding rectangle of a range of characters
+    /// </summary>
+    public sealed class TextBounds
+    {
+        /// <summary>
+        /// Constructing TextBounds object
+        /// </summary>
+        internal TextBounds(Rect bounds, FlowDirection flowDirection, IList<TextRunBounds> runBounds)
+        {
+            Rectangle = bounds;
+            FlowDirection = flowDirection;
+            TextRunBounds = runBounds;
+        }
+
+        /// <summary>
+        /// Bounds rectangle
+        /// </summary>
+        public Rect Rectangle { get; internal set; }
+
+        /// <summary>
+        /// Text flow direction inside the boundary rectangle
+        /// </summary>
+        public FlowDirection FlowDirection { get; }
+
+        /// <summary>
+        /// Get a list of run bounding rectangles
+        /// </summary>
+        /// <returns>Array of text run bounds</returns>
+        public IList<TextRunBounds> TextRunBounds { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs b/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
new file mode 100644
index 0000000000..ab72601c3e
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A text run that holds text characters.
+    /// </summary>
+    public class TextCharacters : TextRun
+    {
+        public TextCharacters(ReadOnlySlice<char> text, TextRunProperties properties)
+        {
+            TextSourceLength = text.Length;
+            Text = text;
+            Properties = properties;
+        }
+
+        public TextCharacters(ReadOnlySlice<char> text, int offsetToFirstCharacter, int length,
+            TextRunProperties properties)
+        {
+            Text = text.Skip(offsetToFirstCharacter).Take(length);
+            TextSourceLength = length;
+            Properties = properties;
+        }
+
+        /// <inheritdoc />
+        public override int TextSourceLength { get; }
+
+        /// <inheritdoc />
+        public override ReadOnlySlice<char> Text { get; }
+
+        /// <inheritdoc />
+        public override TextRunProperties Properties { get; }
+
+        /// <summary>
+        /// Gets a list of <see cref="ShapeableTextCharacters"/>.
+        /// </summary>
+        /// <returns>The shapeable text characters.</returns>
+        internal IReadOnlyList<ShapeableTextCharacters> GetShapeableCharacters(ReadOnlySlice<char> runText, sbyte biDiLevel, 
+            ref TextRunProperties? previousProperties)
+        {
+            var shapeableCharacters = new List<ShapeableTextCharacters>(2);
+
+            while (!runText.IsEmpty)
+            {
+                var shapeableRun = CreateShapeableRun(runText, Properties, biDiLevel, ref previousProperties);
+
+                shapeableCharacters.Add(shapeableRun);
+
+                runText = runText.Skip(shapeableRun.Text.Length);
+
+                previousProperties = shapeableRun.Properties;
+            }
+
+            return shapeableCharacters;
+        }
+
+        /// <summary>
+        /// Creates a shapeable text run with unique properties.
+        /// </summary>
+        /// <param name="text">The text to create text runs from.</param>
+        /// <param name="defaultProperties">The default text run properties.</param>
+        /// <param name="biDiLevel">The bidi level of the run.</param>
+        /// <param name="previousProperties"></param>
+        /// <returns>A list of shapeable text runs.</returns>
+        private static ShapeableTextCharacters CreateShapeableRun(ReadOnlySlice<char> text, 
+            TextRunProperties defaultProperties, sbyte biDiLevel, ref TextRunProperties? previousProperties)
+        {
+            var defaultTypeface = defaultProperties.Typeface;
+            var currentTypeface = defaultTypeface;
+            var previousTypeface = previousProperties?.Typeface;
+
+            if (TryGetShapeableLength(text, currentTypeface, null, out var count, out var script))
+            {
+                if (script == Script.Common && previousTypeface is not null)
+                {
+                    if(TryGetShapeableLength(text, previousTypeface.Value, defaultTypeface, out var fallbackCount, out _))
+                    {
+                        return new ShapeableTextCharacters(text.Take(fallbackCount),
+                            defaultProperties.WithTypeface(previousTypeface.Value), biDiLevel);
+                    }
+                }
+
+                return new ShapeableTextCharacters(text.Take(count), defaultProperties.WithTypeface(currentTypeface),
+                    biDiLevel);
+            }
+            
+            if (previousTypeface is not null)
+            {
+                if(TryGetShapeableLength(text, previousTypeface.Value, defaultTypeface, out count, out _))
+                {
+                    return new ShapeableTextCharacters(text.Take(count),
+                        defaultProperties.WithTypeface(previousTypeface.Value), biDiLevel);
+                }
+            }
+
+            var codepoint = Codepoint.ReplacementCodepoint;
+
+            var codepointEnumerator = new CodepointEnumerator(text.Skip(count));
+
+            while (codepointEnumerator.MoveNext())
+            {
+                if (codepointEnumerator.Current.IsWhiteSpace)
+                {
+                    continue;
+                }
+                
+                codepoint = codepointEnumerator.Current;
+                    
+                break;
+            }
+            
+            //ToDo: Fix FontFamily fallback
+            var matchFound =
+                FontManager.Current.TryMatchCharacter(codepoint, defaultTypeface.Style, defaultTypeface.Weight,
+                    defaultTypeface.Stretch, defaultTypeface.FontFamily, defaultProperties.CultureInfo,
+                    out currentTypeface);
+
+            if (matchFound && TryGetShapeableLength(text, currentTypeface, defaultTypeface, out count, out _))
+            {
+                //Fallback found
+                return new ShapeableTextCharacters(text.Take(count), defaultProperties.WithTypeface(currentTypeface),
+                    biDiLevel);
+            }
+
+            // no fallback found
+            currentTypeface = defaultTypeface;
+
+            var glyphTypeface = currentTypeface.GlyphTypeface;
+
+            var enumerator = new GraphemeEnumerator(text);
+
+            while (enumerator.MoveNext())
+            {
+                var grapheme = enumerator.Current;
+
+                if (!grapheme.FirstCodepoint.IsWhiteSpace && glyphTypeface.TryGetGlyph(grapheme.FirstCodepoint, out _))
+                {
+                    break;
+                }
+
+                count += grapheme.Text.Length;
+            }
+
+            return new ShapeableTextCharacters(text.Take(count), defaultProperties, biDiLevel);
+        }
+
+        /// <summary>
+        /// Tries to get a shapeable length that is supported by the specified typeface.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <param name="typeface">The typeface that is used to find matching characters.</param>
+        /// <param name="defaultTypeface"></param>
+        /// <param name="length">The shapeable length.</param>
+        /// <param name="script"></param>
+        /// <returns></returns>
+        protected static bool TryGetShapeableLength(
+            ReadOnlySlice<char> text, 
+            Typeface typeface, 
+            Typeface? defaultTypeface,
+            out int length,
+            out Script script)
+        {
+            length = 0;
+            script = Script.Unknown;         
+
+            if (text.Length == 0)
+            {
+                return false;
+            }
+
+            var font = typeface.GlyphTypeface;
+            var defaultFont = defaultTypeface?.GlyphTypeface;
+
+            var enumerator = new GraphemeEnumerator(text);
+
+            while (enumerator.MoveNext())
+            {
+                var currentGrapheme = enumerator.Current;
+
+                var currentScript = currentGrapheme.FirstCodepoint.Script;
+
+                if (currentScript != Script.Common && defaultFont != null && defaultFont.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
+                {
+                    break;
+                }
+
+                //Stop at the first missing glyph
+                if (!currentGrapheme.FirstCodepoint.IsBreakChar && !font.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
+                {
+                    break;
+                }
+                
+                if (currentScript != script)
+                {
+                    if (script is Script.Unknown || currentScript != Script.Common &&
+                        script is Script.Common or Script.Inherited)
+                    {
+                        script = currentScript;
+                    }
+                    else
+                    {
+                        if (currentScript != Script.Inherited && currentScript != Script.Common)
+                        {
+                            break;
+                        }
+                    }
+                }
+
+                length += currentGrapheme.Text.Length;
+            }
+
+            return length > 0;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs b/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs
new file mode 100644
index 0000000000..f677617b14
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Properties of text collapsing.
+    /// </summary>
+    public abstract class TextCollapsingProperties
+    {
+        /// <summary>
+        /// Gets the width in which the collapsible range is constrained to.
+        /// </summary>
+        public abstract double Width { get; }
+
+        /// <summary>
+        /// Gets the text run that is used as collapsing symbol.
+        /// </summary>
+        public abstract TextRun Symbol { get; }
+
+        /// <summary>
+        /// Collapses given text line.
+        /// </summary>
+        /// <param name="textLine">Text line to collapse.</param>
+        public abstract List<DrawableTextRun>? Collapse(TextLine textLine);
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs b/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
new file mode 100644
index 0000000000..5a2169630b
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
@@ -0,0 +1,122 @@
+using System.Collections.Generic;
+using Avalonia.Media.TextFormatting.Unicode;
+
+namespace Avalonia.Media.TextFormatting
+{
+    internal static class TextEllipsisHelper
+    {
+        public static List<DrawableTextRun>? Collapse(TextLine textLine, TextCollapsingProperties properties, bool isWordEllipsis)
+        {
+            if (textLine.TextRuns is not List<DrawableTextRun> textRuns || textRuns.Count == 0)
+            {
+                return null;
+            }
+
+            var runIndex = 0;
+            var currentWidth = 0.0;
+            var collapsedLength = 0;
+            var shapedSymbol = TextFormatterImpl.CreateSymbol(properties.Symbol, FlowDirection.LeftToRight);
+
+            if (properties.Width < shapedSymbol.GlyphRun.Size.Width)
+            {
+                //Not enough space to fit in the symbol
+                return new List<DrawableTextRun>(0);
+            }
+
+            var availableWidth = properties.Width - shapedSymbol.Size.Width;
+
+            while (runIndex < textRuns.Count)
+            {
+                var currentRun = textRuns[runIndex];
+
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedRun:
+                    {
+                        currentWidth += shapedRun.Size.Width;
+
+                        if (currentWidth > availableWidth)
+                        {
+                            if (shapedRun.TryMeasureCharacters(availableWidth, out var measuredLength))
+                            {
+                                if (isWordEllipsis && measuredLength < textLine.Length)
+                                {
+                                    var currentBreakPosition = 0;
+
+                                    var lineBreaker = new LineBreakEnumerator(currentRun.Text);
+
+                                    while (currentBreakPosition < measuredLength && lineBreaker.MoveNext())
+                                    {
+                                        var nextBreakPosition = lineBreaker.Current.PositionMeasure;
+
+                                        if (nextBreakPosition == 0)
+                                        {
+                                            break;
+                                        }
+
+                                        if (nextBreakPosition >= measuredLength)
+                                        {
+                                            break;
+                                        }
+
+                                        currentBreakPosition = nextBreakPosition;
+                                    }
+
+                                    measuredLength = currentBreakPosition;
+                                }
+                            }
+
+                            collapsedLength += measuredLength;
+
+                            var collapsedRuns = new List<DrawableTextRun>(textRuns.Count);
+
+                            if (collapsedLength > 0)
+                            {
+                                var splitResult = TextFormatterImpl.SplitDrawableRuns(textRuns, collapsedLength);
+
+                                collapsedRuns.AddRange(splitResult.First);
+                            }
+
+                            collapsedRuns.Add(shapedSymbol);
+
+                            return collapsedRuns;
+                        }
+
+                        availableWidth -= currentRun.Size.Width;
+
+                        
+                        break;
+                    }
+
+                    case { } drawableRun:
+                    {
+                        //The whole run needs to fit into available space
+                        if (currentWidth + drawableRun.Size.Width > availableWidth)
+                        {
+                            var collapsedRuns = new List<DrawableTextRun>(textRuns.Count);
+
+                            if (collapsedLength > 0)
+                            {
+                                var splitResult = TextFormatterImpl.SplitDrawableRuns(textRuns, collapsedLength);
+
+                                collapsedRuns.AddRange(splitResult.First);
+                            }
+
+                            collapsedRuns.Add(shapedSymbol);
+
+                            return collapsedRuns;
+                        }
+                        
+                        break;
+                    }
+                }
+
+                collapsedLength += currentRun.TextSourceLength;
+
+                runIndex++;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextEndOfLine.cs b/src/Avalonia.Base/Media/TextFormatting/TextEndOfLine.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/TextEndOfLine.cs
rename to src/Avalonia.Base/Media/TextFormatting/TextEndOfLine.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextEndOfParagraph.cs b/src/Avalonia.Base/Media/TextFormatting/TextEndOfParagraph.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/TextEndOfParagraph.cs
rename to src/Avalonia.Base/Media/TextFormatting/TextEndOfParagraph.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextFormatter.cs b/src/Avalonia.Base/Media/TextFormatting/TextFormatter.cs
new file mode 100644
index 0000000000..0b5d7649d7
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextFormatter.cs
@@ -0,0 +1,44 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Represents a base class for text formatting.
+    /// </summary>
+    public abstract class TextFormatter
+    {
+        /// <summary>
+        /// Gets the current <see cref="TextFormatter"/> that is used for non complex text formatting.
+        /// </summary>
+        public static TextFormatter Current
+        {
+            get
+            {
+                var current = AvaloniaLocator.Current.GetService<TextFormatter>();
+
+                if (current != null)
+                {
+                    return current;
+                }
+
+                current = new TextFormatterImpl();
+
+                AvaloniaLocator.CurrentMutable.Bind<TextFormatter>().ToConstant(current);
+
+                return current;
+            }
+        }
+
+        /// <summary>
+        /// Formats a text line.
+        /// </summary>
+        /// <param name="textSource">The text source.</param>
+        /// <param name="firstTextSourceIndex">The first character index to start the text line from.</param>
+        /// <param name="paragraphWidth">A <see cref="double"/> value that specifies the width of the paragraph that the line fills.</param>
+        /// <param name="paragraphProperties">A <see cref="TextParagraphProperties"/> value that represents paragraph properties,
+        /// such as TextWrapping, TextAlignment, or TextStyle.</param>
+        /// <param name="previousLineBreak">A <see cref="TextLineBreak"/> value that specifies the text formatter state,
+        /// in terms of where the previous line in the paragraph was broken by the text formatting process.</param>
+        /// <returns>The formatted line.</returns>
+        public abstract TextLine FormatLine(ITextSource textSource, int firstTextSourceIndex, double paragraphWidth,
+            TextParagraphProperties paragraphProperties, TextLineBreak? previousLineBreak = null);
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
new file mode 100644
index 0000000000..4205268bc6
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
@@ -0,0 +1,762 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    internal class TextFormatterImpl : TextFormatter
+    {
+        private static readonly char[] s_empty = { ' ' };
+
+        /// <inheritdoc cref="TextFormatter.FormatLine"/>
+        public override TextLine FormatLine(ITextSource textSource, int firstTextSourceIndex, double paragraphWidth,
+            TextParagraphProperties paragraphProperties, TextLineBreak? previousLineBreak = null)
+        {
+            var textWrapping = paragraphProperties.TextWrapping;
+            FlowDirection flowDirection;
+            TextLineBreak? nextLineBreak = null;
+            List<DrawableTextRun> drawableTextRuns;
+
+            var textRuns = FetchTextRuns(textSource, firstTextSourceIndex,
+                out var textEndOfLine, out var textSourceLength);
+
+            if (previousLineBreak?.RemainingRuns != null)
+            {
+                flowDirection = previousLineBreak.FlowDirection;
+                drawableTextRuns = previousLineBreak.RemainingRuns.ToList();
+                nextLineBreak = previousLineBreak;
+            }
+            else
+            {
+                drawableTextRuns = ShapeTextRuns(textRuns, paragraphProperties, out flowDirection);
+
+                if (nextLineBreak == null && textEndOfLine != null)
+                {
+                    nextLineBreak = new TextLineBreak(textEndOfLine, flowDirection);
+                }
+            }
+
+            TextLineImpl textLine;
+
+            switch (textWrapping)
+            {
+                case TextWrapping.NoWrap:
+                    {
+                        textLine = new TextLineImpl(drawableTextRuns, firstTextSourceIndex, textSourceLength,
+                            paragraphWidth, paragraphProperties, flowDirection, nextLineBreak);
+
+                        textLine.FinalizeLine();
+
+                        break;
+                    }
+                case TextWrapping.WrapWithOverflow:
+                case TextWrapping.Wrap:
+                    {
+                        textLine = PerformTextWrapping(drawableTextRuns, firstTextSourceIndex, paragraphWidth, paragraphProperties,
+                            flowDirection, nextLineBreak);
+                        break;
+                    }
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(textWrapping));
+            }
+
+            return textLine;
+        }
+
+        /// <summary>
+        /// Split a sequence of runs into two segments at specified length.
+        /// </summary>
+        /// <param name="textRuns">The text run's.</param>
+        /// <param name="length">The length to split at.</param>
+        /// <returns>The split text runs.</returns>
+        internal static SplitResult<List<DrawableTextRun>> SplitDrawableRuns(List<DrawableTextRun> textRuns, int length)
+        {
+            var currentLength = 0;
+
+            for (var i = 0; i < textRuns.Count; i++)
+            {
+                var currentRun = textRuns[i];
+
+                if (currentLength + currentRun.TextSourceLength < length)
+                {
+                    currentLength += currentRun.TextSourceLength;
+
+                    continue;
+                }
+
+                var firstCount = currentRun.TextSourceLength >= 1 ? i + 1 : i;
+
+                var first = new List<DrawableTextRun>(firstCount);
+
+                if (firstCount > 1)
+                {
+                    for (var j = 0; j < i; j++)
+                    {
+                        first.Add(textRuns[j]);
+                    }
+                }
+
+                var secondCount = textRuns.Count - firstCount;
+
+                if (currentLength + currentRun.TextSourceLength == length)
+                {
+                    var second = secondCount > 0 ? new List<DrawableTextRun>(secondCount) : null;
+
+                    if (second != null)
+                    {
+                        var offset = currentRun.TextSourceLength >= 1 ? 1 : 0;
+
+                        for (var j = 0; j < secondCount; j++)
+                        {
+                            second.Add(textRuns[i + j + offset]);
+                        }
+                    }
+
+                    first.Add(currentRun);
+
+                    return new SplitResult<List<DrawableTextRun>>(first, second);
+                }
+                else
+                {
+                    secondCount++;
+
+                    var second = new List<DrawableTextRun>(secondCount);
+
+                    if (currentRun is ShapedTextCharacters shapedTextCharacters)
+                    {
+                        var split = shapedTextCharacters.Split(length - currentLength);
+
+                        first.Add(split.First);
+
+                        second.Add(split.Second!);
+                    }                
+
+                    for (var j = 1; j < secondCount; j++)
+                    {
+                        second.Add(textRuns[i + j]);
+                    }
+
+                    return new SplitResult<List<DrawableTextRun>>(first, second);
+                }
+            }
+
+            return new SplitResult<List<DrawableTextRun>>(textRuns, null);
+        }
+
+        /// <summary>
+        /// Shape specified text runs with specified paragraph embedding.
+        /// </summary>
+        /// <param name="textRuns">The text runs to shape.</param>
+        /// <param name="paragraphProperties">The default paragraph properties.</param>
+        /// <param name="resolvedFlowDirection">The resolved flow direction.</param>
+        /// <returns>
+        /// A list of shaped text characters.
+        /// </returns>
+        private static List<DrawableTextRun> ShapeTextRuns(List<TextRun> textRuns, TextParagraphProperties paragraphProperties,
+            out FlowDirection resolvedFlowDirection)
+        {
+            var flowDirection = paragraphProperties.FlowDirection;
+            var drawableTextRuns = new List<DrawableTextRun>();
+
+            var biDiData = new BidiData((sbyte)flowDirection);
+
+            foreach (var textRun in textRuns)
+            {
+                if (textRun.Text.IsEmpty)
+                {
+                    var text = new char[textRun.TextSourceLength];
+
+                    biDiData.Append(text);
+                }
+                else
+                {
+                    biDiData.Append(textRun.Text);
+                }
+
+            }
+
+            var biDi = BidiAlgorithm.Instance.Value!;
+
+            biDi.Process(biDiData);
+
+            var resolvedEmbeddingLevel = biDi.ResolveEmbeddingLevel(biDiData.Classes);
+
+            resolvedFlowDirection =
+                (resolvedEmbeddingLevel & 1) == 0 ? FlowDirection.LeftToRight : FlowDirection.RightToLeft;
+
+            var processedRuns = new List<TextRun>(textRuns.Count);
+
+            foreach (var coalescedRuns in CoalesceLevels(textRuns, biDi.ResolvedLevels))
+            {
+                processedRuns.AddRange(coalescedRuns);
+            }
+
+            for (var index = 0; index < processedRuns.Count; index++)
+            {
+                var currentRun = processedRuns[index];
+
+                switch (currentRun)
+                {
+                    case DrawableTextRun drawableRun:
+                        {
+                            drawableTextRuns.Add(drawableRun);
+
+                            break;
+                        }
+
+                    case ShapeableTextCharacters shapeableRun:
+                        {
+                            var groupedRuns = new List<ShapeableTextCharacters>(2) { shapeableRun };
+                            var text = currentRun.Text;
+                            var start = currentRun.Text.Start;
+                            var length = currentRun.Text.Length;
+                            var bufferOffset = currentRun.Text.BufferOffset;
+
+                            while (index + 1 < processedRuns.Count)
+                            {
+                                if (processedRuns[index + 1] is not ShapeableTextCharacters nextRun)
+                                {
+                                    break;
+                                }
+
+                                if (shapeableRun.CanShapeTogether(nextRun))
+                                {
+                                    groupedRuns.Add(nextRun);
+
+                                    length += nextRun.Text.Length;
+
+                                    if (start > nextRun.Text.Start)
+                                    {
+                                        start = nextRun.Text.Start;
+                                    }
+
+                                    if (bufferOffset > nextRun.Text.BufferOffset)
+                                    {
+                                        bufferOffset = nextRun.Text.BufferOffset;
+                                    }
+
+                                    text = new ReadOnlySlice<char>(text.Buffer, start, length, bufferOffset);
+
+                                    index++;
+
+                                    shapeableRun = nextRun;
+
+                                    continue;
+                                }
+
+                                break;
+                            }
+
+                            var shaperOptions = new TextShaperOptions(currentRun.Properties!.Typeface.GlyphTypeface,
+                                        currentRun.Properties.FontRenderingEmSize,
+                                         shapeableRun.BidiLevel, currentRun.Properties.CultureInfo, paragraphProperties.DefaultIncrementalTab);
+
+                            drawableTextRuns.AddRange(ShapeTogether(groupedRuns, text, shaperOptions));
+
+                            break;
+                        }
+                }
+            }
+
+            return drawableTextRuns;
+        }
+
+        private static IReadOnlyList<ShapedTextCharacters> ShapeTogether(
+            IReadOnlyList<ShapeableTextCharacters> textRuns, ReadOnlySlice<char> text, TextShaperOptions options)
+        {
+            var shapedRuns = new List<ShapedTextCharacters>(textRuns.Count);
+
+            var shapedBuffer = TextShaper.Current.ShapeText(text, options);
+
+            for (var i = 0; i < textRuns.Count; i++)
+            {
+                var currentRun = textRuns[i];
+
+                var splitResult = shapedBuffer.Split(currentRun.Text.Length);
+
+                shapedRuns.Add(new ShapedTextCharacters(splitResult.First, currentRun.Properties));
+
+                shapedBuffer = splitResult.Second!;
+            }
+
+            return shapedRuns;
+        }
+
+        /// <summary>
+        /// Coalesces ranges of the same bidi level to form <see cref="ShapeableTextCharacters"/>
+        /// </summary>
+        /// <param name="textCharacters">The text characters to form <see cref="ShapeableTextCharacters"/> from.</param>
+        /// <param name="levels">The bidi levels.</param>
+        /// <returns></returns>
+        private static IEnumerable<IReadOnlyList<TextRun>> CoalesceLevels(
+            IReadOnlyList<TextRun> textCharacters,
+            ReadOnlySlice<sbyte> levels)
+        {
+            if (levels.Length == 0)
+            {
+                yield break;
+            }
+
+            var levelIndex = 0;
+            var runLevel = levels[0];
+
+            TextRunProperties? previousProperties = null;
+            TextCharacters? currentRun = null;
+            var runText = ReadOnlySlice<char>.Empty;
+
+            for (var i = 0; i < textCharacters.Count; i++)
+            {
+                var j = 0;
+                currentRun = textCharacters[i] as TextCharacters;
+
+                if (currentRun == null)
+                {
+                    var drawableRun = textCharacters[i];
+
+                    yield return new[] { drawableRun };
+
+                    levelIndex += drawableRun.TextSourceLength;
+
+                    continue;
+                }
+
+                runText = currentRun.Text;
+
+                for (; j < runText.Length;)
+                {
+                    Codepoint.ReadAt(runText, j, out var count);
+
+                    if (levelIndex + 1 == levels.Length)
+                    {
+                        break;
+                    }
+
+                    levelIndex++;
+                    j += count;
+
+                    if (j == runText.Length)
+                    {
+                        yield return currentRun.GetShapeableCharacters(runText.Take(j), runLevel, ref previousProperties);
+
+                        runLevel = levels[levelIndex];
+
+                        continue;
+                    }
+
+                    if (levels[levelIndex] == runLevel)
+                    {
+                        continue;
+                    }
+
+                    // End of this run
+                    yield return currentRun.GetShapeableCharacters(runText.Take(j), runLevel, ref previousProperties);
+
+                    runText = runText.Skip(j);
+
+                    j = 0;
+
+                    // Move to next run
+                    runLevel = levels[levelIndex];
+                }
+            }
+
+            if (currentRun is null || runText.IsEmpty)
+            {
+                yield break;
+            }
+
+            yield return currentRun.GetShapeableCharacters(runText, runLevel, ref previousProperties);
+        }
+
+        /// <summary>
+        /// Fetches text runs.
+        /// </summary>
+        /// <param name="textSource">The text source.</param>
+        /// <param name="firstTextSourceIndex">The first text source index.</param>
+        /// <param name="endOfLine"></param>
+        /// <param name="textSourceLength"></param>
+        /// <returns>
+        /// The formatted text runs.
+        /// </returns>
+        private static List<TextRun> FetchTextRuns(ITextSource textSource, int firstTextSourceIndex,
+            out TextEndOfLine? endOfLine, out int textSourceLength)
+        {
+            textSourceLength = 0;
+
+            endOfLine = null;
+
+            var textRuns = new List<TextRun>();
+
+            var textRunEnumerator = new TextRunEnumerator(textSource, firstTextSourceIndex);
+
+            while (textRunEnumerator.MoveNext())
+            {
+                var textRun = textRunEnumerator.Current;
+
+                if (textRun == null)
+                {
+                    break;
+                }
+
+                if (textRun is TextEndOfLine textEndOfLine)
+                {
+                    endOfLine = textEndOfLine;
+
+                    textRuns.Add(textRun);
+
+                    textSourceLength += textRun.TextSourceLength;
+
+                    break;
+                }
+
+                switch (textRun)
+                {
+                    case TextCharacters textCharacters:
+                        {
+                            if (TryGetLineBreak(textCharacters, out var runLineBreak))
+                            {
+                                var splitResult = new TextCharacters(textCharacters.Text.Take(runLineBreak.PositionWrap),
+                                    textCharacters.Properties);
+
+                                textRuns.Add(splitResult);
+
+                                textSourceLength += runLineBreak.PositionWrap;
+
+                                return textRuns;
+                            }
+
+                            textRuns.Add(textCharacters);
+
+                            break;
+                        }
+                    case DrawableTextRun drawableTextRun:
+                        {
+                            textRuns.Add(drawableTextRun);
+                            break;
+                        }
+                }
+
+                textSourceLength += textRun.TextSourceLength;
+            }
+
+            return textRuns;
+        }
+
+        private static bool TryGetLineBreak(TextRun textRun, out LineBreak lineBreak)
+        {
+            lineBreak = default;
+
+            if (textRun.Text.IsEmpty)
+            {
+                return false;
+            }
+
+            var lineBreakEnumerator = new LineBreakEnumerator(textRun.Text);
+
+            while (lineBreakEnumerator.MoveNext())
+            {
+                if (!lineBreakEnumerator.Current.Required)
+                {
+                    continue;
+                }
+
+                lineBreak = lineBreakEnumerator.Current;
+
+                return lineBreak.PositionWrap >= textRun.Text.Length || true;
+            }
+
+            return false;
+        }
+
+        private static bool TryMeasureLength(IReadOnlyList<DrawableTextRun> textRuns, double paragraphWidth, out int measuredLength)
+        {
+            measuredLength = 0;
+            var currentWidth = 0.0;
+
+            foreach (var currentRun in textRuns)
+            {
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedTextCharacters:
+                        {
+                            var firstCluster = shapedTextCharacters.ShapedBuffer.GlyphClusters[0];
+                            var lastCluster = firstCluster;
+
+                            for (var i = 0; i < shapedTextCharacters.ShapedBuffer.Length; i++)
+                            {
+                                var glyphInfo = shapedTextCharacters.ShapedBuffer[i];
+
+                                if (currentWidth + glyphInfo.GlyphAdvance > paragraphWidth)
+                                {
+                                    measuredLength += Math.Max(0, lastCluster - firstCluster);
+
+                                    goto found;
+                                }
+
+                                lastCluster = glyphInfo.GlyphCluster;
+                                currentWidth += glyphInfo.GlyphAdvance;
+                            }
+
+                            measuredLength += currentRun.TextSourceLength;
+
+                            break;
+                        }
+
+                    case { } drawableTextRun:
+                        {
+                            if (currentWidth + drawableTextRun.Size.Width > paragraphWidth)
+                            {
+                                goto found;
+                            }
+
+                            measuredLength += currentRun.TextSourceLength;
+                            currentWidth += currentRun.Size.Width;
+
+                            break;
+                        }
+                }
+            }
+
+            found:
+
+            return measuredLength != 0;
+        }
+
+        /// <summary>
+        /// Creates an empty text line.
+        /// </summary>
+        /// <returns>The empty text line.</returns>
+        public static TextLineImpl CreateEmptyTextLine(int firstTextSourceIndex, double paragraphWidth, TextParagraphProperties paragraphProperties)
+        {
+            var flowDirection = paragraphProperties.FlowDirection;
+            var properties = paragraphProperties.DefaultTextRunProperties;
+            var glyphTypeface = properties.Typeface.GlyphTypeface;
+            var text = new ReadOnlySlice<char>(s_empty, firstTextSourceIndex, 1);
+            var glyph = glyphTypeface.GetGlyph(s_empty[0]);
+            var glyphInfos = new[] { new GlyphInfo(glyph, firstTextSourceIndex) };
+
+            var shapedBuffer = new ShapedBuffer(text, glyphInfos, glyphTypeface, properties.FontRenderingEmSize,
+                (sbyte)flowDirection);
+
+            var textRuns = new List<DrawableTextRun> { new ShapedTextCharacters(shapedBuffer, properties) };
+
+            return new TextLineImpl(textRuns, firstTextSourceIndex, 0, paragraphWidth, paragraphProperties, flowDirection).FinalizeLine();
+        }
+
+        /// <summary>
+        /// Performs text wrapping returns a list of text lines.
+        /// </summary>
+        /// <param name="textRuns"></param>
+        /// <param name="firstTextSourceIndex">The first text source index.</param>
+        /// <param name="paragraphWidth">The paragraph width.</param>
+        /// <param name="paragraphProperties">The text paragraph properties.</param>
+        /// <param name="flowDirection"></param>
+        /// <param name="currentLineBreak">The current line break if the line was explicitly broken.</param>
+        /// <returns>The wrapped text line.</returns>
+        private static TextLineImpl PerformTextWrapping(List<DrawableTextRun> textRuns, int firstTextSourceIndex,
+            double paragraphWidth, TextParagraphProperties paragraphProperties, FlowDirection flowDirection,
+            TextLineBreak? currentLineBreak)
+        {
+            if(textRuns.Count == 0)
+            {
+                return CreateEmptyTextLine(firstTextSourceIndex,paragraphWidth, paragraphProperties);
+            }
+
+            if (!TryMeasureLength(textRuns, paragraphWidth, out var measuredLength))
+            {
+                measuredLength = 1;
+            }
+
+            var currentLength = 0;
+
+            var lastWrapPosition = 0;
+
+            var currentPosition = 0;
+
+            for (var index = 0; index < textRuns.Count; index++)
+            {
+                var currentRun = textRuns[index];
+
+                var lineBreaker = new LineBreakEnumerator(currentRun.Text);
+
+                var breakFound = false;
+
+                while (lineBreaker.MoveNext())
+                {
+                    if (lineBreaker.Current.Required &&
+                        currentLength + lineBreaker.Current.PositionMeasure <= measuredLength)
+                    {
+                        //Explicit break found
+                        breakFound = true;
+
+                        currentPosition = currentLength + lineBreaker.Current.PositionWrap;
+
+                        break;
+                    }
+
+                    if (currentLength + lineBreaker.Current.PositionMeasure > measuredLength)
+                    {
+                        if (paragraphProperties.TextWrapping == TextWrapping.WrapWithOverflow)
+                        {
+                            if (lastWrapPosition > 0)
+                            {
+                                currentPosition = lastWrapPosition;
+
+                                breakFound = true;
+
+                                break;
+                            }
+
+                            //Find next possible wrap position (overflow)
+                            if (index < textRuns.Count - 1)
+                            {
+                                if (lineBreaker.Current.PositionWrap != currentRun.Text.Length)
+                                {
+                                    //We already found the next possible wrap position.
+                                    breakFound = true;
+
+                                    currentPosition = currentLength + lineBreaker.Current.PositionWrap;
+
+                                    break;
+                                }
+
+                                while (lineBreaker.MoveNext() && index < textRuns.Count)
+                                {
+                                    currentPosition += lineBreaker.Current.PositionWrap;
+
+                                    if (lineBreaker.Current.PositionWrap != currentRun.Text.Length)
+                                    {
+                                        break;
+                                    }
+
+                                    index++;
+
+                                    if (index >= textRuns.Count)
+                                    {
+                                        break;
+                                    }
+
+                                    currentRun = textRuns[index];
+
+                                    lineBreaker = new LineBreakEnumerator(currentRun.Text);
+                                }
+                            }
+                            else
+                            {
+                                currentPosition = currentLength + lineBreaker.Current.PositionWrap;
+                            }
+
+                            breakFound = true;
+
+                            break;
+                        }
+
+                        //We overflowed so we use the last available wrap position.
+                        currentPosition = lastWrapPosition == 0 ? measuredLength : lastWrapPosition;
+
+                        breakFound = true;
+
+                        break;
+                    }
+
+                    if (lineBreaker.Current.PositionMeasure != lineBreaker.Current.PositionWrap)
+                    {
+                        lastWrapPosition = currentLength + lineBreaker.Current.PositionWrap;
+                    }
+                }
+
+                if (!breakFound)
+                {
+                    currentLength += currentRun.Text.Length;
+
+                    continue;
+                }
+
+                measuredLength = currentPosition;
+
+                break;
+            }
+
+            var splitResult = SplitDrawableRuns(textRuns, measuredLength);
+
+            var remainingCharacters = splitResult.Second;
+
+            var lineBreak = remainingCharacters?.Count > 0 ?
+                new TextLineBreak(currentLineBreak?.TextEndOfLine, flowDirection, remainingCharacters) :
+                null;
+
+            if (lineBreak is null && currentLineBreak?.TextEndOfLine != null)
+            {
+                lineBreak = new TextLineBreak(currentLineBreak.TextEndOfLine, flowDirection);
+            }
+
+            var textLine = new TextLineImpl(splitResult.First, firstTextSourceIndex, measuredLength,
+                paragraphWidth, paragraphProperties, flowDirection,
+                lineBreak);
+
+            return textLine.FinalizeLine();
+        }
+
+        private struct TextRunEnumerator
+        {
+            private readonly ITextSource _textSource;
+            private int _pos;
+
+            public TextRunEnumerator(ITextSource textSource, int firstTextSourceIndex)
+            {
+                _textSource = textSource;
+                _pos = firstTextSourceIndex;
+                Current = null;
+            }
+
+            // ReSharper disable once MemberHidesStaticFromOuterClass
+            public TextRun? Current { get; private set; }
+
+            public bool MoveNext()
+            {
+                Current = _textSource.GetTextRun(_pos);
+
+                if (Current is null)
+                {
+                    return false;
+                }
+
+                if (Current.TextSourceLength == 0)
+                {
+                    return false;
+                }
+
+                _pos += Current.TextSourceLength;
+
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Creates a shaped symbol.
+        /// </summary>
+        /// <param name="textRun">The symbol run to shape.</param>
+        /// <param name="flowDirection">The flow direction.</param>
+        /// <returns>
+        /// The shaped symbol.
+        /// </returns>
+        internal static ShapedTextCharacters CreateSymbol(TextRun textRun, FlowDirection flowDirection)
+        {
+            var textShaper = TextShaper.Current;
+
+            var glyphTypeface = textRun.Properties!.Typeface.GlyphTypeface;
+
+            var fontRenderingEmSize = textRun.Properties.FontRenderingEmSize;
+
+            var cultureInfo = textRun.Properties.CultureInfo;
+
+            var shaperOptions = new TextShaperOptions(glyphTypeface, fontRenderingEmSize, (sbyte)flowDirection, cultureInfo);
+
+            var shapedBuffer = textShaper.ShapeText(textRun.Text, shaperOptions);
+
+            return new ShapedTextCharacters(shapedBuffer, textRun.Properties);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
new file mode 100644
index 0000000000..4f7c43a6d1
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
@@ -0,0 +1,517 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Represents a multi line text layout.
+    /// </summary>
+    public class TextLayout
+    {
+        private readonly ITextSource _textSource;
+        private readonly TextParagraphProperties _paragraphProperties;
+        private readonly TextTrimming _textTrimming;
+
+        private int _textSourceLength;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextLayout" /> class.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <param name="typeface">The typeface.</param>
+        /// <param name="fontSize">Size of the font.</param>
+        /// <param name="foreground">The foreground.</param>
+        /// <param name="textAlignment">The text alignment.</param>
+        /// <param name="textWrapping">The text wrapping.</param>
+        /// <param name="textTrimming">The text trimming.</param>
+        /// <param name="textDecorations">The text decorations.</param>
+        /// <param name="flowDirection">The text flow direction.</param>
+        /// <param name="maxWidth">The maximum width.</param>
+        /// <param name="maxHeight">The maximum height.</param>
+        /// <param name="lineHeight">The height of each line of text.</param>
+        /// <param name="maxLines">The maximum number of text lines.</param>
+        /// <param name="textStyleOverrides">The text style overrides.</param>
+        public TextLayout(
+            string? text,
+            Typeface typeface,
+            double fontSize,
+            IBrush? foreground,
+            TextAlignment textAlignment = TextAlignment.Left,
+            TextWrapping textWrapping = TextWrapping.NoWrap,
+            TextTrimming? textTrimming = null,
+            TextDecorationCollection? textDecorations = null,
+            FlowDirection flowDirection = FlowDirection.LeftToRight,
+            double maxWidth = double.PositiveInfinity,
+            double maxHeight = double.PositiveInfinity,
+            double lineHeight = double.NaN,
+            int maxLines = 0,
+            IReadOnlyList<ValueSpan<TextRunProperties>>? textStyleOverrides = null)
+        {
+            _paragraphProperties =
+                CreateTextParagraphProperties(typeface, fontSize, foreground, textAlignment, textWrapping,
+                    textDecorations, flowDirection, lineHeight);
+
+            _textSource = new FormattedTextSource(text.AsMemory(), _paragraphProperties.DefaultTextRunProperties, textStyleOverrides);
+
+            _textTrimming = textTrimming ?? TextTrimming.None;
+
+            LineHeight = lineHeight;
+
+            MaxWidth = maxWidth;
+
+            MaxHeight = maxHeight;
+
+            MaxLines = maxLines;      
+
+            TextLines = CreateTextLines();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextLayout" /> class.
+        /// </summary>
+        /// <param name="textSource">The text source.</param>
+        /// <param name="paragraphProperties">The default text paragraph properties.</param>
+        /// <param name="textTrimming">The text trimming.</param>
+        /// <param name="maxWidth">The maximum width.</param>
+        /// <param name="maxHeight">The maximum height.</param>
+        /// <param name="lineHeight">The height of each line of text.</param>
+        /// <param name="maxLines">The maximum number of text lines.</param>
+        public TextLayout(
+            ITextSource textSource,
+            TextParagraphProperties paragraphProperties, 
+            TextTrimming? textTrimming = null,
+            double maxWidth = double.PositiveInfinity,
+            double maxHeight = double.PositiveInfinity,
+            double lineHeight = double.NaN,
+            int maxLines = 0)
+        {
+            _textSource = textSource;
+
+            _paragraphProperties = paragraphProperties;
+
+            _textTrimming = textTrimming ?? TextTrimming.None;
+
+            LineHeight = lineHeight;
+
+            MaxWidth = maxWidth;
+
+            MaxHeight = maxHeight;
+
+            MaxLines = maxLines;
+
+            TextLines = CreateTextLines();
+        }
+
+        /// <summary>
+        /// Gets or sets the height of each line of text.
+        /// </summary>
+        /// <remarks>
+        /// A value of NaN (equivalent to an attribute value of "Auto") indicates that the line height
+        /// is determined automatically from the current font characteristics. The default is NaN.
+        /// </remarks>
+        public double LineHeight { get; }
+
+        /// <summary>
+        /// Gets the maximum width.
+        /// </summary>
+        public double MaxWidth { get; }
+
+        /// <summary>
+        /// Gets the maximum height.
+        /// </summary>
+        public double MaxHeight { get; }
+
+        /// <summary>
+        /// Gets the maximum number of text lines.
+        /// </summary>
+        public int MaxLines { get; }
+
+        /// <summary>
+        /// Gets the text lines.
+        /// </summary>
+        /// <value>
+        /// The text lines.
+        /// </value>
+        public IReadOnlyList<TextLine> TextLines { get; private set; }
+
+        /// <summary>
+        /// Gets the bounds of the layout.
+        /// </summary>
+        /// <value>
+        /// The bounds.
+        /// </value>
+        public Rect Bounds { get; private set; }
+
+        /// <summary>
+        /// Draws the text layout.
+        /// </summary>
+        /// <param name="context">The drawing context.</param>
+        /// <param name="origin">The origin.</param>
+        public void Draw(DrawingContext context, Point origin)
+        {
+            if (!TextLines.Any())
+            {
+                return;
+            }
+
+            var (currentX, currentY) = origin;
+
+            foreach (var textLine in TextLines)
+            {
+                textLine.Draw(context, new Point(currentX + textLine.Start, currentY));
+
+                currentY += textLine.Height;
+            }
+        }
+
+        /// <summary>
+        /// Get the pixel location relative to the top-left of the layout box given the text position.
+        /// </summary>
+        /// <param name="textPosition">The text position.</param>
+        /// <returns></returns>
+        public Rect HitTestTextPosition(int textPosition)
+        {
+            if (TextLines.Count == 0)
+            {
+                return new Rect();
+            }
+
+            if (textPosition < 0 || textPosition >= _textSourceLength)
+            {
+                var lastLine = TextLines[TextLines.Count - 1];
+
+                var lineX = lastLine.Width;
+
+                var lineY = Bounds.Bottom - lastLine.Height;
+
+                return new Rect(lineX, lineY, 0, lastLine.Height);
+            }
+
+            var currentY = 0.0;
+
+            foreach (var textLine in TextLines)
+            {
+                var end = textLine.FirstTextSourceIndex + textLine.Length - 1;
+
+                if (end < textPosition)
+                {
+                    currentY += textLine.Height;
+
+                    continue;
+                }
+
+                var characterHit = new CharacterHit(textPosition);
+
+                var startX = textLine.GetDistanceFromCharacterHit(characterHit);
+
+                var nextCharacterHit = textLine.GetNextCaretCharacterHit(characterHit);
+
+                var endX = textLine.GetDistanceFromCharacterHit(nextCharacterHit);
+
+                return new Rect(startX, currentY, endX - startX, textLine.Height);
+            }
+
+            return new Rect();
+        }
+
+        public IEnumerable<Rect> HitTestTextRange(int start, int length)
+        {
+            if (start + length <= 0)
+            {
+                return Array.Empty<Rect>();
+            }
+
+            var result = new List<Rect>(TextLines.Count);
+            
+            var currentY = 0d;
+
+            foreach (var textLine in TextLines)
+            {
+                //Current line isn't covered.
+                if (textLine.FirstTextSourceIndex + textLine.Length < start)
+                {
+                    currentY += textLine.Height;
+
+                    continue;
+                }
+
+                var textBounds = textLine.GetTextBounds(start, length);
+
+                if(textBounds.Count > 0)
+                {
+                    foreach (var bounds in textBounds)
+                    {
+                        Rect? last = result.Count > 0 ? result[result.Count - 1] : null;
+
+                        if (last.HasValue && MathUtilities.AreClose(last.Value.Right, bounds.Rectangle.Left) && MathUtilities.AreClose(last.Value.Top, currentY))
+                        {
+                            result[result.Count - 1] = last.Value.WithWidth(last.Value.Width + bounds.Rectangle.Width);
+                        }
+                        else
+                        {
+                            result.Add(bounds.Rectangle.WithY(currentY));
+                        }
+
+                        foreach (var runBounds in bounds.TextRunBounds)
+                        {
+                            start += runBounds.Length;
+                            length -= runBounds.Length;
+                        }
+                    }
+                }
+
+                if(textLine.FirstTextSourceIndex + textLine.Length >= start + length)
+                {
+                    break;
+                }
+
+                currentY += textLine.Height;
+            }
+
+            return result;
+        }
+
+        public TextHitTestResult HitTestPoint(in Point point)
+        {
+            var currentY = 0d;
+
+            var lineIndex = 0;
+            TextLine? currentLine = null;
+            CharacterHit characterHit;
+
+            for (; lineIndex < TextLines.Count; lineIndex++)
+            {
+                currentLine = TextLines[lineIndex];
+
+                if (currentY + currentLine.Height > point.Y)
+                {
+                    characterHit = currentLine.GetCharacterHitFromDistance(point.X);
+
+                    return GetHitTestResult(currentLine, characterHit, point);
+                }
+
+                currentY += currentLine.Height;
+            }
+
+            if (currentLine is null)
+            {
+                return new TextHitTestResult();
+            }
+
+            characterHit = currentLine.GetCharacterHitFromDistance(point.X);
+
+            return GetHitTestResult(currentLine, characterHit, point);
+        }
+
+        
+        public int GetLineIndexFromCharacterIndex(int charIndex, bool trailingEdge)
+        {
+            if (charIndex < 0)
+            {
+                return 0;
+            }
+
+            if (charIndex > _textSourceLength)
+            {
+                return TextLines.Count - 1;
+            }
+
+            for (var index = 0; index < TextLines.Count; index++)
+            {
+                var textLine = TextLines[index];
+
+                if (textLine.FirstTextSourceIndex + textLine.Length < charIndex)
+                {
+                    continue;
+                }
+
+                if (charIndex >= textLine.FirstTextSourceIndex && 
+                    charIndex <= textLine.FirstTextSourceIndex + textLine.Length - (trailingEdge ? 0 : 1))
+                {
+                    return index;
+                }
+            }
+
+            return TextLines.Count - 1;
+        }
+
+        private TextHitTestResult GetHitTestResult(TextLine textLine, CharacterHit characterHit, Point point)
+        {
+            var (x, y) = point;
+
+            var lastTrailingIndex = textLine.FirstTextSourceIndex + textLine.Length;
+
+            var isInside = x >= 0 && x <= textLine.Width && y >= 0 && y <= textLine.Height;
+
+            if (x >= textLine.Width && textLine.Length > 0 && textLine.NewLineLength > 0)
+            {
+                lastTrailingIndex -= textLine.NewLineLength;
+            }
+
+            var textPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+
+            var isTrailing = lastTrailingIndex == textPosition && characterHit.TrailingLength > 0 ||
+                             y > Bounds.Bottom;
+
+            if (textPosition == textLine.FirstTextSourceIndex + textLine.Length)
+            {
+                textPosition -= textLine.NewLineLength;
+            }
+
+            if (textLine.NewLineLength > 0 && textPosition + textLine.NewLineLength ==
+                characterHit.FirstCharacterIndex + characterHit.TrailingLength)
+            {
+                characterHit = new CharacterHit(characterHit.FirstCharacterIndex);
+            }
+
+            return new TextHitTestResult(characterHit, textPosition, isInside, isTrailing);
+        }
+
+        /// <summary>
+        /// Creates the default <see cref="TextParagraphProperties"/> that are used by the <see cref="TextFormatter"/>.
+        /// </summary>
+        /// <param name="typeface">The typeface.</param>
+        /// <param name="fontSize">The font size.</param>
+        /// <param name="foreground">The foreground.</param>
+        /// <param name="textAlignment">The text alignment.</param>
+        /// <param name="textWrapping">The text wrapping.</param>
+        /// <param name="textDecorations">The text decorations.</param>
+        /// <param name="flowDirection">The text flow direction.</param>
+        /// <param name="lineHeight">The height of each line of text.</param>
+        /// <returns></returns>
+        private static TextParagraphProperties CreateTextParagraphProperties(Typeface typeface, double fontSize,
+            IBrush? foreground, TextAlignment textAlignment, TextWrapping textWrapping,
+            TextDecorationCollection? textDecorations, FlowDirection flowDirection, double lineHeight)
+        {
+            var textRunStyle = new GenericTextRunProperties(typeface, fontSize, textDecorations, foreground);
+
+            return new GenericTextParagraphProperties(flowDirection, textAlignment, true, false,
+                textRunStyle, textWrapping, lineHeight, 0);
+        }
+
+        /// <summary>
+        /// Updates the current bounds.
+        /// </summary>
+        /// <param name="textLine">The text line.</param>
+        /// <param name="left">The current left.</param>
+        /// <param name="width">The current width.</param>
+        /// <param name="height">The current height.</param>
+        private static void UpdateBounds(TextLine textLine,ref double left,  ref double width, ref double height)
+        {
+            var lineWidth = textLine.WidthIncludingTrailingWhitespace;
+
+            if (width < lineWidth)
+            {
+                width = lineWidth;
+            }
+
+            if (left > textLine.Start)
+            {
+                left = textLine.Start;
+            }
+
+            height += textLine.Height;
+        }
+
+        private IReadOnlyList<TextLine> CreateTextLines()
+        {
+            if (MathUtilities.IsZero(MaxWidth) || MathUtilities.IsZero(MaxHeight))
+            {
+                var textLine = TextFormatterImpl.CreateEmptyTextLine(0, double.PositiveInfinity, _paragraphProperties);
+
+                Bounds = new Rect(0,0,0, textLine.Height);
+
+                return new List<TextLine> { textLine };
+            }
+
+            var textLines = new List<TextLine>();
+
+            double left = double.PositiveInfinity, width = 0.0, height = 0.0;
+
+            _textSourceLength = 0;
+
+            TextLine? previousLine = null;
+
+            while (true)
+            {
+                var textLine = TextFormatter.Current.FormatLine(_textSource, _textSourceLength, MaxWidth,
+                    _paragraphProperties, previousLine?.TextLineBreak);
+
+                if(textLine == null || textLine.Length == 0)
+                {
+                    if(previousLine != null && previousLine.NewLineLength  > 0)
+                    {
+                        var emptyTextLine = TextFormatterImpl.CreateEmptyTextLine(_textSourceLength, MaxWidth, _paragraphProperties);
+
+                        textLines.Add(emptyTextLine);
+
+                        UpdateBounds(emptyTextLine, ref left, ref width, ref height);
+                    }
+
+                    break;
+                }
+
+                _textSourceLength += textLine.Length;
+                
+                //Fulfill max height constraint
+                if (textLines.Count > 0 && !double.IsPositiveInfinity(MaxHeight) && height + textLine.Height > MaxHeight)
+                {
+                    if (previousLine?.TextLineBreak != null && _textTrimming != TextTrimming.None)
+                    {
+                        var collapsedLine =
+                            previousLine.Collapse(GetCollapsingProperties(MaxWidth));
+
+                        textLines[textLines.Count - 1] = collapsedLine;
+                    }
+
+                    break;
+                }
+
+                var hasOverflowed = textLine.HasOverflowed;
+
+                if (hasOverflowed && _textTrimming != TextTrimming.None)
+                {
+                    textLine = textLine.Collapse(GetCollapsingProperties(MaxWidth));
+                }
+
+                textLines.Add(textLine);
+
+                UpdateBounds(textLine, ref left, ref width, ref height);
+
+                previousLine = textLine;
+
+                //Fulfill max lines constraint
+                if (MaxLines > 0 && textLines.Count >= MaxLines)
+                {
+                    break;
+                }
+            }
+
+            //Make sure the TextLayout always contains at least on empty line
+            if(textLines.Count == 0)
+            {
+                var textLine = TextFormatterImpl.CreateEmptyTextLine(0, MaxWidth, _paragraphProperties);
+
+                textLines.Add(textLine);
+
+                UpdateBounds(textLine, ref left, ref width, ref height);
+            }
+
+            Bounds = new Rect(left, 0, width, height);
+
+            return textLines;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="TextCollapsingProperties"/> for current text trimming mode.
+        /// </summary>
+        /// <param name="width">The collapsing width.</param>
+        /// <returns>The <see cref="TextCollapsingProperties"/>.</returns>
+        private TextCollapsingProperties GetCollapsingProperties(double width)
+        {
+            return _textTrimming.CreateCollapsingProperties(new TextCollapsingCreateInfo(width, _paragraphProperties.DefaultTextRunProperties));
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs b/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs
new file mode 100644
index 0000000000..5a14eda245
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs
@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Ellipsis based on a fixed length leading prefix and suffix growing from the end at character granularity.
+    /// </summary>
+    public sealed class TextLeadingPrefixCharacterEllipsis : TextCollapsingProperties
+    {
+        private readonly int _prefixLength;
+
+        /// <summary>
+        /// Construct a text trailing word ellipsis collapsing properties.
+        /// </summary>
+        /// <param name="ellipsis">Text used as collapsing symbol.</param>
+        /// <param name="prefixLength">Length of leading prefix.</param>
+        /// <param name="width">width in which collapsing is constrained to</param>
+        /// <param name="textRunProperties">text run properties of ellipsis symbol</param>
+        public TextLeadingPrefixCharacterEllipsis(
+            ReadOnlySlice<char> ellipsis,
+            int prefixLength,
+            double width,
+            TextRunProperties textRunProperties)
+        {
+            if (_prefixLength < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(prefixLength));
+            }
+
+            _prefixLength = prefixLength;
+            Width = width;
+            Symbol = new TextCharacters(ellipsis, textRunProperties);
+        }
+
+        /// <inheritdoc/>
+        public override double Width { get; }
+
+        /// <inheritdoc/>
+        public override TextRun Symbol { get; }
+
+        public override List<DrawableTextRun>? Collapse(TextLine textLine)
+        {
+            if (textLine.TextRuns is not List<DrawableTextRun> textRuns || textRuns.Count == 0)
+            {
+                return null;
+            }
+
+            var runIndex = 0;
+            var currentWidth = 0.0;
+            var shapedSymbol = TextFormatterImpl.CreateSymbol(Symbol, FlowDirection.LeftToRight);
+
+            if (Width < shapedSymbol.GlyphRun.Size.Width)
+            {
+                return new List<DrawableTextRun>(0);
+            }
+
+            // Overview of ellipsis structure
+            // Prefix length run | Ellipsis symbol | Post split run growing from the end |
+            var availableWidth = Width - shapedSymbol.Size.Width;
+
+            while (runIndex < textRuns.Count)
+            {
+                var currentRun = textRuns[runIndex];
+
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedRun:
+                    {
+                        currentWidth += currentRun.Size.Width;
+
+                        if (currentWidth > availableWidth)
+                        {
+                            shapedRun.TryMeasureCharacters(availableWidth, out var measuredLength);
+
+                            var collapsedRuns = new List<DrawableTextRun>(textRuns.Count);
+
+                            if (measuredLength > 0)
+                            {
+                                List<DrawableTextRun>? preSplitRuns = null;
+                                List<DrawableTextRun>? postSplitRuns;
+
+                                if (_prefixLength > 0)
+                                {
+                                    var splitResult = TextFormatterImpl.SplitDrawableRuns(textRuns,
+                                        Math.Min(_prefixLength, measuredLength));
+
+                                    collapsedRuns.AddRange(splitResult.First);
+
+                                    preSplitRuns = splitResult.First;
+                                    postSplitRuns = splitResult.Second;
+                                }
+                                else
+                                {
+                                    postSplitRuns = textRuns;
+                                }
+
+                                collapsedRuns.Add(shapedSymbol);
+
+                                if (measuredLength <= _prefixLength || postSplitRuns is null)
+                                {
+                                    return collapsedRuns;
+                                }
+
+                                var availableSuffixWidth = availableWidth;
+
+                                if (preSplitRuns is not null)
+                                {
+                                    foreach (var run in preSplitRuns)
+                                    {
+                                        availableSuffixWidth -= run.Size.Width;
+                                    }
+                                }
+
+                                for (var i = postSplitRuns.Count - 1; i >= 0; i--)
+                                {
+                                    var run = postSplitRuns[i];
+
+                                    switch (run)
+                                    {
+                                        case ShapedTextCharacters endShapedRun:
+                                        {
+                                            if (endShapedRun.TryMeasureCharactersBackwards(availableSuffixWidth,
+                                                    out var suffixCount, out var suffixWidth))
+                                            {
+                                                availableSuffixWidth -= suffixWidth;
+
+                                                if (suffixCount > 0)
+                                                {
+                                                    var splitSuffix =
+                                                        endShapedRun.Split(run.TextSourceLength - suffixCount);
+
+                                                    collapsedRuns.Add(splitSuffix.Second!);
+                                                }
+                                            }
+
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                collapsedRuns.Add(shapedSymbol);
+                            }
+
+                            return collapsedRuns;
+                        }
+
+                        break;
+                    }
+                }
+
+                availableWidth -= currentRun.Size.Width;
+
+                runIndex++;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLine.cs b/src/Avalonia.Base/Media/TextFormatting/TextLine.cs
new file mode 100644
index 0000000000..1f69c15acc
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLine.cs
@@ -0,0 +1,241 @@
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Represents a line of text that is used for text rendering.
+    /// </summary>
+    public abstract class TextLine
+    {
+        /// <summary>
+        /// Gets the text runs that are contained within a line.
+        /// </summary>
+        /// <value>
+        /// The contained text runs.
+        /// </value>
+        public abstract IReadOnlyList<TextRun> TextRuns { get; }
+        
+        public abstract int FirstTextSourceIndex { get; }
+
+        public abstract int Length { get; }
+
+        /// <summary>
+        /// Gets the state of the line when broken by line breaking process.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="TextLineBreak"/> value that represents the line break.
+        /// </returns>
+        public abstract TextLineBreak? TextLineBreak { get; }
+
+        /// <summary>
+        /// Gets the distance from the top to the baseline of the current TextLine object.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="double"/> that represents the baseline distance.
+        /// </returns>
+        public abstract double Baseline { get; }
+
+        /// <summary>
+        /// Gets the distance from the top-most to bottom-most black pixel in a line.
+        /// </summary>
+        /// <returns>
+        /// A value that represents the extent distance.
+        /// </returns>
+        public abstract double Extent { get; }
+
+        /// <summary>
+        /// Gets a value that indicates whether the line is collapsed.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c>, if the line is collapsed; otherwise, <c>false</c>.
+        /// </returns>
+        public abstract bool HasCollapsed { get; }
+
+        /// <summary>
+        /// Gets a value that indicates whether content of the line overflows the specified paragraph width.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c>, it the line overflows the specified paragraph width; otherwise, <c>false</c>.
+        /// </returns>
+        public abstract bool HasOverflowed { get; }
+
+        /// <summary>
+        /// Gets the height of a line of text.
+        /// </summary>
+        /// <returns>
+        /// The text line height.
+        /// </returns>
+        public abstract double Height { get; }
+
+        /// <summary>
+        /// Gets the number of newline characters at the end of a line.
+        /// </summary>
+        /// <returns>
+        /// The number of newline characters.
+        /// </returns>
+        public abstract int NewLineLength { get; }
+        
+        /// <summary>
+        /// Gets the distance that black pixels extend beyond the bottom alignment edge of a line.
+        /// </summary>
+        /// <returns>
+        /// The overhang after distance.
+        /// </returns>
+        public abstract double OverhangAfter { get; }
+
+        /// <summary>
+        /// Gets the distance that black pixels extend prior to the left leading alignment edge of the line.
+        /// </summary>
+        /// <returns>
+        /// The overhang leading distance.
+        /// </returns>
+        public abstract double OverhangLeading { get; }
+
+        /// <summary>
+        /// Gets the distance that black pixels extend following the right trailing alignment edge of the line.
+        /// </summary>
+        /// <returns>
+        /// The overhang trailing distance.
+        /// </returns>
+        public abstract double OverhangTrailing { get; }
+
+        /// <summary>
+        /// Gets the distance from the start of a paragraph to the starting point of a line.
+        /// </summary>
+        /// <returns>
+        /// The distance from the start of a paragraph to the starting point of a line.
+        /// </returns>
+        public abstract double Start { get; }
+
+        /// <summary>
+        /// Gets the number of whitespace code points beyond the last non-blank character in a line.
+        /// </summary>
+        /// <returns>
+        /// The number of whitespace code points beyond the last non-blank character in a line.
+        /// </returns>
+        public abstract int TrailingWhitespaceLength { get; }
+
+        /// <summary>
+        /// Gets the width of a line of text, excluding trailing whitespace characters.
+        /// </summary>
+        /// <returns>
+        /// The text line width, excluding trailing whitespace characters.
+        /// </returns>
+        public abstract double Width { get; }
+
+        /// <summary>
+        /// Gets the width of a line of text, including trailing whitespace characters.
+        /// </summary>
+        /// <returns>
+        /// The text line width, including trailing whitespace characters.
+        /// </returns>
+        public abstract double WidthIncludingTrailingWhitespace { get; }
+
+        /// <summary>
+        /// Draws the <see cref="TextLine"/> at the given origin.
+        /// </summary>
+        /// <param name="drawingContext">The drawing context.</param>
+        /// <param name="lineOrigin"></param>
+        public abstract void Draw(DrawingContext drawingContext, Point lineOrigin);
+
+        /// <summary>
+        /// Create a collapsed line based on collapsed text properties.
+        /// </summary>
+        /// <param name="collapsingPropertiesList">A list of <see cref="TextCollapsingProperties"/>
+        /// objects that represent the collapsed text properties.</param>
+        /// <returns>
+        /// A <see cref="TextLine"/> value that represents a collapsed line that can be displayed.
+        /// </returns>
+        public abstract TextLine Collapse(params TextCollapsingProperties[] collapsingPropertiesList);
+
+        /// <summary>
+        /// Gets the character hit corresponding to the specified distance from the beginning of the line.
+        /// </summary>
+        /// <param name="distance">A <see cref="double"/> value that represents the distance from the beginning of the line.</param>
+        /// <returns>The <see cref="CharacterHit"/> object at the specified distance from the beginning of the line.</returns>
+        public abstract CharacterHit GetCharacterHitFromDistance(double distance);
+
+        /// <summary>
+        /// Gets the distance from the beginning of the line to the specified character hit.
+        /// <see cref="CharacterHit"/>.
+        /// </summary>
+        /// <param name="characterHit">The <see cref="CharacterHit"/> object whose distance you want to query.</param>
+        /// <returns>A <see cref="double"/> that represents the distance from the beginning of the line.</returns>
+        public abstract double GetDistanceFromCharacterHit(CharacterHit characterHit);
+
+        /// <summary>
+        /// Gets the next character hit for caret navigation.
+        /// </summary>
+        /// <param name="characterHit">The current <see cref="CharacterHit"/>.</param>
+        /// <returns>The next <see cref="CharacterHit"/>.</returns>
+        public abstract CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit);
+
+        /// <summary>
+        /// Gets the previous character hit for caret navigation.
+        /// </summary>
+        /// <param name="characterHit">The current <see cref="CharacterHit"/>.</param>
+        /// <returns>The previous <see cref="CharacterHit"/>.</returns>
+        public abstract CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit);
+
+        /// <summary>
+        /// Gets the previous character hit after backspacing.
+        /// </summary>
+        /// <param name="characterHit">The current <see cref="CharacterHit"/>.</param>
+        /// <returns>The <see cref="CharacterHit"/> after backspacing.</returns>
+        public abstract CharacterHit GetBackspaceCaretCharacterHit(CharacterHit characterHit);
+
+        /// <summary>
+        /// Get an array of bounding rectangles of a range of characters within a text line.
+        /// </summary>
+        /// <param name="firstTextSourceCharacterIndex">index of first character of specified range</param>
+        /// <param name="textLength">number of characters of the specified range</param>
+        /// <returns>an array of bounding rectangles.</returns>
+        public abstract IReadOnlyList<TextBounds> GetTextBounds(int firstTextSourceCharacterIndex, int textLength);
+        
+        /// <summary>
+        /// Gets the text line offset x.
+        /// </summary>
+        /// <param name="width">The line width.</param>
+        /// <param name="widthIncludingTrailingWhitespace">The paragraph width including whitespace.</param>
+        /// <param name="paragraphWidth">The paragraph width.</param>
+        /// <param name="textAlignment">The text alignment.</param>
+        /// <param name="flowDirection">The flow direction of the line.</param>
+        /// <returns>The paragraph offset.</returns>
+        internal static double GetParagraphOffsetX(double width, double widthIncludingTrailingWhitespace,
+            double paragraphWidth, TextAlignment textAlignment, FlowDirection flowDirection)
+        {
+            if (double.IsPositiveInfinity(paragraphWidth))
+            {
+                return 0;
+            }
+
+            if (flowDirection == FlowDirection.LeftToRight)
+            {
+                switch (textAlignment)
+                {
+                    case TextAlignment.Center:
+                        return Math.Max(0, (paragraphWidth - width) / 2);
+
+                    case TextAlignment.Right:
+                        return Math.Max(0, paragraphWidth - widthIncludingTrailingWhitespace);
+
+                    default:
+                        return 0;
+                }
+            }
+
+            switch (textAlignment)
+            {
+                case TextAlignment.Center:
+                    return Math.Max(0, (paragraphWidth - width) / 2);
+
+                case TextAlignment.Right:
+                    return 0;
+
+                default:
+                    return Math.Max(0, paragraphWidth - widthIncludingTrailingWhitespace);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineBreak.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineBreak.cs
new file mode 100644
index 0000000000..ce35e47fbd
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineBreak.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.TextFormatting
+{
+    public class TextLineBreak
+    {
+        public TextLineBreak(TextEndOfLine? textEndOfLine = null, FlowDirection flowDirection = FlowDirection.LeftToRight, 
+            IReadOnlyList<DrawableTextRun>? remainingRuns = null)
+        {
+            TextEndOfLine = textEndOfLine;
+            FlowDirection = flowDirection;
+            RemainingRuns = remainingRuns;
+        }
+
+        /// <summary>
+        /// Get the end of line run.
+        /// </summary>
+        public TextEndOfLine? TextEndOfLine { get; }
+
+        /// <summary>
+        /// Get the flow direction for remaining characters.
+        /// </summary>
+        public FlowDirection FlowDirection { get; }
+        
+        /// <summary>
+        /// Get the remaining runs that were split up by the <see cref="TextFormatter"/> during the formatting process.
+        /// </summary>
+        public IReadOnlyList<DrawableTextRun>? RemainingRuns { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
new file mode 100644
index 0000000000..8b5e2cc2ce
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -0,0 +1,1314 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    internal class TextLineImpl : TextLine
+    {
+        private readonly List<DrawableTextRun> _textRuns;
+        private readonly double _paragraphWidth;
+        private readonly TextParagraphProperties _paragraphProperties;
+        private TextLineMetrics _textLineMetrics;
+        private readonly FlowDirection _flowDirection;
+
+        public TextLineImpl(List<DrawableTextRun> textRuns, int firstTextSourceIndex, int length, double paragraphWidth,
+            TextParagraphProperties paragraphProperties, FlowDirection flowDirection = FlowDirection.LeftToRight,
+            TextLineBreak? lineBreak = null, bool hasCollapsed = false)
+        {
+            FirstTextSourceIndex = firstTextSourceIndex;
+            Length = length;
+            TextLineBreak = lineBreak;
+            HasCollapsed = hasCollapsed;
+
+            _textRuns = textRuns;
+            _paragraphWidth = paragraphWidth;
+            _paragraphProperties = paragraphProperties;
+
+            _flowDirection = flowDirection;
+        }
+
+        /// <inheritdoc/>
+        public override IReadOnlyList<TextRun> TextRuns => _textRuns;
+
+        /// <inheritdoc/>
+        public override int FirstTextSourceIndex { get; }
+
+        /// <inheritdoc/>
+        public override int Length { get; }
+
+        /// <inheritdoc/>
+        public override TextLineBreak? TextLineBreak { get; }
+
+        /// <inheritdoc/>
+        public override bool HasCollapsed { get; }
+
+        /// <inheritdoc/>
+        public override bool HasOverflowed => _textLineMetrics.HasOverflowed;
+
+        /// <inheritdoc/>
+        public override double Baseline => _textLineMetrics.TextBaseline;
+
+        /// <inheritdoc/>
+        public override double Extent => _textLineMetrics.Height;
+
+        /// <inheritdoc/>
+        public override double Height => _textLineMetrics.Height;
+
+        /// <inheritdoc/>
+        public override int NewLineLength => _textLineMetrics.NewLineLength;
+
+        /// <inheritdoc/>
+        public override double OverhangAfter => 0;
+
+        /// <inheritdoc/>
+        public override double OverhangLeading => 0;
+
+        /// <inheritdoc/>
+        public override double OverhangTrailing => 0;
+
+        /// <inheritdoc/>
+        public override int TrailingWhitespaceLength => _textLineMetrics.TrailingWhitespaceLength;
+
+        /// <inheritdoc/>
+        public override double Start => _textLineMetrics.Start;
+
+        /// <inheritdoc/>
+        public override double Width => _textLineMetrics.Width;
+
+        /// <inheritdoc/>
+        public override double WidthIncludingTrailingWhitespace => _textLineMetrics.WidthIncludingTrailingWhitespace;
+
+        /// <inheritdoc/>
+        public override void Draw(DrawingContext drawingContext, Point lineOrigin)
+        {
+            var (currentX, currentY) = lineOrigin;
+
+            foreach (var textRun in _textRuns)
+            {
+                var offsetY = GetBaselineOffset(this, textRun);
+
+                textRun.Draw(drawingContext, new Point(currentX, currentY + offsetY));
+
+                currentX += textRun.Size.Width;
+            }
+        }
+
+        private static double GetBaselineOffset(TextLine textLine, DrawableTextRun textRun)
+        {
+            var baseline = textRun.Baseline;
+            var baselineAlignment = textRun.Properties?.BaselineAlignment;
+
+            switch (baselineAlignment)
+            {
+                case BaselineAlignment.Top:
+                    return 0;
+                case BaselineAlignment.Center:
+                    return textLine.Height / 2 - textRun.Size.Height / 2;
+                case BaselineAlignment.Bottom:
+                    return textLine.Height - textRun.Size.Height;
+                case BaselineAlignment.Baseline:
+                case BaselineAlignment.TextTop:
+                case BaselineAlignment.TextBottom:
+                case BaselineAlignment.Subscript:
+                case BaselineAlignment.Superscript:
+                    return textLine.Baseline - baseline;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(baselineAlignment), baselineAlignment, null);
+            }
+        }
+
+        /// <inheritdoc/>
+        public override TextLine Collapse(params TextCollapsingProperties[] collapsingPropertiesList)
+        {
+            if (collapsingPropertiesList.Length == 0)
+            {
+                return this;
+            }
+
+            var collapsingProperties = collapsingPropertiesList[0];
+
+            var collapsedRuns = collapsingProperties.Collapse(this);
+
+            if (collapsedRuns is null)
+            {
+                return this;
+            }
+
+            var collapsedLine = new TextLineImpl(collapsedRuns, FirstTextSourceIndex, Length, _paragraphWidth, _paragraphProperties,
+                _flowDirection, TextLineBreak, true);
+
+            if (collapsedRuns.Count > 0)
+            {
+                collapsedLine.FinalizeLine();
+            }
+
+            return collapsedLine;
+
+        }
+
+        /// <inheritdoc/>
+        public override CharacterHit GetCharacterHitFromDistance(double distance)
+        {
+            if (_textRuns.Count == 0)
+            {
+                return new CharacterHit();
+            }
+
+            distance -= Start;
+
+            if (distance <= 0)
+            {
+                // hit happens before the line, return the first position
+                var firstRun = _textRuns[0];
+
+                if (firstRun is ShapedTextCharacters shapedTextCharacters)
+                {
+                    return shapedTextCharacters.GlyphRun.GetCharacterHitFromDistance(distance, out _);
+                }
+
+                return _flowDirection == FlowDirection.LeftToRight ?
+                    new CharacterHit(FirstTextSourceIndex) :
+                    new CharacterHit(FirstTextSourceIndex + Length);
+            }
+
+            // process hit that happens within the line
+            var characterHit = new CharacterHit();
+            var currentPosition = FirstTextSourceIndex;
+
+            foreach (var currentRun in _textRuns)
+            {
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedRun:
+                        {
+                            characterHit = shapedRun.GlyphRun.GetCharacterHitFromDistance(distance, out _);
+
+                            var offset = Math.Max(0, currentPosition - shapedRun.Text.Start);
+
+                            characterHit = new CharacterHit(characterHit.FirstCharacterIndex + offset, characterHit.TrailingLength);
+
+                            break;
+                        }
+                    default:
+                        {
+                            if (distance < currentRun.Size.Width / 2)
+                            {
+                                characterHit = new CharacterHit(currentPosition);
+                            }
+                            else
+                            {
+                                characterHit = new CharacterHit(currentPosition, currentRun.TextSourceLength);
+                            }
+                            break;
+                        }
+                }
+
+                if (distance <= currentRun.Size.Width)
+                {
+                    break;
+                }
+
+                distance -= currentRun.Size.Width;
+                currentPosition += currentRun.TextSourceLength;
+            }
+
+            return characterHit;
+        }
+
+        /// <inheritdoc/>
+        public override double GetDistanceFromCharacterHit(CharacterHit characterHit)
+        {
+            var isTrailingHit = characterHit.TrailingLength > 0;
+            var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+            var currentDistance = Start;
+            var currentPosition = FirstTextSourceIndex;
+            var remainingLength = characterIndex - FirstTextSourceIndex;
+
+            GlyphRun? lastRun = null;
+
+            for (var index = 0; index < _textRuns.Count; index++)
+            {
+                var textRun = _textRuns[index];
+
+                switch (textRun)
+                {
+                    case ShapedTextCharacters shapedTextCharacters:
+                        {
+                            var currentRun = shapedTextCharacters.GlyphRun;
+
+                            if (lastRun != null)
+                            {
+                                if (!lastRun.IsLeftToRight && currentRun.IsLeftToRight &&
+                                    currentRun.Characters.Start == characterHit.FirstCharacterIndex &&
+                                    characterHit.TrailingLength == 0)
+                                {
+                                    return currentDistance;
+                                }
+                            }
+
+                            //Look for a hit in within the current run
+                            if (currentPosition + remainingLength <= currentPosition + textRun.Text.Length)
+                            {
+                                characterHit = new CharacterHit(textRun.Text.Start + remainingLength);
+
+                                var distance = currentRun.GetDistanceFromCharacterHit(characterHit);
+
+                                return currentDistance + distance;
+                            }
+
+                            //Look at the left and right edge of the current run
+                            if (currentRun.IsLeftToRight)
+                            {
+                                if (_flowDirection == FlowDirection.LeftToRight && (lastRun == null || lastRun.IsLeftToRight))
+                                {
+                                    if (characterIndex <= currentPosition)
+                                    {
+                                        return currentDistance;
+                                    }
+                                }
+                                else
+                                {
+                                    if (characterIndex == currentPosition)
+                                    {
+                                        return currentDistance;
+                                    }
+                                }
+
+                                if (characterIndex == currentPosition + textRun.Text.Length && isTrailingHit)
+                                {
+                                    return currentDistance + currentRun.Size.Width;
+                                }
+                            }
+                            else
+                            {
+                                if (characterIndex == currentPosition)
+                                {
+                                    return currentDistance + currentRun.Size.Width;
+                                }
+
+                                var nextRun = index + 1 < _textRuns.Count ?
+                                    _textRuns[index + 1] as ShapedTextCharacters :
+                                    null;
+
+                                if (nextRun != null)
+                                {
+                                    if (nextRun.ShapedBuffer.IsLeftToRight)
+                                    {
+                                        if (characterIndex == currentPosition + textRun.Text.Length)
+                                        {
+                                            return currentDistance;
+                                        }
+                                    }
+                                    else
+                                    {
+                                        if (currentPosition + nextRun.Text.Length == characterIndex)
+                                        {
+                                            return currentDistance;
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    if (characterIndex > currentPosition + textRun.Text.Length)
+                                    {
+                                        return currentDistance;
+                                    }
+                                }
+                            }
+
+                            lastRun = currentRun;
+
+                            break;
+                        }
+                    default:
+                        {
+                            if (characterIndex == currentPosition)
+                            {
+                                return currentDistance;
+                            }
+
+                            if (characterIndex == currentPosition + textRun.TextSourceLength)
+                            {
+                                return currentDistance + textRun.Size.Width;
+                            }
+
+                            break;
+                        }
+                }
+
+                //No hit hit found so we add the full width
+                currentDistance += textRun.Size.Width;
+                currentPosition += textRun.TextSourceLength;
+                remainingLength -= textRun.TextSourceLength;
+
+                if (remainingLength <= 0)
+                {
+                    break;
+                }
+            }
+
+            return currentDistance;
+        }
+
+        /// <inheritdoc/>
+        public override CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit)
+        {
+            if (_textRuns.Count == 0)
+            {
+                return new CharacterHit();
+            }
+
+            if (TryFindNextCharacterHit(characterHit, out var nextCharacterHit))
+            {
+                return nextCharacterHit;
+            }
+
+            var lastTextPosition = FirstTextSourceIndex + Length;
+
+            // Can't move, we're after the last character
+            var runIndex = GetRunIndexAtCharacterIndex(lastTextPosition, LogicalDirection.Forward, out var currentPosition);
+
+            var currentRun = _textRuns[runIndex];
+
+            switch (currentRun)
+            {
+                case ShapedTextCharacters shapedRun:
+                    {
+                        characterHit = shapedRun.GlyphRun.GetNextCaretCharacterHit(characterHit);
+                        break;
+                    }
+                default:
+                    {
+                        characterHit = new CharacterHit(currentPosition + currentRun.TextSourceLength);
+                        break;
+                    }
+            }
+
+            return characterHit;
+        }
+
+        /// <inheritdoc/>
+        public override CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit)
+        {
+            if (TryFindPreviousCharacterHit(characterHit, out var previousCharacterHit))
+            {
+                return previousCharacterHit;
+            }
+
+            if (characterHit.FirstCharacterIndex <= FirstTextSourceIndex)
+            {
+                characterHit = new CharacterHit(FirstTextSourceIndex);
+            }
+
+            return characterHit; // Can't move, we're before the first character
+        }
+
+        /// <inheritdoc/>
+        public override CharacterHit GetBackspaceCaretCharacterHit(CharacterHit characterHit)
+        {
+            // same operation as move-to-previous
+            return GetPreviousCaretCharacterHit(characterHit);
+        }
+
+        private IReadOnlyList<TextBounds> GetTextBoundsLeftToRight(int firstTextSourceIndex, int textLength)
+        {
+            var characterIndex = firstTextSourceIndex + textLength;
+
+            var result = new List<TextBounds>(TextRuns.Count);
+            var lastDirection = FlowDirection.LeftToRight;
+            var currentDirection = lastDirection;
+
+            var currentPosition = FirstTextSourceIndex;
+            var remainingLength = textLength;
+
+            var startX = Start;
+            double currentWidth = 0;
+            var currentRect = Rect.Empty;
+
+            for (var index = 0; index < TextRuns.Count; index++)
+            {
+                if (TextRuns[index] is not DrawableTextRun currentRun)
+                {
+                    continue;
+                }
+
+                if (currentPosition + currentRun.TextSourceLength <= firstTextSourceIndex)
+                {
+                    startX += currentRun.Size.Width;
+
+                    currentPosition += currentRun.TextSourceLength;
+
+                    continue;
+                }
+
+                var characterLength = 0;
+                var endX = startX;
+
+                if (currentRun is ShapedTextCharacters currentShapedRun)
+                {
+                    var offset = Math.Max(0, firstTextSourceIndex - currentPosition);
+
+                    currentPosition += offset;
+
+                    var startIndex = currentRun.Text.Start + offset;
+
+                    var endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(
+                       currentShapedRun.ShapedBuffer.IsLeftToRight ?
+                            new CharacterHit(startIndex + remainingLength) :
+                            new CharacterHit(startIndex));
+
+                    endX += endOffset;
+
+                    var startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(
+                        currentShapedRun.ShapedBuffer.IsLeftToRight ?
+                            new CharacterHit(startIndex) :
+                            new CharacterHit(startIndex + remainingLength));
+
+                    startX += startOffset;
+
+                    var endHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _);
+                    var startHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(startOffset, out _);
+
+                    characterLength = Math.Abs(endHit.FirstCharacterIndex + endHit.TrailingLength - startHit.FirstCharacterIndex - startHit.TrailingLength);
+
+                    currentDirection = currentShapedRun.ShapedBuffer.IsLeftToRight ?
+                        FlowDirection.LeftToRight :
+                        FlowDirection.RightToLeft;
+                }
+                else
+                {
+                    if (currentPosition < firstTextSourceIndex)
+                    {
+                        startX += currentRun.Size.Width;
+                    }
+
+                    if (currentPosition + currentRun.TextSourceLength <= characterIndex)
+                    {
+                        endX += currentRun.Size.Width;
+
+                        characterLength = currentRun.TextSourceLength;
+                    }
+                }
+
+                if (endX < startX)
+                {
+                    (endX, startX) = (startX, endX);
+                }
+
+                //Lines that only contain a linebreak need to be covered here
+                if(characterLength == 0)
+                {
+                    characterLength = NewLineLength;
+                }
+
+                var runwidth = endX - startX;
+                var currentRunBounds = new TextRunBounds(new Rect(startX, 0, runwidth, Height), currentPosition, characterLength, currentRun);
+
+                if (lastDirection == currentDirection && result.Count > 0 && MathUtilities.AreClose(currentRect.Right, startX))
+                {
+                    currentRect = currentRect.WithWidth(currentWidth + runwidth);
+
+                    var textBounds = result[result.Count - 1];
+
+                    textBounds.Rectangle = currentRect;
+
+                    textBounds.TextRunBounds.Add(currentRunBounds);
+                }
+                else
+                {
+                    currentRect = currentRunBounds.Rectangle;
+
+                    result.Add(new TextBounds(currentRect, currentDirection, new List<TextRunBounds> { currentRunBounds }));
+                }
+
+                currentWidth += runwidth;
+                currentPosition += characterLength;
+
+                if (currentDirection == FlowDirection.LeftToRight)
+                {
+                    if (currentPosition > characterIndex)
+                    {
+                        break;
+                    }
+                }
+                else
+                {
+                    if (currentPosition <= firstTextSourceIndex)
+                    {
+                        break;
+                    }
+                }
+
+                startX = endX;
+                lastDirection = currentDirection;
+                remainingLength -= characterLength;
+
+                if (remainingLength <= 0)
+                {
+                    break;
+                }
+            }
+
+            return result;
+        }
+
+        private IReadOnlyList<TextBounds> GetTextBoundsRightToLeft(int firstTextSourceIndex, int textLength)
+        {
+            var characterIndex = firstTextSourceIndex + textLength;
+
+            var result = new List<TextBounds>(TextRuns.Count);
+            var lastDirection = FlowDirection.LeftToRight;
+            var currentDirection = lastDirection;
+
+            var currentPosition = FirstTextSourceIndex;
+            var remainingLength = textLength;
+
+            var startX = Start + WidthIncludingTrailingWhitespace;
+            double currentWidth = 0;
+            var currentRect = Rect.Empty;
+
+            for (var index = TextRuns.Count - 1; index >= 0; index--)
+            {
+                if (TextRuns[index] is not DrawableTextRun currentRun)
+                {
+                    continue;
+                }
+
+                if (currentPosition + currentRun.TextSourceLength <= firstTextSourceIndex)
+                {
+                    startX -= currentRun.Size.Width;
+
+                    currentPosition += currentRun.TextSourceLength;
+
+                    continue;
+                }
+
+                var characterLength = 0;
+                var endX = startX;
+
+                if (currentRun is ShapedTextCharacters currentShapedRun)
+                {
+                    var offset = Math.Max(0, firstTextSourceIndex - currentPosition);
+
+                    currentPosition += offset;
+
+                    var startIndex = currentRun.Text.Start + offset;
+
+                    var endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(
+                        currentShapedRun.ShapedBuffer.IsLeftToRight ?
+                            new CharacterHit(startIndex + remainingLength) :
+                            new CharacterHit(startIndex));
+
+                    endX += endOffset - currentShapedRun.Size.Width;
+
+                    var startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(
+                        currentShapedRun.ShapedBuffer.IsLeftToRight ?
+                            new CharacterHit(startIndex) :
+                            new CharacterHit(startIndex + remainingLength));
+
+                    startX += startOffset - currentShapedRun.Size.Width;
+
+                    var endHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _);
+                    var startHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(startOffset, out _);
+
+                    characterLength = Math.Abs(startHit.FirstCharacterIndex + startHit.TrailingLength - endHit.FirstCharacterIndex - endHit.TrailingLength);
+
+                    currentDirection = currentShapedRun.ShapedBuffer.IsLeftToRight ?
+                        FlowDirection.LeftToRight :
+                        FlowDirection.RightToLeft;
+                }
+                else
+                {
+                    if (currentPosition + currentRun.TextSourceLength <= characterIndex)
+                    {
+                        endX -= currentRun.Size.Width;
+                    }
+
+                    if (currentPosition < firstTextSourceIndex)
+                    {
+                        startX -= currentRun.Size.Width;
+
+                        characterLength = currentRun.TextSourceLength;
+                    }
+                }
+
+                if (endX < startX)
+                {
+                    (endX, startX) = (startX, endX);
+                }
+
+                //Lines that only contain a linebreak need to be covered here
+                if (characterLength == 0)
+                {
+                    characterLength = NewLineLength;
+                }
+
+                var runWidth = endX - startX;
+                var currentRunBounds = new TextRunBounds(new Rect(startX, 0, runWidth, Height), currentPosition, characterLength, currentRun);
+
+                if (lastDirection == currentDirection && result.Count > 0 && MathUtilities.AreClose(currentRect.Right, startX))
+                {
+                    currentRect = currentRect.WithWidth(currentWidth + runWidth);
+
+                    var textBounds = result[result.Count - 1];
+
+                    textBounds.Rectangle = currentRect;
+
+                    textBounds.TextRunBounds.Add(currentRunBounds);
+                }
+                else
+                {
+                    currentRect = currentRunBounds.Rectangle;
+
+                    result.Add(new TextBounds(currentRect, currentDirection, new List<TextRunBounds> { currentRunBounds }));
+                }
+
+                currentWidth += runWidth;
+                currentPosition += characterLength;
+
+                if (currentDirection == FlowDirection.LeftToRight)
+                {
+                    if (currentPosition > characterIndex)
+                    {
+                        break;
+                    }
+                }
+                else
+                {
+                    if (currentPosition <= firstTextSourceIndex)
+                    {
+                        break;
+                    }
+                }
+
+                lastDirection = currentDirection;
+                remainingLength -= characterLength;
+
+                if (remainingLength <= 0)
+                {
+                    break;
+                }
+            }
+
+            return result;
+        }
+
+        public override IReadOnlyList<TextBounds> GetTextBounds(int firstTextSourceIndex, int textLength)
+        {
+            if (_paragraphProperties.FlowDirection == FlowDirection.LeftToRight)
+            {
+                return GetTextBoundsLeftToRight(firstTextSourceIndex, textLength);
+            }
+
+            return GetTextBoundsRightToLeft(firstTextSourceIndex, textLength);
+        }
+
+        public TextLineImpl FinalizeLine()
+        {
+            _textLineMetrics = CreateLineMetrics();
+
+            BidiReorder();
+
+            return this;
+        }
+
+        private static sbyte GetRunBidiLevel(DrawableTextRun run, FlowDirection flowDirection)
+        {
+            if (run is ShapedTextCharacters shapedTextCharacters)
+            {
+                return shapedTextCharacters.BidiLevel;
+            }
+
+            var defaultLevel = flowDirection == FlowDirection.LeftToRight ? 0 : 1;
+
+            return (sbyte)defaultLevel;
+        }
+
+        private void BidiReorder()
+        {
+            if (_textRuns.Count == 0)
+            {
+                return;
+            }
+
+            // Build up the collection of ordered runs.
+            var run = _textRuns[0];
+
+            OrderedBidiRun orderedRun = new(run, GetRunBidiLevel(run, _flowDirection));
+
+            var current = orderedRun;
+
+            for (var i = 1; i < _textRuns.Count; i++)
+            {
+                run = _textRuns[i];
+
+                current.Next = new OrderedBidiRun(run, GetRunBidiLevel(run, _flowDirection));
+
+                current = current.Next;
+            }
+
+            // Reorder them into visual order.
+            orderedRun = LinearReOrder(orderedRun);
+
+            // Now perform a recursive reversal of each run.
+            // From the highest level found in the text to the lowest odd level on each line, including intermediate levels
+            // not actually present in the text, reverse any contiguous sequence of characters that are at that level or higher.
+            // https://unicode.org/reports/tr9/#L2
+            sbyte max = 0;
+            var min = sbyte.MaxValue;
+
+            for (var i = 0; i < _textRuns.Count; i++)
+            {
+                var currentRun = _textRuns[i];
+
+                var level = GetRunBidiLevel(currentRun, _flowDirection);
+
+                if (level > max)
+                {
+                    max = level;
+                }
+
+                if ((level & 1) != 0 && level < min)
+                {
+                    min = level;
+                }
+            }
+
+            if (min > max)
+            {
+                min = max;
+            }
+
+            if (max == 0 || (min == max && (max & 1) == 0))
+            {
+                // Nothing to reverse.
+                return;
+            }
+
+            // Now apply the reversal and replace the original contents.
+            var minLevelToReverse = max;
+
+            while (minLevelToReverse >= min)
+            {
+                current = orderedRun;
+
+                while (current != null)
+                {
+                    if (current.Level >= minLevelToReverse && current.Level % 2 != 0)
+                    {
+                        if (current.Run is ShapedTextCharacters { IsReversed: false } shapedTextCharacters)
+                        {
+                            shapedTextCharacters.Reverse();
+                        }
+                    }
+
+                    current = current.Next;
+                }
+
+                minLevelToReverse--;
+            }
+
+            _textRuns.Clear();
+
+            current = orderedRun;
+
+            while (current != null)
+            {
+                _textRuns.Add(current.Run);
+
+                current = current.Next;
+            }
+        }
+
+        /// <summary>
+        /// Reorders a series of runs from logical to visual order, returning the left most run.
+        /// <see href="https://github.com/fribidi/linear-reorder/blob/f2f872257d4d8b8e137fcf831f254d6d4db79d3c/linear-reorder.c"/>
+        /// </summary>
+        /// <param name="run">The ordered bidi run.</param>
+        /// <returns>The <see cref="OrderedBidiRun"/>.</returns>
+        private static OrderedBidiRun LinearReOrder(OrderedBidiRun? run)
+        {
+            BidiRange? range = null;
+
+            while (run != null)
+            {
+                var next = run.Next;
+
+                while (range != null && range.Level > run.Level
+                    && range.Previous != null && range.Previous.Level >= run.Level)
+                {
+                    range = BidiRange.MergeWithPrevious(range);
+                }
+
+                if (range != null && range.Level >= run.Level)
+                {
+                    // Attach run to the range.
+                    if ((run.Level & 1) != 0)
+                    {
+                        // Odd, range goes to the right of run.
+                        run.Next = range.Left;
+                        range.Left = run;
+                    }
+                    else
+                    {
+                        // Even, range goes to the left of run.
+                        range.Right!.Next = run;
+                        range.Right = run;
+                    }
+
+                    range.Level = run.Level;
+                }
+                else
+                {
+                    var r = new BidiRange();
+
+                    r.Left = r.Right = run;
+                    r.Level = run.Level;
+                    r.Previous = range;
+
+                    range = r;
+                }
+
+                run = next;
+            }
+
+            while (range?.Previous != null)
+            {
+                range = BidiRange.MergeWithPrevious(range);
+            }
+
+            // Terminate.
+            range!.Right!.Next = null;
+
+            return range.Left!;
+        }
+
+        /// <summary>
+        /// Tries to find the next character hit.
+        /// </summary>
+        /// <param name="characterHit">The current character hit.</param>
+        /// <param name="nextCharacterHit">The next character hit.</param>
+        /// <returns></returns>
+        private bool TryFindNextCharacterHit(CharacterHit characterHit, out CharacterHit nextCharacterHit)
+        {
+            nextCharacterHit = characterHit;
+
+            var codepointIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+            var lastCodepointIndex = FirstTextSourceIndex + Length;
+
+            if (codepointIndex >= lastCodepointIndex)
+            {
+                return false; // Cannot go forward anymore
+            }
+
+            if (codepointIndex < FirstTextSourceIndex)
+            {
+                codepointIndex = FirstTextSourceIndex;
+            }
+
+            var runIndex = GetRunIndexAtCharacterIndex(codepointIndex, LogicalDirection.Forward, out var currentPosition);
+
+            while (runIndex < _textRuns.Count)
+            {
+                var currentRun = _textRuns[runIndex];
+
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedRun:
+                        {
+                            var foundCharacterHit = shapedRun.GlyphRun.FindNearestCharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength, out _);
+
+                            var isAtEnd = foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength == FirstTextSourceIndex + Length;
+
+                            if (isAtEnd && !shapedRun.GlyphRun.IsLeftToRight)
+                            {
+                                nextCharacterHit = foundCharacterHit;
+
+                                return true;
+                            }
+
+                            var characterIndex = codepointIndex - shapedRun.Text.Start;
+
+                            if (characterIndex < 0 && shapedRun.ShapedBuffer.IsLeftToRight)
+                            {
+                                foundCharacterHit = new CharacterHit(foundCharacterHit.FirstCharacterIndex);
+                            }
+
+                            nextCharacterHit = isAtEnd || characterHit.TrailingLength != 0 ?
+                                foundCharacterHit :
+                                new CharacterHit(foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength);
+
+                            if (isAtEnd || nextCharacterHit.FirstCharacterIndex > characterHit.FirstCharacterIndex)
+                            {
+                                return true;
+                            }
+
+                            break;
+                        }
+                    default:
+                        {
+                            var textPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+
+                            if (textPosition == currentPosition)
+                            {
+                                nextCharacterHit = new CharacterHit(currentPosition + currentRun.TextSourceLength);
+
+                                return true;
+                            }
+
+                            break;
+                        }
+                }
+
+                currentPosition += currentRun.TextSourceLength;
+                runIndex++;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Tries to find the previous character hit.
+        /// </summary>
+        /// <param name="characterHit">The current character hit.</param>
+        /// <param name="previousCharacterHit">The previous character hit.</param>
+        /// <returns></returns>
+        private bool TryFindPreviousCharacterHit(CharacterHit characterHit, out CharacterHit previousCharacterHit)
+        {
+            var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+
+            if (characterIndex == FirstTextSourceIndex)
+            {
+                previousCharacterHit = new CharacterHit(FirstTextSourceIndex);
+
+                return true;
+            }
+
+            previousCharacterHit = characterHit;
+
+            if (characterIndex < FirstTextSourceIndex)
+            {
+                return false; // Cannot go backward anymore.
+            }
+
+            var runIndex = GetRunIndexAtCharacterIndex(characterIndex, LogicalDirection.Backward, out var currentPosition);
+
+            while (runIndex >= 0)
+            {
+                var currentRun = _textRuns[runIndex];
+
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedRun:
+                        {
+                            var foundCharacterHit = shapedRun.GlyphRun.FindNearestCharacterHit(characterHit.FirstCharacterIndex - 1, out _);
+
+                            if (foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength < characterIndex)
+                            {
+                                previousCharacterHit = foundCharacterHit;
+
+                                return true;
+                            }
+
+                            var previousPosition = foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength;
+
+                            if (foundCharacterHit.TrailingLength > 0 && previousPosition == characterIndex)
+                            {
+                                previousCharacterHit = new CharacterHit(foundCharacterHit.FirstCharacterIndex);
+                            }
+
+                            if (previousCharacterHit != characterHit)
+                            {
+                                return true;
+                            }
+
+                            break;
+                        }
+                    default:
+                        {
+                            if (characterIndex == currentPosition + currentRun.TextSourceLength)
+                            {
+                                previousCharacterHit = new CharacterHit(currentPosition);
+
+                                return true;
+                            }
+
+                            break;
+                        }
+                }
+
+                currentPosition -= currentRun.TextSourceLength;
+                runIndex--;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Gets the run index of the specified codepoint index.
+        /// </summary>
+        /// <param name="codepointIndex">The codepoint index.</param>
+        /// <param name="direction">The logical direction.</param>
+        /// <param name="textPosition">The text position of the found run index.</param>
+        /// <returns>The text run index.</returns>
+        private int GetRunIndexAtCharacterIndex(int codepointIndex, LogicalDirection direction, out int textPosition)
+        {
+            var runIndex = 0;
+            textPosition = FirstTextSourceIndex;
+            DrawableTextRun? previousRun = null;
+
+            while (runIndex < _textRuns.Count)
+            {
+                var currentRun = _textRuns[runIndex];
+
+                switch (currentRun)
+                {
+                    case ShapedTextCharacters shapedRun:
+                        {
+                            if (previousRun is ShapedTextCharacters previousShaped && !previousShaped.ShapedBuffer.IsLeftToRight)
+                            {
+                                if (shapedRun.ShapedBuffer.IsLeftToRight)
+                                {
+                                    if (currentRun.Text.Start >= codepointIndex)
+                                    {
+                                        return --runIndex;
+                                    }
+                                }
+                                else
+                                {
+                                    if (codepointIndex > currentRun.Text.Start + currentRun.Text.Length)
+                                    {
+                                        return --runIndex;
+                                    }
+                                }
+                            }
+
+                            if (direction == LogicalDirection.Forward)
+                            {
+                                if (codepointIndex >= currentRun.Text.Start && codepointIndex <= currentRun.Text.End)
+                                {
+                                    return runIndex;
+                                }
+                            }
+                            else
+                            {
+                                if (codepointIndex > currentRun.Text.Start &&
+                                    codepointIndex <= currentRun.Text.Start + currentRun.Text.Length)
+                                {
+                                    return runIndex;
+                                }
+                            }
+
+                            if (runIndex + 1 >= _textRuns.Count)
+                            {
+                                return runIndex;
+                            }
+
+                            break;
+                        }
+
+                    default:
+                        {
+                            if (codepointIndex == textPosition)
+                            {
+                                return runIndex;
+                            }
+
+                            if (runIndex + 1 >= _textRuns.Count)
+                            {
+                                return runIndex;
+                            }
+
+                            break;
+                        }
+                }
+
+                runIndex++;
+                previousRun = currentRun;
+                textPosition += currentRun.TextSourceLength;
+            }
+
+            return runIndex;
+        }
+
+        private TextLineMetrics CreateLineMetrics()
+        {
+            var glyphTypeface = _paragraphProperties.DefaultTextRunProperties.Typeface.GlyphTypeface;
+            var fontRenderingEmSize = _paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize;
+            var scale = fontRenderingEmSize / glyphTypeface.DesignEmHeight;
+
+            var width = 0d;
+            var widthIncludingWhitespace = 0d;
+            var trailingWhitespaceLength = 0;
+            var newLineLength = 0;
+            var ascent = glyphTypeface.Ascent * scale;
+            var descent = glyphTypeface.Descent * scale;
+            var lineGap = glyphTypeface.LineGap * scale;
+
+            var height = descent - ascent + lineGap;
+
+            var lineHeight = _paragraphProperties.LineHeight;
+
+            for (var index = 0; index < _textRuns.Count; index++)
+            {
+                switch (_textRuns[index])
+                {
+                    case ShapedTextCharacters textRun:
+                        {
+                            var fontMetrics =
+                                new FontMetrics(textRun.Properties.Typeface, textRun.Properties.FontRenderingEmSize);
+
+                            if (fontRenderingEmSize < textRun.Properties.FontRenderingEmSize)
+                            {
+                                fontRenderingEmSize = textRun.Properties.FontRenderingEmSize;
+
+                                if (ascent > fontMetrics.Ascent)
+                                {
+                                    ascent = fontMetrics.Ascent;
+                                }
+
+                                if (descent < fontMetrics.Descent)
+                                {
+                                    descent = fontMetrics.Descent;
+                                }
+
+                                if (lineGap < fontMetrics.LineGap)
+                                {
+                                    lineGap = fontMetrics.LineGap;
+                                }
+
+                                if (descent - ascent + lineGap > height)
+                                {
+                                    height = descent - ascent + lineGap;
+                                }
+                            }
+
+                            if (index == _textRuns.Count - 1)
+                            {
+                                width = widthIncludingWhitespace + textRun.GlyphRun.Metrics.Width;
+                                trailingWhitespaceLength = textRun.GlyphRun.Metrics.TrailingWhitespaceLength;
+                                newLineLength = textRun.GlyphRun.Metrics.NewlineLength;
+                            }
+
+                            widthIncludingWhitespace += textRun.GlyphRun.Metrics.WidthIncludingTrailingWhitespace;
+
+                            break;
+                        }
+
+                    case { } drawableTextRun:
+                        {
+                            widthIncludingWhitespace += drawableTextRun.Size.Width;
+
+                            switch (_paragraphProperties.FlowDirection)
+                            {
+                                case FlowDirection.LeftToRight:
+                                    {
+                                        if (index == _textRuns.Count - 1)
+                                        {
+                                            width = widthIncludingWhitespace;
+                                            trailingWhitespaceLength = 0;
+                                            newLineLength = 0;
+                                        }
+
+                                        break;
+                                    }
+
+                                case FlowDirection.RightToLeft:
+                                    {
+                                        if (index == _textRuns.Count - 1)
+                                        {
+                                            width = widthIncludingWhitespace;
+                                            trailingWhitespaceLength = 0;
+                                            newLineLength = 0;
+                                        }
+
+                                        break;
+                                    }
+                            }
+
+                            if (drawableTextRun.Size.Height > height)
+                            {
+                                height = drawableTextRun.Size.Height;
+                            }
+
+                            if (ascent > -drawableTextRun.Baseline)
+                            {
+                                ascent = -drawableTextRun.Baseline;
+                            }
+
+                            break;
+                        }
+                }
+            }
+
+            var start = GetParagraphOffsetX(width, widthIncludingWhitespace, _paragraphWidth,
+                _paragraphProperties.TextAlignment, _paragraphProperties.FlowDirection);
+
+            if (!double.IsNaN(lineHeight) && !MathUtilities.IsZero(lineHeight))
+            {
+                if (lineHeight > height)
+                {
+                    height = lineHeight;
+                }
+            }
+
+            return new TextLineMetrics(widthIncludingWhitespace > _paragraphWidth, height, newLineLength, start,
+                -ascent, trailingWhitespaceLength, width, widthIncludingWhitespace);
+        }
+
+        private sealed class OrderedBidiRun
+        {
+            public OrderedBidiRun(DrawableTextRun run, sbyte level)
+            {
+                Run = run;
+                Level = level;
+            }
+
+            public sbyte Level { get; }
+
+            public DrawableTextRun Run { get; }
+
+            public OrderedBidiRun? Next { get; set; }
+        }
+
+        private sealed class BidiRange
+        {
+            public int Level { get; set; }
+
+            public OrderedBidiRun? Left { get; set; }
+
+            public OrderedBidiRun? Right { get; set; }
+
+            public BidiRange? Previous { get; set; }
+
+            public static BidiRange MergeWithPrevious(BidiRange range)
+            {
+                var previous = range.Previous;
+
+                BidiRange left;
+                BidiRange right;
+
+                if ((previous!.Level & 1) != 0)
+                {
+                    // Odd, previous goes to the right of range.
+                    left = range;
+                    right = previous;
+                }
+                else
+                {
+                    // Even, previous goes to the left of range.
+                    left = previous;
+                    right = range;
+                }
+
+                // Stitch them
+                left.Right!.Next = right.Left;
+                previous.Left = left.Left;
+                previous.Right = right.Right;
+
+                return previous;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLineMetrics.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineMetrics.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/TextLineMetrics.cs
rename to src/Avalonia.Base/Media/TextFormatting/TextLineMetrics.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextParagraphProperties.cs b/src/Avalonia.Base/Media/TextFormatting/TextParagraphProperties.cs
new file mode 100644
index 0000000000..82a0ba14d8
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextParagraphProperties.cs
@@ -0,0 +1,75 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Provides a set of properties that are used during the paragraph layout.
+    /// </summary>
+    public abstract class TextParagraphProperties
+    {
+        /// <summary>
+        /// This property specifies whether the primary text advance 
+        /// direction shall be left-to-right, right-to-left.
+        /// </summary>
+        public abstract FlowDirection FlowDirection { get; }
+
+        /// <summary>
+        /// Gets the text alignment.
+        /// </summary>
+        public abstract TextAlignment TextAlignment { get; }
+
+        /// <summary>
+        /// Paragraph's line height
+        /// </summary>
+        public abstract double LineHeight { get; }
+
+        /// <summary>
+        /// Indicates the first line of the paragraph.
+        /// </summary>
+        public abstract bool FirstLineInParagraph { get; }
+
+        /// <summary>
+        /// If true, the formatted line may always be collapsed. If false (the default),
+        /// only lines that overflow the paragraph width are collapsed.
+        /// </summary>
+        public virtual bool AlwaysCollapsible
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Gets the default text style.
+        /// </summary>
+        public abstract TextRunProperties DefaultTextRunProperties { get; }
+
+        /// <summary>
+        /// If not null, text decorations to apply to all runs in the line. This is in addition
+        /// to any text decorations specified by the TextRunProperties for individual text runs.
+        /// </summary>
+        public virtual TextDecorationCollection? TextDecorations => null;
+
+        /// <summary>
+        /// Gets the text wrapping.
+        /// </summary>
+        public abstract TextWrapping TextWrapping { get; }
+
+        /// <summary>
+        /// Line indentation
+        /// </summary>
+        public abstract double Indent { get; }
+
+        /// <summary>
+        /// Paragraph indentation
+        /// </summary>
+        public virtual double ParagraphIndent
+        {
+            get { return 0; }
+        }
+        
+        /// <summary>
+        /// Default Incremental Tab
+        /// </summary>
+        public virtual double DefaultIncrementalTab
+        {
+            get { return 4 * DefaultTextRunProperties.FontRenderingEmSize; }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextRange.cs b/src/Avalonia.Base/Media/TextFormatting/TextRange.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/TextRange.cs
rename to src/Avalonia.Base/Media/TextFormatting/TextRange.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextRun.cs b/src/Avalonia.Base/Media/TextFormatting/TextRun.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/TextRun.cs
rename to src/Avalonia.Base/Media/TextFormatting/TextRun.cs
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextRunBounds.cs b/src/Avalonia.Base/Media/TextFormatting/TextRunBounds.cs
new file mode 100644
index 0000000000..91150160ed
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextRunBounds.cs
@@ -0,0 +1,39 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// The bounding rectangle of text run
+    /// </summary>
+    public sealed class TextRunBounds
+    {
+        /// <summary>
+        /// Constructing TextRunBounds
+        /// </summary>
+        internal TextRunBounds(Rect bounds, int firstCharacterIndex, int length, TextRun textRun)
+        {
+            Rectangle = bounds;
+            TextSourceCharacterIndex = firstCharacterIndex;
+            Length = length;
+            TextRun = textRun;
+        }
+
+        /// <summary>
+        /// First text source character index of text run
+        /// </summary>
+        public int TextSourceCharacterIndex { get; }
+
+        /// <summary>
+        /// character length of bounded text run
+        /// </summary>
+        public int Length { get; }
+
+        /// <summary>
+        /// Text run bounding rectangle
+        /// </summary>
+        public Rect Rectangle { get; }
+
+        /// <summary>
+        /// text run
+        /// </summary>
+        public TextRun TextRun { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextRunProperties.cs b/src/Avalonia.Base/Media/TextFormatting/TextRunProperties.cs
new file mode 100644
index 0000000000..86b701cb4b
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextRunProperties.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Globalization;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Provides a set of properties, such as typeface or foreground brush, that can be applied to a TextRun object. This is an abstract class.
+    /// </summary>
+    /// <remarks>
+    /// The text layout client provides a concrete implementation of this abstract class.
+    /// This enables the client to implement text run properties in a way that corresponds with the associated formatting store.
+    /// </remarks>
+    public abstract class TextRunProperties : IEquatable<TextRunProperties>
+    {
+        /// <summary>
+        /// Run typeface
+        /// </summary>
+        public abstract Typeface Typeface { get; }
+
+        /// <summary>
+        /// Em size of font used to format and display text
+        /// </summary>
+        public abstract double FontRenderingEmSize { get; }
+
+        ///<summary>
+        /// Run TextDecorations. 
+        ///</summary>
+        public abstract TextDecorationCollection? TextDecorations { get; }
+
+        /// <summary>
+        /// Brush used to fill text.
+        /// </summary>
+        public abstract IBrush? ForegroundBrush { get; }
+
+        /// <summary>
+        /// Brush used to paint background of run.
+        /// </summary>
+        public abstract IBrush? BackgroundBrush { get; }
+
+        /// <summary>
+        /// Run text culture.
+        /// </summary>
+        public abstract CultureInfo? CultureInfo { get; }
+
+        /// <summary>
+        /// Run vertical box alignment
+        /// </summary>
+        public virtual BaselineAlignment BaselineAlignment => BaselineAlignment.Baseline;
+
+        public bool Equals(TextRunProperties? other)
+        {
+            if (ReferenceEquals(null, other))
+                return false;
+            if (ReferenceEquals(this, other))
+                return true;
+
+            return Typeface.Equals(other.Typeface) &&
+                   FontRenderingEmSize.Equals(other.FontRenderingEmSize)
+                   && Equals(TextDecorations, other.TextDecorations) &&
+                   Equals(ForegroundBrush, other.ForegroundBrush) &&
+                   Equals(BackgroundBrush, other.BackgroundBrush) &&
+                   Equals(CultureInfo, other.CultureInfo);
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return ReferenceEquals(this, obj) || obj is TextRunProperties other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = Typeface.GetHashCode();
+                hashCode = (hashCode * 397) ^ FontRenderingEmSize.GetHashCode();
+                hashCode = (hashCode * 397) ^ (TextDecorations != null ? TextDecorations.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (ForegroundBrush != null ? ForegroundBrush.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (BackgroundBrush != null ? BackgroundBrush.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (CultureInfo != null ? CultureInfo.GetHashCode() : 0);
+                return hashCode;
+            }
+        }
+
+        public static bool operator ==(TextRunProperties left, TextRunProperties right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(TextRunProperties left, TextRunProperties right)
+        {
+            return !Equals(left, right);
+        }
+        
+        internal TextRunProperties WithTypeface(Typeface typeface)
+        {
+            return new GenericTextRunProperties(typeface, FontRenderingEmSize,
+                TextDecorations, ForegroundBrush, BackgroundBrush, BaselineAlignment);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextShaper.cs b/src/Avalonia.Base/Media/TextFormatting/TextShaper.cs
new file mode 100644
index 0000000000..615b1553b6
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextShaper.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Globalization;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A class that is responsible for text shaping.
+    /// </summary>
+    public class TextShaper
+    {
+        private readonly ITextShaperImpl _platformImpl;
+
+        public TextShaper(ITextShaperImpl platformImpl)
+        {
+            _platformImpl = platformImpl;
+        }
+
+        /// <summary>
+        /// Gets the current text shaper.
+        /// </summary>
+        public static TextShaper Current
+        {
+            get
+            {
+                var current = AvaloniaLocator.Current.GetService<TextShaper>();
+
+                if (current != null)
+                {
+                    return current;
+                }
+
+                var textShaperImpl = AvaloniaLocator.Current.GetService<ITextShaperImpl>();
+
+                if (textShaperImpl == null)
+                    throw new InvalidOperationException("No text shaper implementation was registered.");
+
+                current = new TextShaper(textShaperImpl);
+
+                AvaloniaLocator.CurrentMutable.Bind<TextShaper>().ToConstant(current);
+
+                return current;
+            }
+        }
+
+        /// <inheritdoc cref="ITextShaperImpl.ShapeText"/>
+        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options)
+        {
+            return _platformImpl.ShapeText(text, options);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextShaperOptions.cs b/src/Avalonia.Base/Media/TextFormatting/TextShaperOptions.cs
new file mode 100644
index 0000000000..4e75bb921e
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextShaperOptions.cs
@@ -0,0 +1,49 @@
+using System.Globalization;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Options to customize text shaping.
+    /// </summary>
+    public readonly struct TextShaperOptions
+    {
+        public TextShaperOptions(
+            GlyphTypeface typeface, 
+            double fontRenderingEmSize = 12, 
+            sbyte bidiLevel = 0, 
+            CultureInfo? culture = null, 
+            double incrementalTabWidth = 0)
+        {
+            Typeface = typeface;
+            FontRenderingEmSize = fontRenderingEmSize;
+            BidiLevel = bidiLevel;
+            Culture = culture;
+            IncrementalTabWidth = incrementalTabWidth;
+        }
+
+        /// <summary>
+        /// Get the typeface.
+        /// </summary>
+        public GlyphTypeface Typeface { get; }
+        /// <summary>
+        /// Get the font rendering em size.
+        /// </summary>
+        public double FontRenderingEmSize { get; }
+
+        /// <summary>
+        /// Get the bidi level of the text.
+        /// </summary>
+        public sbyte BidiLevel { get; }
+
+        /// <summary>
+        /// Get the culture.
+        /// </summary>
+        public CultureInfo? Culture { get; }
+
+        /// <summary>
+        /// Get the incremental tab width.
+        /// </summary>
+        public double IncrementalTabWidth { get; }
+
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextTrailingCharacterEllipsis.cs b/src/Avalonia.Base/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
new file mode 100644
index 0000000000..670d94e928
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A collapsing properties to collapse whole line toward the end
+    /// at character granularity.
+    /// </summary>
+    public sealed class TextTrailingCharacterEllipsis : TextCollapsingProperties
+    {
+        /// <summary>
+        /// Construct a text trailing character ellipsis collapsing properties
+        /// </summary>
+        /// <param name="ellipsis">Text used as collapsing symbol.</param>
+        /// <param name="width">Width in which collapsing is constrained to.</param>
+        /// <param name="textRunProperties">Text run properties of ellipsis symbol.</param>
+        public TextTrailingCharacterEllipsis(ReadOnlySlice<char> ellipsis, double width, TextRunProperties textRunProperties)
+        {
+            Width = width;
+            Symbol = new TextCharacters(ellipsis, textRunProperties);
+        }
+
+        /// <inheritdoc/>
+        public override double Width { get; }
+
+        /// <inheritdoc/>
+        public override TextRun Symbol { get; }
+
+        public override List<DrawableTextRun>? Collapse(TextLine textLine)
+        {
+            return TextEllipsisHelper.Collapse(textLine, this, false);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextTrailingWordEllipsis.cs b/src/Avalonia.Base/Media/TextFormatting/TextTrailingWordEllipsis.cs
new file mode 100644
index 0000000000..dbffbdf060
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/TextTrailingWordEllipsis.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// a collapsing properties to collapse whole line toward the end
+    /// at word granularity.
+    /// </summary>
+    public sealed class TextTrailingWordEllipsis : TextCollapsingProperties
+    {
+        /// <summary>
+        /// Construct a text trailing word ellipsis collapsing properties.
+        /// </summary>
+        /// <param name="ellipsis">Text used as collapsing symbol.</param>
+        /// <param name="width">width in which collapsing is constrained to.</param>
+        /// <param name="textRunProperties">text run properties of ellipsis symbol.</param>
+        public TextTrailingWordEllipsis(
+            ReadOnlySlice<char> ellipsis,
+            double width,
+            TextRunProperties textRunProperties
+        )
+        {
+            Width = width;
+            Symbol = new TextCharacters(ellipsis, textRunProperties);
+        }
+
+        /// <inheritdoc/>
+        public override double Width { get; }
+
+        /// <inheritdoc/>
+        public override TextRun Symbol { get; }
+
+        public override List<DrawableTextRun>? Collapse(TextLine textLine)
+        {
+            return TextEllipsisHelper.Collapse(textLine, this, true);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiAlgorithm.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiAlgorithm.cs
new file mode 100644
index 0000000000..2511807d9c
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiAlgorithm.cs
@@ -0,0 +1,1722 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    /// <summary>
+    /// Implementation of Unicode bidirectional algorithm (UAX #9)
+    /// https://unicode.org/reports/tr9/
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The Bidi algorithm uses a number of memory arrays for resolved
+    /// types, level information, bracket types, x9 removal maps and
+    /// more...
+    /// </para>
+    /// <para>
+    /// This implementation of the BiDi algorithm has been designed
+    /// to reduce memory pressure on the GC by re-using the same
+    /// work buffers, so instances of this class should be re-used
+    /// as much as possible.
+    /// </para>
+    /// </remarks>
+    internal sealed class BidiAlgorithm
+    {
+        /// <summary>
+        /// The original BiDiClass classes as provided by the caller
+        /// </summary>
+        private ArraySlice<BidiClass> _originalClasses;
+
+        /// <summary>
+        /// Paired bracket types as provided by caller
+        /// </summary>
+        private ArraySlice<BidiPairedBracketType> _pairedBracketTypes;
+
+        /// <summary>
+        /// Paired bracket values as provided by caller
+        /// </summary>
+        private ArraySlice<int> _pairedBracketValues;
+
+        /// <summary>
+        /// Try if the incoming data is known to contain brackets
+        /// </summary>
+        private bool _hasBrackets;
+
+        /// <summary>
+        /// True if the incoming data is known to contain embedding runs
+        /// </summary>
+        private bool _hasEmbeddings;
+
+        /// <summary>
+        /// True if the incoming data is known to contain isolating runs
+        /// </summary>
+        private bool _hasIsolates;
+
+        /// <summary>
+        /// Two directional mapping of isolate start/end pairs
+        /// </summary>
+        /// <remarks>
+        /// The forward mapping maps the start index to the end index.
+        /// The reverse mapping maps the end index to the start index.
+        /// </remarks>
+        private readonly Dictionary<int, int> _isolatePairs = new Dictionary<int, int>();
+
+        /// <summary>
+        /// The working BiDi classes
+        /// </summary>
+        private ArraySlice<BidiClass> _workingClasses;
+
+        /// <summary>
+        /// The working classes buffer
+        /// </summary>
+        private ArrayBuilder<BidiClass> _workingClassesBuffer;
+
+        /// <summary>
+        /// A slice of the resolved levels
+        /// </summary>
+        private ArraySlice<sbyte> _resolvedLevels;
+
+        /// <summary>
+        /// The buffer underlying resolvedLevels
+        /// </summary>
+        private ArrayBuilder<sbyte> _resolvedLevelsBuffer;
+
+        /// <summary>
+        /// The resolve paragraph embedding level
+        /// </summary>
+        private sbyte _paragraphEmbeddingLevel;
+
+        /// <summary>
+        /// The status stack used during resolution of explicit
+        /// embedding and isolating runs
+        /// </summary>
+        private readonly Stack<Status> _statusStack = new Stack<Status>();
+
+        /// <summary>
+        /// Mapping used to virtually remove characters for rule X9
+        /// </summary>
+        private ArrayBuilder<int> _x9Map;
+
+        /// <summary>
+        /// Re-usable list of level runs
+        /// </summary>
+        private readonly List<LevelRun> _levelRuns = new List<LevelRun>();
+
+        /// <summary>
+        /// Mapping for the current isolating sequence, built
+        /// by joining level runs from the x9 map.
+        /// </summary>
+        private ArrayBuilder<int> _isolatedRunMapping;
+
+        /// <summary>
+        /// A stack of pending isolate openings used by FindIsolatePairs()
+        /// </summary>
+        private readonly Stack<int> _pendingIsolateOpenings = new Stack<int>();
+
+        /// <summary>
+        /// The level of the isolating run currently being processed
+        /// </summary>
+        private int _runLevel;
+
+        /// <summary>
+        /// The direction of the isolating run currently being processed
+        /// </summary>
+        private BidiClass _runDirection;
+
+        /// <summary>
+        /// The length of the isolating run currently being processed
+        /// </summary>
+        private int _runLength;
+
+        /// <summary>
+        /// A mapped slice of the resolved types for the isolating run currently
+        /// being processed
+        /// </summary>
+        private MappedArraySlice<BidiClass> _runResolvedClasses;
+
+        /// <summary>
+        /// A mapped slice of the original types for the isolating run currently
+        /// being processed
+        /// </summary>
+        private MappedArraySlice<BidiClass> _runOriginalClasses;
+
+        /// <summary>
+        /// A mapped slice of the run levels for the isolating run currently
+        /// being processed
+        /// </summary>
+        private MappedArraySlice<sbyte> _runLevels;
+
+        /// <summary>
+        /// A mapped slice of the paired bracket types of the isolating
+        /// run currently being processed
+        /// </summary>
+        private MappedArraySlice<BidiPairedBracketType> _runBiDiPairedBracketTypes;
+
+        /// <summary>
+        /// A mapped slice of the paired bracket values of the isolating
+        /// run currently being processed
+        /// </summary>
+        private MappedArraySlice<int> _runPairedBracketValues;
+
+        /// <summary>
+        /// Maximum pairing depth for paired brackets
+        /// </summary>
+        private const int MaxPairedBracketDepth = 63;
+
+        /// <summary>
+        /// Reusable list of pending opening brackets used by the
+        /// LocatePairedBrackets method
+        /// </summary>
+        private readonly List<int> _pendingOpeningBrackets = new List<int>();
+
+        /// <summary>
+        /// Resolved list of paired brackets
+        /// </summary>
+        private readonly List<BracketPair> _pairedBrackets = new List<BracketPair>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BidiAlgorithm"/> class.
+        /// </summary>
+        internal BidiAlgorithm()
+        {
+        }
+
+        /// <summary>
+        /// Gets a per-thread instance that can be re-used as often
+        /// as necessary.
+        /// </summary>
+        public static ThreadLocal<BidiAlgorithm> Instance { get; } = new ThreadLocal<BidiAlgorithm>(() => new BidiAlgorithm());
+
+        /// <summary>
+        /// Gets the resolved levels.
+        /// </summary>
+        public ArraySlice<sbyte> ResolvedLevels => _resolvedLevels;
+
+        /// <summary>
+        /// Gets the resolved paragraph embedding level
+        /// </summary>
+        public int ResolvedParagraphEmbeddingLevel => _paragraphEmbeddingLevel;
+
+        /// <summary>
+        /// Process data from a BiDiData instance
+        /// </summary>
+        /// <param name="data">The BiDi Unicode data.</param>
+        public void Process(BidiData data)
+            => Process(
+                data.Classes,
+                data.PairedBracketTypes,
+                data.PairedBracketValues,
+                data.ParagraphEmbeddingLevel,
+                data.HasBrackets,
+                data.HasEmbeddings,
+                data.HasIsolates,
+                null);
+
+        /// <summary>
+        /// Processes Bidi Data
+        /// </summary>
+        public void Process(
+            ArraySlice<BidiClass> types,
+            ArraySlice<BidiPairedBracketType> pairedBracketTypes,
+            ArraySlice<int> pairedBracketValues,
+            sbyte paragraphEmbeddingLevel,
+            bool? hasBrackets,
+            bool? hasEmbeddings,
+            bool? hasIsolates,
+            ArraySlice<sbyte>? outLevels)
+        {
+            // Reset state
+            _isolatePairs.Clear();
+            _workingClassesBuffer.Clear();
+            _levelRuns.Clear();
+            _resolvedLevelsBuffer.Clear();
+
+            if (types.IsEmpty)
+            {
+                return;
+            }
+
+            // Setup original types and working types
+            _originalClasses = types;
+            _workingClasses = _workingClassesBuffer.Add(types);
+
+            // Capture paired bracket values and types
+            _pairedBracketTypes = pairedBracketTypes;
+            _pairedBracketValues = pairedBracketValues;
+
+            // Store things we know
+            _hasBrackets = hasBrackets ?? _pairedBracketTypes.Length == _originalClasses.Length;
+            _hasEmbeddings = hasEmbeddings ?? true;
+            _hasIsolates = hasIsolates ?? true;
+
+            // Find all isolate pairs
+            FindIsolatePairs();
+
+            // Resolve the paragraph embedding level
+            if (paragraphEmbeddingLevel == 2)
+            {
+                _paragraphEmbeddingLevel = ResolveEmbeddingLevel(_originalClasses);
+            }
+            else
+            {
+                _paragraphEmbeddingLevel = paragraphEmbeddingLevel;
+            }
+
+            // Create resolved levels buffer
+            if (outLevels.HasValue)
+            {
+                if (outLevels.Value.Length != _originalClasses.Length)
+                {
+                    throw new ArgumentException("Out levels must be the same length as the input data");
+                }
+
+                _resolvedLevels = outLevels.Value;
+            }
+            else
+            {
+                _resolvedLevels = _resolvedLevelsBuffer.Add(_originalClasses.Length);
+                _resolvedLevels.Fill(_paragraphEmbeddingLevel);
+            }
+
+            // Resolve explicit embedding levels (Rules X1-X8)
+            ResolveExplicitEmbeddingLevels();
+
+            // Build the rule X9 map
+            BuildX9RemovalMap();
+
+            // Process all isolated run sequences
+            ProcessIsolatedRunSequences();
+
+            // Reset whitespace levels
+            ResetWhitespaceLevels();
+
+            // Clean up
+            AssignLevelsToCodePointsRemovedByX9();
+        }
+
+        /// <summary>
+        /// Resolve the paragraph embedding level if not explicitly passed
+        /// by the caller. Also used by rule X5c for FSI isolating sequences.
+        /// </summary>
+        /// <param name="data">The data to be evaluated</param>
+        /// <returns>The resolved embedding level</returns>
+        public sbyte ResolveEmbeddingLevel(ArraySlice<BidiClass> data)
+        {
+            // P2
+            for (var i = 0; i < data.Length; ++i)
+            {
+                switch (data[i])
+                {
+                    case BidiClass.LeftToRight:
+                        // P3
+                        return 0;
+
+                    case BidiClass.ArabicLetter:
+                    case BidiClass.RightToLeft:
+                        // P3
+                        return 1;
+
+                    case BidiClass.FirstStrongIsolate:
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.RightToLeftIsolate:
+                        // Skip isolate pairs
+                        // (Because we're working with a slice, we need to adjust the indices
+                        //  we're using for the isolatePairs map)
+                        if (_isolatePairs.TryGetValue(data.Start + i, out i))
+                        {
+                            i -= data.Start;
+                        }
+                        else
+                        {
+                            i = data.Length;
+                        }
+
+                        break;
+                }
+            }
+
+            // P3
+            return 0;
+        }
+
+        /// <summary>
+        /// Build a list of matching isolates for a directionality slice
+        /// Implements BD9
+        /// </summary>
+        private void FindIsolatePairs()
+        {
+            // Redundant?
+            if (!_hasIsolates)
+            {
+                return;
+            }
+
+            // Lets double check this as we go and clear the flag
+            // if there actually aren't any isolate pairs as this might
+            // mean we can skip some later steps
+            _hasIsolates = false;
+
+            // BD9...
+            _pendingIsolateOpenings.Clear();
+            
+            for (var i = 0; i < _originalClasses.Length; i++)
+            {
+                var t = _originalClasses[i];
+
+                switch (t)
+                {
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.RightToLeftIsolate:
+                    case BidiClass.FirstStrongIsolate:
+                    {
+                        _pendingIsolateOpenings.Push(i);
+                        _hasIsolates = true;
+                        break;
+                    }
+                    case BidiClass.PopDirectionalIsolate:
+                    {
+                        if (_pendingIsolateOpenings.Count > 0)
+                        {
+                            _isolatePairs.Add(_pendingIsolateOpenings.Pop(), i);
+                        }
+
+                        _hasIsolates = true;
+                        
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Resolve the explicit embedding levels from the original
+        /// data.  Implements rules X1 to X8.
+        /// </summary>
+        private void ResolveExplicitEmbeddingLevels()
+        {
+            // Redundant?
+            if (!_hasIsolates && !_hasEmbeddings)
+            {
+                return;
+            }
+
+            // Work variables
+            _statusStack.Clear();
+            var overflowIsolateCount = 0;
+            var overflowEmbeddingCount = 0;
+            var validIsolateCount = 0;
+
+            // Constants
+            const int maxStackDepth = 125;
+
+            // Rule X1 - setup initial state
+            _statusStack.Clear();
+
+            // Neutral
+            _statusStack.Push(new Status(_paragraphEmbeddingLevel, BidiClass.OtherNeutral, false));
+
+            // Process all characters
+            for (var i = 0; i < _originalClasses.Length; i++)
+            {
+                switch (_originalClasses[i])
+                {
+                    case BidiClass.RightToLeftEmbedding:
+                    {
+                        // Rule X2
+                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 1) | 1);
+                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
+                        {
+                            _statusStack.Push(new Status(newLevel, BidiClass.OtherNeutral, false));
+                            _resolvedLevels[i] = newLevel;
+                        }
+                        else if (overflowIsolateCount == 0)
+                        {
+                            overflowEmbeddingCount++;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.LeftToRightEmbedding:
+                    {
+                        // Rule X3
+                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 2) & ~1);
+                        if (newLevel < maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
+                        {
+                            _statusStack.Push(new Status(newLevel, BidiClass.OtherNeutral, false));
+                            _resolvedLevels[i] = newLevel;
+                        }
+                        else if (overflowIsolateCount == 0)
+                        {
+                            overflowEmbeddingCount++;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.RightToLeftOverride:
+                    {
+                        // Rule X4
+                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 1) | 1);
+                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
+                        {
+                            _statusStack.Push(new Status(newLevel, BidiClass.RightToLeft, false));
+                            _resolvedLevels[i] = newLevel;
+                        }
+                        else if (overflowIsolateCount == 0)
+                        {
+                            overflowEmbeddingCount++;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.LeftToRightOverride:
+                    {
+                        // Rule X5
+                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 2) & ~1);
+                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
+                        {
+                            _statusStack.Push(new Status(newLevel, BidiClass.LeftToRight, false));
+                            _resolvedLevels[i] = newLevel;
+                        }
+                        else if (overflowIsolateCount == 0)
+                        {
+                            overflowEmbeddingCount++;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.RightToLeftIsolate:
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.FirstStrongIsolate:
+                    {
+                        // Rule X5a, X5b and X5c
+                        var resolvedIsolate = _originalClasses[i];
+
+                        if (resolvedIsolate == BidiClass.FirstStrongIsolate)
+                        {
+                            if (!_isolatePairs.TryGetValue(i, out var endOfIsolate))
+                            {
+                                endOfIsolate = _originalClasses.Length;
+                            }
+
+                            // Rule X5c
+                            if (ResolveEmbeddingLevel(_originalClasses.Slice(i + 1,endOfIsolate - (i + 1))) == 1)
+                            {
+                                resolvedIsolate = BidiClass.RightToLeftIsolate;
+                            }
+                            else
+                            {
+                                resolvedIsolate = BidiClass.LeftToRightIsolate;
+                            }
+                        }
+
+                        // Replace RLI's level with current embedding level
+                        var tos = _statusStack.Peek();
+                        _resolvedLevels[i] = tos.EmbeddingLevel;
+
+                        // Apply override
+                        if (tos.OverrideStatus != BidiClass.OtherNeutral)
+                        {
+                            _workingClasses[i] = tos.OverrideStatus;
+                        }
+
+                        // Work out new level
+                        sbyte newLevel;
+                        if (resolvedIsolate == BidiClass.RightToLeftIsolate)
+                        {
+                            newLevel = (sbyte)((tos.EmbeddingLevel + 1) | 1);
+                        }
+                        else
+                        {
+                            newLevel = (sbyte)((tos.EmbeddingLevel + 2) & ~1);
+                        }
+
+                        // Valid?
+                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
+                        {
+                            validIsolateCount++;
+                            _statusStack.Push(new Status(newLevel, BidiClass.OtherNeutral, true));
+                        }
+                        else
+                        {
+                            overflowIsolateCount++;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.BoundaryNeutral:
+                    {
+                        // Mentioned in rule X6 - "for all types besides ..., BN, ..."
+                        // no-op
+                        break;
+                    }
+
+                    default:
+                    {
+                        // Rule X6
+                        var tos = _statusStack.Peek();
+                        _resolvedLevels[i] = tos.EmbeddingLevel;
+                        if (tos.OverrideStatus != BidiClass.OtherNeutral)
+                        {
+                            _workingClasses[i] = tos.OverrideStatus;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.PopDirectionalIsolate:
+                    {
+                        // Rule X6a
+                        if (overflowIsolateCount > 0)
+                        {
+                            overflowIsolateCount--;
+                        }
+                        else if (validIsolateCount != 0)
+                        {
+                            overflowEmbeddingCount = 0;
+                            while (!_statusStack.Peek().IsolateStatus)
+                            {
+                                _statusStack.Pop();
+                            }
+
+                            _statusStack.Pop();
+                            validIsolateCount--;
+                        }
+
+                        var tos = _statusStack.Peek();
+                        _resolvedLevels[i] = tos.EmbeddingLevel;
+                        if (tos.OverrideStatus != BidiClass.OtherNeutral)
+                        {
+                            _workingClasses[i] = tos.OverrideStatus;
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.PopDirectionalFormat:
+                    {
+                        // Rule X7
+                        if (overflowIsolateCount == 0)
+                        {
+                            if (overflowEmbeddingCount > 0)
+                            {
+                                overflowEmbeddingCount--;
+                            }
+                            else if (!_statusStack.Peek().IsolateStatus && _statusStack.Count >= 2)
+                            {
+                                _statusStack.Pop();
+                            }
+                        }
+
+                        break;
+                    }
+
+                    case BidiClass.ParagraphSeparator:
+                    {
+                        // Rule X8
+                        _resolvedLevels[i] = _paragraphEmbeddingLevel;
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Build a map to the original data positions that excludes all
+        /// the types defined by rule X9
+        /// </summary>
+        private void BuildX9RemovalMap()
+        {
+            // Reserve room for the x9 map
+            _x9Map.Length = _originalClasses.Length;
+
+            if (_hasEmbeddings || _hasIsolates)
+            {
+                // Build a map the removes all x9 characters
+                var j = 0;
+                for (var i = 0; i < _originalClasses.Length; i++)
+                {
+                    if (!IsRemovedByX9(_originalClasses[i]))
+                    {
+                        _x9Map[j++] = i;
+                    }
+                }
+
+                // Set the final length
+                _x9Map.Length = j;
+            }
+            else
+            {
+                for (int i = 0, count = _originalClasses.Length; i < count; i++)
+                {
+                    _x9Map[i] = i;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Find the original character index for an entry in the X9 map
+        /// </summary>
+        /// <param name="index">Index in the x9 removal map</param>
+        /// <returns>Index to the original data</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private int MapX9(int index) => _x9Map[index];
+
+        /// <summary>
+        /// Add a new level run
+        /// </summary>
+        /// <remarks>
+        /// This method resolves the sos and eos values for the run
+        /// and adds the run to the list
+        /// /// </remarks>
+        /// <param name="start">The index of the start of the run (in x9 removed units)</param>
+        /// <param name="length">The length of the run (in x9 removed units)</param>
+        /// <param name="level">The level of the run</param>
+        private void AddLevelRun(int start, int length, int level)
+        {
+            // Get original indices to first and last character in this run
+            var firstCharIndex = MapX9(start);
+            var lastCharIndex = MapX9(start + length - 1);
+
+            // Work out sos
+            var i = firstCharIndex - 1;
+            
+            while (i >= 0 && IsRemovedByX9(_originalClasses[i]))
+            {
+                i--;
+            }
+
+            var prevLevel = i < 0 ? _paragraphEmbeddingLevel : _resolvedLevels[i];
+            var sos = DirectionFromLevel(Math.Max(prevLevel, level));
+
+            // Work out eos
+            var lastType = _workingClasses[lastCharIndex];
+            int nextLevel;
+
+            switch (lastType)
+            {
+                case BidiClass.LeftToRightIsolate:
+                case BidiClass.RightToLeftIsolate:
+                case BidiClass.FirstStrongIsolate:
+                {
+                    nextLevel = _paragraphEmbeddingLevel;
+                    
+                    break;
+                }
+                default:
+                {
+                    i = lastCharIndex + 1;
+                    while (i < _originalClasses.Length && IsRemovedByX9(_originalClasses[i]))
+                    {
+                        i++;
+                    }
+
+                    nextLevel = i >= _originalClasses.Length ? _paragraphEmbeddingLevel : _resolvedLevels[i];
+                    
+                    break;
+                }
+            }
+
+            var eos = DirectionFromLevel(Math.Max(nextLevel, level));
+
+            // Add the run
+            _levelRuns.Add(new LevelRun(start, length, level, sos, eos));
+        }
+
+        /// <summary>
+        /// Find all runs of the same level, populating the _levelRuns
+        /// collection
+        /// </summary>
+        private void FindLevelRuns()
+        {
+            var currentLevel = -1;
+            var runStart = 0;
+            
+            for (var i = 0; i < _x9Map.Length; ++i)
+            {
+                int level = _resolvedLevels[MapX9(i)];
+
+                if (level == currentLevel)
+                {
+                    continue;
+                }
+
+                if (currentLevel != -1)
+                {
+                    AddLevelRun(runStart, i - runStart, currentLevel);
+                }
+
+                currentLevel = level;
+                runStart = i;
+            }
+
+            // Don't forget the final level run
+            if (currentLevel != -1)
+            {
+                AddLevelRun(runStart, _x9Map.Length - runStart, currentLevel);
+            }
+        }
+
+        /// <summary>
+        /// Given a character index, find the level run that starts at that position
+        /// </summary>
+        /// <param name="index">The index into the original (unmapped) data</param>
+        /// <returns>The index of the run that starts at that index</returns>
+        private int FindRunForIndex(int index)
+        {
+            for (var i = 0; i < _levelRuns.Count; i++)
+            {
+                // Passed index is for the original non-x9 filtered data, however
+                // the level run ranges are for the x9 filtered data.  Convert before
+                // comparing
+                if (MapX9(_levelRuns[i].Start) == index)
+                {
+                    return i;
+                }
+            }
+
+            throw new InvalidOperationException("Internal error");
+        }
+
+        /// <summary>
+        /// Determine and the process all isolated run sequences
+        /// </summary>
+        private void ProcessIsolatedRunSequences()
+        {
+            // Find all runs with the same level
+            FindLevelRuns();
+
+            // Process them one at a time by first building
+            // a mapping using slices from the x9 map for each
+            // run section that needs to be joined together to
+            // form an complete run.  That full run mapping
+            // will be placed in _isolatedRunMapping and then
+            // processed by ProcessIsolatedRunSequence().
+            while (_levelRuns.Count > 0)
+            {
+                // Clear the mapping
+                _isolatedRunMapping.Clear();
+
+                // Combine mappings from this run and all runs that continue on from it
+                var runIndex = 0;
+                BidiClass eos;
+                var sos = _levelRuns[0].Sos;
+                var level = _levelRuns[0].Level;
+                
+                while (true)
+                {
+                    // Get the run
+                    var r = _levelRuns[runIndex];
+
+                    // The eos of the isolating run is the eos of the
+                    // last level run that comprises it.
+                    eos = r.Eos;
+
+                    // Remove this run as we've now processed it
+                    _levelRuns.RemoveAt(runIndex);
+
+                    // Add the x9 map indices for the run range to the mapping
+                    // for this isolated run
+                    _isolatedRunMapping.Add(_x9Map.AsSlice(r.Start, r.Length));
+
+                    // Get the last character and see if it's an isolating run with a matching
+                    // PDI and concatenate that run to this one
+                    var lastCharacterIndex = _isolatedRunMapping[_isolatedRunMapping.Length - 1];
+                    var lastType = _originalClasses[lastCharacterIndex];
+                    if ((lastType == BidiClass.LeftToRightIsolate || lastType == BidiClass.RightToLeftIsolate || lastType == BidiClass.FirstStrongIsolate) &&
+                            _isolatePairs.TryGetValue(lastCharacterIndex, out var nextRunIndex))
+                    {
+                        // Find the continuing run index
+                        runIndex = FindRunForIndex(nextRunIndex);
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+
+                // Process this isolated run
+                ProcessIsolatedRunSequence(sos, eos, level);
+            }
+        }
+
+        /// <summary>
+        /// Process a single isolated run sequence, where the character sequence
+        /// mapping is currently held in _isolatedRunMapping.
+        /// </summary>
+        private void ProcessIsolatedRunSequence(BidiClass sos, BidiClass eos, int runLevel)
+        {
+            // Create mappings onto the underlying data
+            _runResolvedClasses = new MappedArraySlice<BidiClass>(_workingClasses, _isolatedRunMapping.AsSlice());
+            _runOriginalClasses = new MappedArraySlice<BidiClass>(_originalClasses, _isolatedRunMapping.AsSlice());
+            _runLevels = new MappedArraySlice<sbyte>(_resolvedLevels, _isolatedRunMapping.AsSlice());
+            if (_hasBrackets)
+            {
+                _runBiDiPairedBracketTypes = new MappedArraySlice<BidiPairedBracketType>(_pairedBracketTypes, _isolatedRunMapping.AsSlice());
+                _runPairedBracketValues = new MappedArraySlice<int>(_pairedBracketValues, _isolatedRunMapping.AsSlice());
+            }
+
+            _runLevel = runLevel;
+            _runDirection = DirectionFromLevel(runLevel);
+            _runLength = _runResolvedClasses.Length;
+
+            // By tracking the types of characters known to be in the current run, we can
+            // skip some of the rules that we know won't apply.  The flags will be
+            // initialized while we're processing rule W1 below.
+            var hasEN = false;
+            var hasAL = false;
+            var hasES = false;
+            var hasCS = false;
+            var hasAN = false;
+            var hasET = false;
+
+            // Rule W1
+            // Also, set hasXX flags
+            int i;
+            var previousClass = sos;
+            
+            for (i = 0; i < _runLength; i++)
+            {
+                var resolvedClass = _runResolvedClasses[i];
+                
+                switch (resolvedClass)
+                {
+                    case BidiClass.NonspacingMark:
+                        _runResolvedClasses[i] = previousClass;
+                        break;
+
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.RightToLeftIsolate:
+                    case BidiClass.FirstStrongIsolate:
+                    case BidiClass.PopDirectionalIsolate:
+                        previousClass = BidiClass.OtherNeutral;
+                        break;
+
+                    case BidiClass.EuropeanNumber:
+                        hasEN = true;
+                        previousClass = resolvedClass;
+                        break;
+
+                    case BidiClass.ArabicLetter:
+                        hasAL = true;
+                        previousClass = resolvedClass;
+                        break;
+
+                    case BidiClass.EuropeanSeparator:
+                        hasES = true;
+                        previousClass = resolvedClass;
+                        break;
+
+                    case BidiClass.CommonSeparator:
+                        hasCS = true;
+                        previousClass = resolvedClass;
+                        break;
+
+                    case BidiClass.ArabicNumber:
+                        hasAN = true;
+                        previousClass = resolvedClass;
+                        break;
+
+                    case BidiClass.EuropeanTerminator:
+                        hasET = true;
+                        previousClass = resolvedClass;
+                        break;
+
+                    default:
+                        previousClass = resolvedClass;
+                        break;
+                }
+            }
+
+            // Rule W2
+            if (hasEN)
+            {
+                for (i = 0; i < _runLength; i++)
+                {
+                    if (_runResolvedClasses[i] != BidiClass.EuropeanNumber)
+                    {
+                        continue;
+                    }
+
+                    for (var j = i - 1; j >= 0; j--)
+                    {
+                        var resolvedClass = _runResolvedClasses[j];
+
+                        switch (resolvedClass)
+                        {
+                            case BidiClass.LeftToRight:
+                            case BidiClass.RightToLeft:
+                            case BidiClass.ArabicLetter:
+                            {
+                                if (resolvedClass == BidiClass.ArabicLetter)
+                                {
+                                    _runResolvedClasses[i] = BidiClass.ArabicNumber;
+                                    hasAN = true;
+                                }
+
+                                j = -1;
+                                    
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Rule W3
+            if (hasAL)
+            {
+                for (i = 0; i < _runLength; i++)
+                {
+                    if (_runResolvedClasses[i] == BidiClass.ArabicLetter)
+                    {
+                        _runResolvedClasses[i] = BidiClass.RightToLeft;
+                    }
+                }
+            }
+
+            // Rule W4
+            if ((hasES || hasCS) && (hasEN || hasAN))
+            {
+                for (i = 1; i < _runLength - 1; ++i)
+                {
+                    ref var resolvedClass = ref _runResolvedClasses[i];
+                    
+                    if (resolvedClass == BidiClass.EuropeanSeparator)
+                    {
+                        var previousSeparatorClass = _runResolvedClasses[i - 1];
+                        var nextSeparatorClass = _runResolvedClasses[i + 1];
+
+                        if (previousSeparatorClass == BidiClass.EuropeanNumber && nextSeparatorClass == BidiClass.EuropeanNumber)
+                        {
+                            // ES between EN and EN
+                            resolvedClass = BidiClass.EuropeanNumber;
+                        }
+                    }
+                    else if (resolvedClass == BidiClass.CommonSeparator)
+                    {
+                        var previousSeparatorClass = _runResolvedClasses[i - 1];
+                        var nextSeparatorClass = _runResolvedClasses[i + 1];
+
+                        if ((previousSeparatorClass == BidiClass.ArabicNumber && nextSeparatorClass == BidiClass.ArabicNumber) ||
+                             (previousSeparatorClass == BidiClass.EuropeanNumber && nextSeparatorClass == BidiClass.EuropeanNumber))
+                        {
+                            // CS between (AN and AN) or (EN and EN)
+                            resolvedClass = previousSeparatorClass;
+                        }
+                    }
+                }
+            }
+
+            // Rule W5
+            if (hasET && hasEN)
+            {
+                for (i = 0; i < _runLength; ++i)
+                {
+                    if (_runResolvedClasses[i] != BidiClass.EuropeanTerminator)
+                    {
+                        continue;
+                    }
+                    
+                    // Locate end of sequence
+                    var sequenceStart = i;
+                    var sequenceEnd = i;
+                    
+                    while (sequenceEnd < _runLength && _runResolvedClasses[sequenceEnd] == BidiClass.EuropeanTerminator)
+                    {
+                        sequenceEnd++;
+                    }
+
+                    // Preceded by, or followed by EN?
+                    if ((sequenceStart == 0 ? sos : _runResolvedClasses[sequenceStart - 1]) == BidiClass.EuropeanNumber
+                        || (sequenceEnd == _runLength ? eos : _runResolvedClasses[sequenceEnd]) == BidiClass.EuropeanNumber)
+                    {
+                        // Change the entire range
+                        for (var j = sequenceStart; i < sequenceEnd; ++i)
+                        {
+                            _runResolvedClasses[i] = BidiClass.EuropeanNumber;
+                        }
+                    }
+
+                    // continue at end of sequence
+                    i = sequenceEnd;
+                }
+            }
+
+            // Rule W6
+            if (hasES || hasET || hasCS)
+            {
+                for (i = 0; i < _runLength; ++i)
+                {
+                    ref var resolvedClass = ref _runResolvedClasses[i];
+
+                    switch (resolvedClass)
+                    {
+                        case BidiClass.EuropeanSeparator:
+                        case BidiClass.EuropeanTerminator:
+                        case BidiClass.CommonSeparator:
+                        {
+                            resolvedClass = BidiClass.OtherNeutral;
+                            
+                            break;
+                        }
+                    }
+                }
+            }
+
+            // Rule W7.
+            if (hasEN)
+            {
+                var previousStrongClass = sos;
+                
+                for (i = 0; i < _runLength; ++i)
+                {
+                    ref var resolvedClass = ref _runResolvedClasses[i];
+
+                    switch (resolvedClass)
+                    {
+                        case BidiClass.EuropeanNumber:
+                        {
+                            // If prev strong type was an L change this to L too
+                            if (previousStrongClass == BidiClass.LeftToRight)
+                            {
+                                _runResolvedClasses[i] = BidiClass.LeftToRight;
+                            }
+                            
+                            break;
+                        }
+                       
+                        case BidiClass.LeftToRight:
+                        case BidiClass.RightToLeft:
+                        {
+                            // Remember previous strong type (NB: AL should already be changed to R)
+                            previousStrongClass = resolvedClass;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            // Rule N0 - process bracket pairs
+            if (_hasBrackets)
+            {
+                int count;
+                var pairedBrackets = LocatePairedBrackets();
+                
+                for (i = 0, count = pairedBrackets.Count; i < count; i++)
+                {
+                    var pairedBracket = pairedBrackets[i];
+                    
+                    var strongDirection = InspectPairedBracket(pairedBracket);
+
+                    // Case "d" - no strong types in the brackets, ignore
+                    if (strongDirection == BidiClass.OtherNeutral)
+                    {
+                        continue;
+                    }
+
+                    // Case "b" - strong type found that matches the embedding direction
+                    if ((strongDirection == BidiClass.LeftToRight || strongDirection == BidiClass.RightToLeft) && strongDirection == _runDirection)
+                    {
+                        SetPairedBracketDirection(pairedBracket, strongDirection);
+                        continue;
+                    }
+
+                    // Case "c" - found opposite strong type found, look before to establish context
+                    strongDirection = InspectBeforePairedBracket(pairedBracket, sos);
+                    
+                    if (strongDirection == _runDirection || strongDirection == BidiClass.OtherNeutral)
+                    {
+                        strongDirection = _runDirection;
+                    }
+
+                    SetPairedBracketDirection(pairedBracket, strongDirection);
+                }
+            }
+
+            // Rules N1 and N2 - resolve neutral types
+            for (i = 0; i < _runLength; ++i)
+            {
+                var resolvedClass = _runResolvedClasses[i];
+                
+                if (IsNeutralClass(resolvedClass))
+                {
+                    // Locate end of sequence
+                    var seqStart = i;
+                    var seqEnd = i;
+                    
+                    while (seqEnd < _runLength && IsNeutralClass(_runResolvedClasses[seqEnd]))
+                    {
+                        seqEnd++;
+                    }
+
+                    // Work out the preceding class
+                    BidiClass classBefore;
+                    
+                    if (seqStart == 0)
+                    {
+                        classBefore = sos;
+                    }
+                    else
+                    {
+                        classBefore = _runResolvedClasses[seqStart - 1];
+                        
+                        switch (classBefore)
+                        {
+                            case BidiClass.ArabicNumber:
+                            case BidiClass.EuropeanNumber:
+                            {
+                                classBefore = BidiClass.RightToLeft;
+                                
+                                break;
+                            }
+                        }
+                    }
+
+                    // Work out the following class
+                    BidiClass classAfter;
+                    
+                    if (seqEnd == _runLength)
+                    {
+                        classAfter = eos;
+                    }
+                    else
+                    {
+                        classAfter = _runResolvedClasses[seqEnd];
+
+                        switch (classAfter)
+                        {
+                            case BidiClass.ArabicNumber:
+                            case BidiClass.EuropeanNumber:
+                            {
+                                classAfter = BidiClass.RightToLeft;
+                                
+                                break;
+                            }
+                        }
+                    }
+
+                    // Work out the final resolved type
+                    BidiClass finalResolveClass;
+                    
+                    if (classBefore == classAfter)
+                    {
+                        // Rule N1
+                        finalResolveClass = classBefore;
+                    }
+                    else
+                    {
+                        // Rule N2
+                        finalResolveClass = _runDirection;
+                    }
+
+                    // Apply changes
+                    for (var j = seqStart; j < seqEnd; j++)
+                    {
+                        _runResolvedClasses[j] = finalResolveClass;
+                    }
+
+                    // continue after this run
+                    i = seqEnd;
+                }
+            }
+
+            // Rules I1 and I2 - resolve implicit types
+            if ((_runLevel & 0x01) == 0)
+            {
+                // Rule I1 - even
+                for (i = 0; i < _runLength; i++)
+                {
+                    var resolvedClass = _runResolvedClasses[i];
+                    ref var currentRunLevel = ref _runLevels[i];
+
+                    switch (resolvedClass)
+                    {
+                        case BidiClass.RightToLeft:
+                        {
+                            currentRunLevel++;
+                            break;
+                        }
+                        case BidiClass.ArabicNumber:
+                        case BidiClass.EuropeanNumber:
+                        {
+                            currentRunLevel += 2;
+                            
+                            break;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // Rule I2 - odd
+                for (i = 0; i < _runLength; i++)
+                {
+                    var resolvedClass = _runResolvedClasses[i];
+                    ref var currentRunLevel = ref _runLevels[i];
+                    
+                    if (resolvedClass != BidiClass.RightToLeft)
+                    {
+                        currentRunLevel++;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Locate all pair brackets in the current isolating run
+        /// </summary>
+        /// <returns>A sorted list of BracketPairs</returns>
+        private List<BracketPair> LocatePairedBrackets()
+        {
+            // Clear work collections
+            _pendingOpeningBrackets.Clear();
+            _pairedBrackets.Clear();
+
+            // Since List.Sort is expensive on memory if called often (it internally
+            // allocates an ArraySorted object) and since we will rarely have many
+            // items in this list (most paragraphs will only have a handful of bracket
+            // pairs - if that), we use a simple linear lookup and insert most of the
+            // time.  If there are more that `sortLimit` paired brackets we abort th
+            // linear searching/inserting and using List.Sort at the end.
+            const int sortLimit = 8;
+
+            // Process all characters in the run, looking for paired brackets
+            for (int i = 0, length = _runLength; i < length; i++)
+            {
+                // Ignore non-neutral characters
+                if (_runResolvedClasses[i] != BidiClass.OtherNeutral)
+                {
+                    continue;
+                }
+
+                switch (_runBiDiPairedBracketTypes[i])
+                {
+                    case BidiPairedBracketType.Open:
+                        if (_pendingOpeningBrackets.Count == MaxPairedBracketDepth)
+                        {
+                            goto exit;
+                        }
+
+                        _pendingOpeningBrackets.Insert(0, i);
+                        break;
+
+                    case BidiPairedBracketType.Close:
+                        // see if there is a match
+                        for (var j = 0; j < _pendingOpeningBrackets.Count; j++)
+                        {
+                            if (_runPairedBracketValues[i] != _runPairedBracketValues[_pendingOpeningBrackets[j]])
+                            {
+                                continue;
+                            }
+                            
+                            // Add this paired bracket set
+                            var opener = _pendingOpeningBrackets[j];
+                            
+                            if (_pairedBrackets.Count < sortLimit)
+                            {
+                                var ppi = 0;
+                                while (ppi < _pairedBrackets.Count && _pairedBrackets[ppi].OpeningIndex < opener)
+                                {
+                                    ppi++;
+                                }
+
+                                _pairedBrackets.Insert(ppi, new BracketPair(opener, i));
+                            }
+                            else
+                            {
+                                _pairedBrackets.Add(new BracketPair(opener, i));
+                            }
+
+                            // remove up to and including matched opener
+                            _pendingOpeningBrackets.RemoveRange(0, j + 1);
+                            break;
+                        }
+
+                        break;
+                }
+            }
+
+            exit:
+
+            // Is a sort pending?
+            if (_pairedBrackets.Count > sortLimit)
+            {
+                _pairedBrackets.Sort();
+            }
+
+            return _pairedBrackets;
+        }
+
+        /// <summary>
+        /// Inspect a paired bracket set and determine its strong direction
+        /// </summary>
+        /// <param name="bracketPair">The paired bracket to be inspected</param>
+        /// <returns>The direction of the bracket set content</returns>
+        private BidiClass InspectPairedBracket(in BracketPair bracketPair)
+        {
+            var directionFromLevel = DirectionFromLevel(_runLevel);
+            var directionOpposite = BidiClass.OtherNeutral;
+            
+            for (var i = bracketPair.OpeningIndex + 1; i < bracketPair.ClosingIndex; i++)
+            {
+                var dir = GetStrongClassN0(_runResolvedClasses[i]);
+                
+                if (dir == BidiClass.OtherNeutral)
+                {
+                    continue;
+                }
+
+                if (dir == directionFromLevel)
+                {
+                    return dir;
+                }
+
+                directionOpposite = dir;
+            }
+
+            return directionOpposite;
+        }
+
+        /// <summary>
+        /// Look for a strong type before a paired bracket
+        /// </summary>
+        /// <param name="bracketPair">The paired bracket set to be inspected</param>
+        /// <param name="sos">The sos in case nothing found before the bracket</param>
+        /// <returns>The strong direction before the brackets</returns>
+        private BidiClass InspectBeforePairedBracket(in BracketPair bracketPair, BidiClass sos)
+        {
+            for (var i = bracketPair.OpeningIndex - 1; i >= 0; --i)
+            {
+                var direction = GetStrongClassN0(_runResolvedClasses[i]);
+                
+                if (direction != BidiClass.OtherNeutral)
+                {
+                    return direction;
+                }
+            }
+
+            return sos;
+        }
+
+        /// <summary>
+        /// Sets the direction of a bracket pair, including setting the direction of
+        /// NSM's inside the brackets and following.
+        /// </summary>
+        /// <param name="bracketPair">The paired brackets</param>
+        /// <param name="direction">The resolved direction for the bracket pair</param>
+        private void SetPairedBracketDirection(in BracketPair bracketPair, BidiClass direction)
+        {
+            // Set the direction of the brackets
+            _runResolvedClasses[bracketPair.OpeningIndex] = direction;
+            _runResolvedClasses[bracketPair.ClosingIndex] = direction;
+
+            // Set the directionality of NSM's inside the brackets
+            for (var i = bracketPair.OpeningIndex + 1; i < bracketPair.ClosingIndex; i++)
+            {
+                if (_runOriginalClasses[i] == BidiClass.NonspacingMark)
+                {
+                    _runOriginalClasses[i] = direction;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            // Set the directionality of NSM's following the brackets
+            for (var i = bracketPair.ClosingIndex + 1; i < _runLength; i++)
+            {
+                if (_runOriginalClasses[i] == BidiClass.NonspacingMark)
+                {
+                    _runResolvedClasses[i] = direction;
+                }
+                else
+                {
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Resets whitespace levels. Implements rule L1
+        /// </summary>
+        private void ResetWhitespaceLevels()
+        {
+            for (var i = 0; i < _resolvedLevels.Length; i++)
+            {
+                var originalClass = _originalClasses[i];
+
+                switch (originalClass)
+                {
+                    case BidiClass.ParagraphSeparator:
+                    case BidiClass.SegmentSeparator:
+                    {
+                        // Rule L1, clauses one and two.
+                        _resolvedLevels[i] = _paragraphEmbeddingLevel;
+
+                        // Rule L1, clause three.
+                        for (var j = i - 1; j >= 0; --j)
+                        {
+                            if (IsWhitespace(_originalClasses[j]))
+                            {
+                                // including format codes
+                                _resolvedLevels[j] = _paragraphEmbeddingLevel;
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+                        
+                        break;
+                    }
+                }
+            }
+
+            // Rule L1, clause four.
+            for (var j = _resolvedLevels.Length - 1; j >= 0; j--)
+            {
+                if (IsWhitespace(_originalClasses[j]))
+                { // including format codes
+                    _resolvedLevels[j] = _paragraphEmbeddingLevel;
+                }
+                else
+                {
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Assign levels to any characters that would be have been
+        /// removed by rule X9.  The idea is to keep level runs together
+        /// that would otherwise be broken by an interfering isolate/embedding
+        /// control character.
+        /// </summary>
+        private void AssignLevelsToCodePointsRemovedByX9()
+        {
+            // Redundant?
+            if (!_hasIsolates && !_hasEmbeddings)
+            {
+                return;
+            }
+
+            // No-op?
+            if (_workingClasses.Length == 0)
+            {
+                return;
+            }
+
+            // Fix up first character
+            if (_resolvedLevels[0] < 0)
+            {
+                _resolvedLevels[0] = _paragraphEmbeddingLevel;
+            }
+
+            if (IsRemovedByX9(_originalClasses[0]))
+            {
+                _workingClasses[0] = _originalClasses[0];
+            }
+
+            for (int i = 1, length = _workingClasses.Length; i < length; i++)
+            {
+                var originalClass = _originalClasses[i];
+                
+                if (IsRemovedByX9(originalClass))
+                {
+                    _workingClasses[i] = originalClass;
+                    _resolvedLevels[i] = _resolvedLevels[i - 1];
+                }
+            }
+        }
+
+        /// <summary>
+        /// Check if a directionality type represents whitespace
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsWhitespace(BidiClass biDiClass)
+        {
+            switch (biDiClass)
+            {
+                    case BidiClass.LeftToRightEmbedding:
+                    case BidiClass.RightToLeftEmbedding:
+                    case BidiClass.LeftToRightOverride:
+                    case BidiClass.RightToLeftOverride:
+                    case BidiClass.PopDirectionalFormat:
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.RightToLeftIsolate:
+                    case BidiClass.FirstStrongIsolate:
+                    case BidiClass.PopDirectionalIsolate:
+                    case BidiClass.BoundaryNeutral:
+                    case BidiClass.WhiteSpace:
+                        return true;
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Convert a level to a direction where odd is RTL and
+        /// even is LTR
+        /// </summary>
+        /// <param name="level">The level to convert</param>
+        /// <returns>A directionality</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static BidiClass DirectionFromLevel(int level)
+            => ((level & 0x1) == 0) ? BidiClass.LeftToRight : BidiClass.RightToLeft;
+
+        /// <summary>
+        /// Helper to check if a directionality is removed by rule X9
+        /// </summary>
+        /// <param name="biDiClass">The bidi type to check</param>
+        /// <returns>True if rule X9 would remove this character; otherwise false</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsRemovedByX9(BidiClass biDiClass)
+        {
+            switch (biDiClass)
+            {
+                    case BidiClass.LeftToRightEmbedding:
+                    case  BidiClass.RightToLeftEmbedding:
+                    case  BidiClass.LeftToRightOverride:
+                    case  BidiClass.RightToLeftOverride:
+                    case  BidiClass.PopDirectionalFormat:
+                    case  BidiClass.BoundaryNeutral:
+                        return true;
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Check if a a directionality is neutral for rules N1 and N2
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsNeutralClass(BidiClass direction)
+        {
+            switch (direction)
+            {
+                    case BidiClass.ParagraphSeparator:
+                    case BidiClass.SegmentSeparator:
+                    case BidiClass.WhiteSpace:
+                    case BidiClass.OtherNeutral:
+                    case BidiClass.RightToLeftIsolate:
+                    case BidiClass.LeftToRightIsolate:
+                    case BidiClass.FirstStrongIsolate:
+                    case BidiClass.PopDirectionalIsolate:
+                        return true;
+                        default:
+                            return false;
+            }
+        }
+
+        /// <summary>
+        /// Maps a direction to a strong class for rule N0
+        /// </summary>
+        /// <param name="direction">The direction to map</param>
+        /// <returns>A strong direction - R, L or ON</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static BidiClass GetStrongClassN0(BidiClass direction)
+        {
+            switch (direction)
+            {
+                    case BidiClass.EuropeanNumber:
+                    case BidiClass.ArabicNumber:
+                    case BidiClass.ArabicLetter:
+                    case BidiClass.RightToLeft:
+                        return BidiClass.RightToLeft;
+                    case BidiClass.LeftToRight:
+                        return BidiClass.LeftToRight;
+                    default:
+                        return BidiClass.OtherNeutral;
+            }
+        }
+
+        /// <summary>
+        /// Hold the start and end index of a pair of brackets
+        /// </summary>
+        private readonly struct BracketPair : IComparable<BracketPair>
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="BracketPair"/> struct.
+            /// </summary>
+            /// <param name="openingIndex">Index of the opening bracket</param>
+            /// <param name="closingIndex">Index of the closing bracket</param>
+            public BracketPair(int openingIndex, int closingIndex)
+            {
+                OpeningIndex = openingIndex;
+                ClosingIndex = closingIndex;
+            }
+
+            /// <summary>
+            /// Gets the index of the opening bracket
+            /// </summary>
+            public int OpeningIndex { get; }
+
+            /// <summary>
+            /// Gets the index of the closing bracket
+            /// </summary>
+            public int ClosingIndex { get; }
+
+            public int CompareTo(BracketPair other)
+                => OpeningIndex.CompareTo(other.OpeningIndex);
+        }
+
+        /// <summary>
+        /// Status stack entry used while resolving explicit
+        /// embedding levels
+        /// </summary>
+        private readonly struct Status
+        {
+            public Status(sbyte embeddingLevel, BidiClass overrideStatus, bool isolateStatus)
+            {
+                EmbeddingLevel = embeddingLevel;
+                OverrideStatus = overrideStatus;
+                IsolateStatus = isolateStatus;
+            }
+
+            public sbyte EmbeddingLevel { get; }
+
+            public BidiClass OverrideStatus { get; }
+
+            public bool IsolateStatus { get; }
+        }
+
+        /// <summary>
+        /// Provides information about a level run - a continuous
+        /// sequence of equal levels.
+        /// </summary>
+        private readonly struct LevelRun
+        {
+            public LevelRun(int start, int length, int level, BidiClass sos, BidiClass eos)
+            {
+                Start = start;
+                Length = length;
+                Level = level;
+                Sos = sos;
+                Eos = eos;
+            }
+
+            public int Start { get; }
+
+            public int Length { get; }
+
+            public int Level { get; }
+
+            public BidiClass Sos { get; }
+
+            public BidiClass Eos { get; }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiClass.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiClass.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiClass.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiClass.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiData.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiData.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiData.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiData.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiPairedBracketType.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiPairedBracketType.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiPairedBracketType.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiPairedBracketType.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Codepoint.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/Codepoint.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/CodepointEnumerator.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/CodepointEnumerator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/CodepointEnumerator.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/CodepointEnumerator.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GeneralCategory.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/GeneralCategory.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/GeneralCategory.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/GeneralCategory.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Grapheme.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/Grapheme.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/Grapheme.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/Grapheme.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeBreakClass.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeBreakClass.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeBreakClass.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeBreakClass.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeEnumerator.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreak.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreak.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreak.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreak.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakClass.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakClass.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakClass.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakClass.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakPairTable.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakPairTable.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakPairTable.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakPairTable.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Script.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/Script.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/Script.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/Script.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeData.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeData.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeData.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeData.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrie.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrie.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrie.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrie.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrieBuilder.Constants.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrieBuilder.Constants.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrieBuilder.Constants.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrieBuilder.Constants.cs
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrieBuilder.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrieBuilder.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrieBuilder.cs
rename to src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrieBuilder.cs
diff --git a/src/Avalonia.Visuals/Media/TextHitTestResult.cs b/src/Avalonia.Base/Media/TextHitTestResult.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextHitTestResult.cs
rename to src/Avalonia.Base/Media/TextHitTestResult.cs
diff --git a/src/Avalonia.Base/Media/TextLeadingPrefixTrimming.cs b/src/Avalonia.Base/Media/TextLeadingPrefixTrimming.cs
new file mode 100644
index 0000000000..19ca1a0198
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextLeadingPrefixTrimming.cs
@@ -0,0 +1,31 @@
+using Avalonia.Media.TextFormatting;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    public sealed class TextLeadingPrefixTrimming : TextTrimming
+    {
+        private readonly ReadOnlySlice<char> _ellipsis;
+        private readonly int _prefixLength;
+
+        public TextLeadingPrefixTrimming(char ellipsis, int prefixLength) : this(new[] { ellipsis }, prefixLength)
+        {
+        }
+
+        public TextLeadingPrefixTrimming(char[] ellipsis, int prefixLength)
+        {
+            _prefixLength = prefixLength;
+            _ellipsis = new ReadOnlySlice<char>(ellipsis);
+        }
+
+        public override TextCollapsingProperties CreateCollapsingProperties(TextCollapsingCreateInfo createInfo)
+        {
+            return new TextLeadingPrefixCharacterEllipsis(_ellipsis, _prefixLength, createInfo.Width, createInfo.TextRunProperties);
+        }
+
+        public override string ToString()
+        {
+            return nameof(PrefixCharacterEllipsis);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextNoneTrimming.cs b/src/Avalonia.Base/Media/TextNoneTrimming.cs
new file mode 100644
index 0000000000..ec238cf17e
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextNoneTrimming.cs
@@ -0,0 +1,18 @@
+using System;
+using Avalonia.Media.TextFormatting;
+
+namespace Avalonia.Media
+{
+    internal sealed class TextNoneTrimming : TextTrimming
+    {
+        public override TextCollapsingProperties CreateCollapsingProperties(TextCollapsingCreateInfo createInfo)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override string ToString()
+        {
+            return nameof(None);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextTrailingTrimming.cs b/src/Avalonia.Base/Media/TextTrailingTrimming.cs
new file mode 100644
index 0000000000..5bb35f0ba7
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextTrailingTrimming.cs
@@ -0,0 +1,36 @@
+using Avalonia.Media.TextFormatting;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media
+{
+    public sealed class TextTrailingTrimming : TextTrimming
+    {
+        private readonly ReadOnlySlice<char> _ellipsis;
+        private readonly bool _isWordBased;
+
+        public TextTrailingTrimming(char ellipsis, bool isWordBased) : this(new[] {ellipsis}, isWordBased)
+        {
+        }
+        
+        public TextTrailingTrimming(char[] ellipsis, bool isWordBased)
+        {
+            _isWordBased = isWordBased;
+            _ellipsis = new ReadOnlySlice<char>(ellipsis);
+        }
+
+        public override TextCollapsingProperties CreateCollapsingProperties(TextCollapsingCreateInfo createInfo)
+        {
+            if (_isWordBased)
+            {
+                return new TextTrailingWordEllipsis(_ellipsis, createInfo.Width, createInfo.TextRunProperties);
+            }
+
+            return new TextTrailingCharacterEllipsis(_ellipsis, createInfo.Width, createInfo.TextRunProperties);
+        }
+
+        public override string ToString()
+        {
+            return _isWordBased ? nameof(WordEllipsis) : nameof(CharacterEllipsis);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextTrimming.cs b/src/Avalonia.Base/Media/TextTrimming.cs
new file mode 100644
index 0000000000..b6f5be496f
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextTrimming.cs
@@ -0,0 +1,76 @@
+using System;
+using Avalonia.Media.TextFormatting;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes how text is trimmed when it overflows.
+    /// </summary>
+    public abstract class TextTrimming
+    {
+        public static char s_defaultEllipsisChar = '\u2026';
+
+        /// <summary>
+        /// Text is not trimmed.
+        /// </summary>
+        public static TextTrimming None { get; } = new TextNoneTrimming();
+
+        /// <summary>
+        /// Text is trimmed at a character boundary. An ellipsis (...) is drawn in place of remaining text.
+        /// </summary>
+        public static TextTrimming CharacterEllipsis { get; } = new TextTrailingTrimming(s_defaultEllipsisChar, false);
+
+        /// <summary>
+        /// Text is trimmed at a word boundary. An ellipsis (...) is drawn in place of remaining text.
+        /// </summary>
+        public static TextTrimming WordEllipsis { get; } = new TextTrailingTrimming(s_defaultEllipsisChar, true);
+
+        /// <summary>
+        /// Text is trimmed after a given prefix length. An ellipsis (...) is drawn in between prefix and suffix and represents remaining text.
+        /// </summary>
+        public static TextTrimming PrefixCharacterEllipsis { get; } = new TextLeadingPrefixTrimming(s_defaultEllipsisChar, 8);
+
+        /// <summary>
+        /// Text is trimmed at a character boundary starting from the beginning. An ellipsis (...) is drawn in place of remaining text.
+        /// </summary>
+        public static TextTrimming LeadingCharacterEllipsis { get; } = new TextLeadingPrefixTrimming(s_defaultEllipsisChar, 0);
+
+        /// <summary>
+        /// Creates properties that will be used for collapsing lines of text.
+        /// </summary>
+        /// <param name="createInfo">Contextual info about text that will be collapsed.</param>
+        public abstract TextCollapsingProperties CreateCollapsingProperties(TextCollapsingCreateInfo createInfo);
+
+        /// <summary>
+        /// Parses a text trimming string. Names must match static properties defined in this class.
+        /// </summary>
+        /// <param name="s">The text trimming string.</param>
+        /// <returns>The <see cref="TextTrimming"/>.</returns>
+        public static TextTrimming Parse(string s)
+        {
+            bool Matches(string name)
+            {
+                return name.Equals(s, StringComparison.OrdinalIgnoreCase);
+            }
+
+            if (Matches(nameof(None)))
+            {
+                return None;
+            }
+            if (Matches(nameof(CharacterEllipsis)))
+            {
+                return CharacterEllipsis;
+            }
+            else if (Matches(nameof(WordEllipsis)))
+            {
+                return WordEllipsis;
+            }
+            else if (Matches(nameof(PrefixCharacterEllipsis)))
+            {
+                return PrefixCharacterEllipsis;
+            }
+
+            throw new FormatException($"Invalid text trimming string: '{s}'.");
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextWrapping.cs b/src/Avalonia.Base/Media/TextWrapping.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TextWrapping.cs
rename to src/Avalonia.Base/Media/TextWrapping.cs
diff --git a/src/Avalonia.Base/Media/TileBrush.cs b/src/Avalonia.Base/Media/TileBrush.cs
new file mode 100644
index 0000000000..ab1ee2d604
--- /dev/null
+++ b/src/Avalonia.Base/Media/TileBrush.cs
@@ -0,0 +1,156 @@
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes how a <see cref="TileBrush"/> is tiled.
+    /// </summary>
+    public enum TileMode
+    {
+        /// <summary>
+        /// A single repeat of the content will be displayed.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// The content will be repeated horizontally, with alternate tiles mirrored.
+        /// </summary>
+        FlipX,
+
+        /// <summary>
+        /// The content will be repeated vertically, with alternate tiles mirrored.
+        /// </summary>
+        FlipY,
+
+        /// <summary>
+        /// The content will be repeated horizontally and vertically, with alternate tiles mirrored.
+        /// </summary>
+        FlipXY,
+
+        /// <summary>
+        /// The content will be repeated.
+        /// </summary>
+        Tile
+    }
+
+    /// <summary>
+    /// Base class for brushes which display repeating images.
+    /// </summary>
+    public abstract class TileBrush : Brush, ITileBrush
+    {
+        /// <summary>
+        /// Defines the <see cref="AlignmentX"/> property.
+        /// </summary>
+        public static readonly StyledProperty<AlignmentX> AlignmentXProperty =
+            AvaloniaProperty.Register<TileBrush, AlignmentX>(nameof(AlignmentX), AlignmentX.Center);
+
+        /// <summary>
+        /// Defines the <see cref="AlignmentY"/> property.
+        /// </summary>
+        public static readonly StyledProperty<AlignmentY> AlignmentYProperty =
+            AvaloniaProperty.Register<TileBrush, AlignmentY>(nameof(AlignmentY), AlignmentY.Center);
+
+        /// <summary>
+        /// Defines the <see cref="DestinationRect"/> property.
+        /// </summary>
+        public static readonly StyledProperty<RelativeRect> DestinationRectProperty =
+            AvaloniaProperty.Register<TileBrush, RelativeRect>(nameof(DestinationRect), RelativeRect.Fill);
+
+        /// <summary>
+        /// Defines the <see cref="SourceRect"/> property.
+        /// </summary>
+        public static readonly StyledProperty<RelativeRect> SourceRectProperty =
+            AvaloniaProperty.Register<TileBrush, RelativeRect>(nameof(SourceRect), RelativeRect.Fill);
+
+        /// <summary>
+        /// Defines the <see cref="Stretch"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Stretch> StretchProperty =
+            AvaloniaProperty.Register<TileBrush, Stretch>(nameof(Stretch), Stretch.Uniform);
+
+        /// <summary>
+        /// Defines the <see cref="TileMode"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TileMode> TileModeProperty =
+            AvaloniaProperty.Register<TileBrush, TileMode>(nameof(TileMode));
+
+        static TileBrush()
+        {
+            AffectsRender<TileBrush>(
+                AlignmentXProperty,
+                AlignmentYProperty,
+                DestinationRectProperty,
+                SourceRectProperty,
+                StretchProperty,
+                TileModeProperty);
+            RenderOptions.BitmapInterpolationModeProperty.OverrideDefaultValue<TileBrush>(BitmapInterpolationMode.Default);
+        }
+
+        /// <summary>
+        /// Gets or sets the horizontal alignment of a tile in the destination.
+        /// </summary>
+        public AlignmentX AlignmentX
+        {
+            get { return GetValue(AlignmentXProperty); }
+            set { SetValue(AlignmentXProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the horizontal alignment of a tile in the destination.
+        /// </summary>
+        public AlignmentY AlignmentY
+        {
+            get { return GetValue(AlignmentYProperty); }
+            set { SetValue(AlignmentYProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the rectangle on the destination in which to paint a tile.
+        /// </summary>
+        public RelativeRect DestinationRect
+        {
+            get { return GetValue(DestinationRectProperty); }
+            set { SetValue(DestinationRectProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the rectangle of the source image that will be displayed.
+        /// </summary>
+        public RelativeRect SourceRect
+        {
+            get { return GetValue(SourceRectProperty); }
+            set { SetValue(SourceRectProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value controlling how the source rectangle will be stretched to fill
+        /// the destination rect.
+        /// </summary>
+        public Stretch Stretch
+        {
+            get { return (Stretch)GetValue(StretchProperty); }
+            set { SetValue(StretchProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the brush's tile mode.
+        /// </summary>
+        public TileMode TileMode
+        {
+            get { return (TileMode)GetValue(TileModeProperty); }
+            set { SetValue(TileModeProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the bitmap interpolation mode.
+        /// </summary>
+        /// <value>
+        /// The bitmap interpolation mode.
+        /// </value>
+        public BitmapInterpolationMode BitmapInterpolationMode
+        {
+            get { return RenderOptions.GetBitmapInterpolationMode(this); }
+            set { RenderOptions.SetBitmapInterpolationMode(this, value); }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/Transform.cs b/src/Avalonia.Base/Media/Transform.cs
new file mode 100644
index 0000000000..023a8b9cdd
--- /dev/null
+++ b/src/Avalonia.Base/Media/Transform.cs
@@ -0,0 +1,66 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Animation.Animators;
+using Avalonia.Media.Immutable;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Represents a transform on an <see cref="IVisual"/>.
+    /// </summary>
+    public abstract class Transform : Animatable, IMutableTransform
+    {
+        static Transform()
+        {
+            Animation.Animation.RegisterAnimator<TransformAnimator>(prop =>
+                typeof(ITransform).IsAssignableFrom(prop.OwnerType));
+        }
+
+        /// <summary>
+        /// Raised when the transform changes.
+        /// </summary>
+        public event EventHandler? Changed;
+
+        /// <summary>
+        /// Gets the transform's <see cref="Matrix"/>.
+        /// </summary>
+        public abstract Matrix Value { get; }
+
+        /// <summary>
+        /// Parses a <see cref="Transform"/> string.
+        /// </summary>
+        /// <param name="s">Six comma-delimited double values that describe the new <see cref="Transform"/>. For details check <see cref="Matrix.Parse(string)"/> </param>
+        /// <returns>The <see cref="Transform"/>.</returns>
+        public static Transform Parse(string s)
+        {
+            return new MatrixTransform(Matrix.Parse(s));
+        }
+
+        /// <summary>
+        /// Raises the <see cref="Changed"/> event.
+        /// </summary>
+        protected void RaiseChanged()
+        {
+            Changed?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Converts a transform to an immutable transform.
+        /// </summary>
+        /// <returns>The immutable transform</returns>
+        public ImmutableTransform ToImmutable()
+        {
+            return new ImmutableTransform(this.Value);
+        }
+
+        /// <summary>
+        /// Returns a String representing this transform matrix instance.
+        /// </summary>
+        /// <returns>The string representation.</returns>
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TransformConverter.cs b/src/Avalonia.Base/Media/TransformConverter.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TransformConverter.cs
rename to src/Avalonia.Base/Media/TransformConverter.cs
diff --git a/src/Avalonia.Base/Media/TransformExtensions.cs b/src/Avalonia.Base/Media/TransformExtensions.cs
new file mode 100644
index 0000000000..ccf2231ce2
--- /dev/null
+++ b/src/Avalonia.Base/Media/TransformExtensions.cs
@@ -0,0 +1,26 @@
+using System;
+using Avalonia.Media.Immutable;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Extension methods for transform classes.
+    /// </summary>
+    public static class TransformExtensions
+    {
+        /// <summary>
+        /// Converts a transform to an immutable transform.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <returns>
+        /// The result of calling <see cref="Transform.ToImmutable"/> if the transform is mutable,
+        /// otherwise <paramref name="transform"/>.
+        /// </returns>
+        public static ImmutableTransform ToImmutable(this ITransform transform)
+        {
+            _ = transform ?? throw new ArgumentNullException(nameof(transform));
+
+            return (transform as Transform)?.ToImmutable() ?? new ImmutableTransform(transform.Value);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TransformGroup.cs b/src/Avalonia.Base/Media/TransformGroup.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TransformGroup.cs
rename to src/Avalonia.Base/Media/TransformGroup.cs
diff --git a/src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs b/src/Avalonia.Base/Media/Transformation/InterpolationUtilities.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs
rename to src/Avalonia.Base/Media/Transformation/InterpolationUtilities.cs
diff --git a/src/Avalonia.Visuals/Media/Transformation/TransformOperation.cs b/src/Avalonia.Base/Media/Transformation/TransformOperation.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Transformation/TransformOperation.cs
rename to src/Avalonia.Base/Media/Transformation/TransformOperation.cs
diff --git a/src/Avalonia.Visuals/Media/Transformation/TransformOperations.cs b/src/Avalonia.Base/Media/Transformation/TransformOperations.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Transformation/TransformOperations.cs
rename to src/Avalonia.Base/Media/Transformation/TransformOperations.cs
diff --git a/src/Avalonia.Visuals/Media/Transformation/TransformParser.cs b/src/Avalonia.Base/Media/Transformation/TransformParser.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Transformation/TransformParser.cs
rename to src/Avalonia.Base/Media/Transformation/TransformParser.cs
diff --git a/src/Avalonia.Visuals/Media/TranslateTransform.cs b/src/Avalonia.Base/Media/TranslateTransform.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/TranslateTransform.cs
rename to src/Avalonia.Base/Media/TranslateTransform.cs
diff --git a/src/Avalonia.Visuals/Media/Typeface.cs b/src/Avalonia.Base/Media/Typeface.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/Typeface.cs
rename to src/Avalonia.Base/Media/Typeface.cs
diff --git a/src/Avalonia.Visuals/Media/UnicodeRange.cs b/src/Avalonia.Base/Media/UnicodeRange.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/UnicodeRange.cs
rename to src/Avalonia.Base/Media/UnicodeRange.cs
diff --git a/src/Avalonia.Visuals/Media/VisualBrush.cs b/src/Avalonia.Base/Media/VisualBrush.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/VisualBrush.cs
rename to src/Avalonia.Base/Media/VisualBrush.cs
diff --git a/src/Avalonia.Base/Metadata/DataTypeAttribute.cs b/src/Avalonia.Base/Metadata/DataTypeAttribute.cs
new file mode 100644
index 0000000000..ac46a0d30a
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/DataTypeAttribute.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Avalonia.Metadata;
+
+/// <summary>
+/// Defines the property that contains type that should be used as a type information for compiled bindings.
+/// </summary>
+/// <remarks>
+/// Used on DataTemplate.DataType property so it can be inherited in compiled bindings inside of the template.
+/// </remarks>
+[AttributeUsage(AttributeTargets.Property)]
+public class DataTypeAttribute : Attribute
+{
+    
+}
diff --git a/src/Avalonia.Base/Metadata/NotClientImplementableAttribute.cs b/src/Avalonia.Base/Metadata/NotClientImplementableAttribute.cs
new file mode 100644
index 0000000000..348c983c03
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/NotClientImplementableAttribute.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Avalonia.Metadata
+{
+    /// <summary>
+    /// This interface is not intended to be implemented outside of the core Avalonia framework as
+    /// its API may change without warning.
+    /// </summary>
+    /// <remarks>
+    /// This interface is stable for consumption by a client, but should not be implemented as members
+    /// may be added to its API.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Interface)]
+    public class NotClientImplementableAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Avalonia.Base/Metadata/UnstableAttribute.cs b/src/Avalonia.Base/Metadata/UnstableAttribute.cs
new file mode 100644
index 0000000000..3b6fa5168a
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/UnstableAttribute.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Avalonia.Metadata
+{
+    /// <summary>
+    /// This API is unstable and is not covered by API compatibility guarantees between minor and
+    /// patch releases.
+    /// </summary>
+    public class UnstableAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/PixelPoint.cs b/src/Avalonia.Base/PixelPoint.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PixelPoint.cs
rename to src/Avalonia.Base/PixelPoint.cs
diff --git a/src/Avalonia.Base/PixelRect.cs b/src/Avalonia.Base/PixelRect.cs
new file mode 100644
index 0000000000..855ba104ad
--- /dev/null
+++ b/src/Avalonia.Base/PixelRect.cs
@@ -0,0 +1,464 @@
+using System;
+using System.Globalization;
+using Avalonia.Utilities;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Represents a rectangle in device pixels.
+    /// </summary>
+    public readonly struct PixelRect : IEquatable<PixelRect>
+    {
+        /// <summary>
+        /// An empty rectangle.
+        /// </summary>
+        public static readonly PixelRect Empty = default;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
+        /// </summary>
+        /// <param name="x">The X position.</param>
+        /// <param name="y">The Y position.</param>
+        /// <param name="width">The width.</param>
+        /// <param name="height">The height.</param>
+        public PixelRect(int x, int y, int width, int height)
+        {
+            X = x;
+            Y = y;
+            Width = width;
+            Height = height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
+        /// </summary>
+        /// <param name="size">The size of the rectangle.</param>
+        public PixelRect(PixelSize size)
+        {
+            X = 0;
+            Y = 0;
+            Width = size.Width;
+            Height = size.Height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
+        /// </summary>
+        /// <param name="position">The position of the rectangle.</param>
+        /// <param name="size">The size of the rectangle.</param>
+        public PixelRect(PixelPoint position, PixelSize size)
+        {
+            X = position.X;
+            Y = position.Y;
+            Width = size.Width;
+            Height = size.Height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
+        /// </summary>
+        /// <param name="topLeft">The top left position of the rectangle.</param>
+        /// <param name="bottomRight">The bottom right position of the rectangle.</param>
+        public PixelRect(PixelPoint topLeft, PixelPoint bottomRight)
+        {
+            X = topLeft.X;
+            Y = topLeft.Y;
+            Width = bottomRight.X - topLeft.X;
+            Height = bottomRight.Y - topLeft.Y;
+        }
+
+        /// <summary>
+        /// Gets the X position.
+        /// </summary>
+        public int X { get; }
+
+        /// <summary>
+        /// Gets the Y position.
+        /// </summary>
+        public int Y { get; }
+
+        /// <summary>
+        /// Gets the width.
+        /// </summary>
+        public int Width { get; }
+
+        /// <summary>
+        /// Gets the height.
+        /// </summary>
+        public int Height { get; }
+
+        /// <summary>
+        /// Gets the position of the rectangle.
+        /// </summary>
+        public PixelPoint Position => new PixelPoint(X, Y);
+
+        /// <summary>
+        /// Gets the size of the rectangle.
+        /// </summary>
+        public PixelSize Size => new PixelSize(Width, Height);
+
+        /// <summary>
+        /// Gets the right position of the rectangle.
+        /// </summary>
+        public int Right => X + Width;
+
+        /// <summary>
+        /// Gets the bottom position of the rectangle.
+        /// </summary>
+        public int Bottom => Y + Height;
+
+        /// <summary>
+        /// Gets the top left point of the rectangle.
+        /// </summary>
+        public PixelPoint TopLeft => new PixelPoint(X, Y);
+
+        /// <summary>
+        /// Gets the top right point of the rectangle.
+        /// </summary>
+        public PixelPoint TopRight => new PixelPoint(Right, Y);
+
+        /// <summary>
+        /// Gets the bottom left point of the rectangle.
+        /// </summary>
+        public PixelPoint BottomLeft => new PixelPoint(X, Bottom);
+
+        /// <summary>
+        /// Gets the bottom right point of the rectangle.
+        /// </summary>
+        public PixelPoint BottomRight => new PixelPoint(Right, Bottom);
+
+        /// <summary>
+        /// Gets the center point of the rectangle.
+        /// </summary>
+        public PixelPoint Center => new PixelPoint(X + (Width / 2), Y + (Height / 2));
+
+        /// <summary>
+        /// Gets a value that indicates whether the rectangle is empty.
+        /// </summary>
+        public bool IsEmpty => Width == 0 && Height == 0;
+
+        /// <summary>
+        /// Checks for equality between two <see cref="PixelRect"/>s.
+        /// </summary>
+        /// <param name="left">The first rect.</param>
+        /// <param name="right">The second rect.</param>
+        /// <returns>True if the rects are equal; otherwise false.</returns>
+        public static bool operator ==(PixelRect left, PixelRect right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Checks for inequality between two <see cref="PixelRect"/>s.
+        /// </summary>
+        /// <param name="left">The first rect.</param>
+        /// <param name="right">The second rect.</param>
+        /// <returns>True if the rects are unequal; otherwise false.</returns>
+        public static bool operator !=(PixelRect left, PixelRect right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Determines whether a point in in the bounds of the rectangle.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>
+        public bool Contains(PixelPoint p)
+        {
+            return p.X >= X && p.X <= Right && p.Y >= Y && p.Y <= Bottom;
+        }
+        
+        /// <summary>
+        /// Determines whether a point is in the bounds of the rectangle, exclusive of the
+        /// rectangle's bottom/right edge.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>    
+        public bool ContainsExclusive(PixelPoint p)
+        {
+            return p.X >= X && p.X < X + Width &&
+                   p.Y >= Y && p.Y < Y + Height;
+        }
+
+        /// <summary>
+        /// Determines whether the rectangle fully contains another rectangle.
+        /// </summary>
+        /// <param name="r">The rectangle.</param>
+        /// <returns>true if the rectangle is fully contained; otherwise false.</returns>
+        public bool Contains(PixelRect r)
+        {
+            return Contains(r.TopLeft) && Contains(r.BottomRight);
+        }
+
+        /// <summary>
+        /// Centers another rectangle in this rectangle.
+        /// </summary>
+        /// <param name="rect">The rectangle to center.</param>
+        /// <returns>The centered rectangle.</returns>
+        public PixelRect CenterRect(PixelRect rect)
+        {
+            return new PixelRect(
+                X + ((Width - rect.Width) / 2),
+                Y + ((Height - rect.Height) / 2),
+                rect.Width,
+                rect.Height);
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the rect is equal to the other given rect.
+        /// </summary>
+        /// <param name="other">The other rect to test equality against.</param>
+        /// <returns>True if this rect is equal to other; False otherwise.</returns>
+        public bool Equals(PixelRect other)
+        {
+            return Position == other.Position && Size == other.Size;
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the given object is equal to this rectangle.
+        /// </summary>
+        /// <param name="obj">The object to compare against.</param>
+        /// <returns>True if the object is equal to this rectangle; false otherwise.</returns>
+        public override bool Equals(object? obj) => obj is PixelRect other && Equals(other);
+
+        /// <summary>
+        /// Returns the hash code for this instance.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hash = 17;
+                hash = (hash * 23) + X.GetHashCode();
+                hash = (hash * 23) + Y.GetHashCode();
+                hash = (hash * 23) + Width.GetHashCode();
+                hash = (hash * 23) + Height.GetHashCode();
+                return hash;
+            }
+        }
+
+        /// <summary>
+        /// Gets the intersection of two rectangles.
+        /// </summary>
+        /// <param name="rect">The other rectangle.</param>
+        /// <returns>The intersection.</returns>
+        public PixelRect Intersect(PixelRect rect)
+        {
+            var newLeft = (rect.X > X) ? rect.X : X;
+            var newTop = (rect.Y > Y) ? rect.Y : Y;
+            var newRight = (rect.Right < Right) ? rect.Right : Right;
+            var newBottom = (rect.Bottom < Bottom) ? rect.Bottom : Bottom;
+
+            if ((newRight > newLeft) && (newBottom > newTop))
+            {
+                return new PixelRect(newLeft, newTop, newRight - newLeft, newBottom - newTop);
+            }
+            else
+            {
+                return Empty;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether a rectangle intersects with this rectangle.
+        /// </summary>
+        /// <param name="rect">The other rectangle.</param>
+        /// <returns>
+        /// True if the specified rectangle intersects with this one; otherwise false.
+        /// </returns>
+        public bool Intersects(PixelRect rect)
+        {
+            return (rect.X < Right) && (X < rect.Right) && (rect.Y < Bottom) && (Y < rect.Bottom);
+        }
+        
+        /// <summary>
+        /// Translates the rectangle by an offset.
+        /// </summary>
+        /// <param name="offset">The offset.</param>
+        /// <returns>The translated rectangle.</returns>
+        public PixelRect Translate(PixelVector offset)
+        {
+            return new PixelRect(Position + offset, Size);
+        }
+
+        /// <summary>
+        /// Gets the union of two rectangles.
+        /// </summary>
+        /// <param name="rect">The other rectangle.</param>
+        /// <returns>The union.</returns>
+        public PixelRect Union(PixelRect rect)
+        {
+            if (IsEmpty)
+            {
+                return rect;
+            }
+            else if (rect.IsEmpty)
+            {
+                return this;
+            }
+            else
+            {
+                var x1 = Math.Min(X, rect.X);
+                var x2 = Math.Max(Right, rect.Right);
+                var y1 = Math.Min(Y, rect.Y);
+                var y2 = Math.Max(Bottom, rect.Bottom);
+
+                return new PixelRect(new PixelPoint(x1, y1), new PixelPoint(x2, y2));
+            }
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="PixelRect"/> with the specified X position.
+        /// </summary>
+        /// <param name="x">The x position.</param>
+        /// <returns>The new <see cref="PixelRect"/>.</returns>
+        public PixelRect WithX(int x)
+        {
+            return new PixelRect(x, Y, Width, Height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="PixelRect"/> with the specified Y position.
+        /// </summary>
+        /// <param name="y">The y position.</param>
+        /// <returns>The new <see cref="PixelRect"/>.</returns>
+        public PixelRect WithY(int y)
+        {
+            return new PixelRect(X, y, Width, Height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="PixelRect"/> with the specified width.
+        /// </summary>
+        /// <param name="width">The width.</param>
+        /// <returns>The new <see cref="PixelRect"/>.</returns>
+        public PixelRect WithWidth(int width)
+        {
+            return new PixelRect(X, Y, width, Height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="PixelRect"/> with the specified height.
+        /// </summary>
+        /// <param name="height">The height.</param>
+        /// <returns>The new <see cref="PixelRect"/>.</returns>
+        public PixelRect WithHeight(int height)
+        {
+            return new PixelRect(X, Y, Width, Height);
+        }
+
+        /// <summary>
+        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
+        /// specified scaling factor.
+        /// </summary>
+        /// <param name="scale">The scaling factor.</param>
+        /// <returns>The device-independent rect.</returns>
+        public Rect ToRect(double scale) => new Rect(Position.ToPoint(scale), Size.ToSize(scale));
+
+        /// <summary>
+        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
+        /// specified scaling factor.
+        /// </summary>
+        /// <param name="scale">The scaling factor.</param>
+        /// <returns>The device-independent rect.</returns>
+        public Rect ToRect(Vector scale) => new Rect(Position.ToPoint(scale), Size.ToSize(scale));
+
+        /// <summary>
+        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
+        /// specified dots per inch (DPI).
+        /// </summary>
+        /// <param name="dpi">The dots per inch of the device.</param>
+        /// <returns>The device-independent rect.</returns>
+        public Rect ToRectWithDpi(double dpi) => new Rect(Position.ToPointWithDpi(dpi), Size.ToSizeWithDpi(dpi));
+
+        /// <summary>
+        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
+        /// specified dots per inch (DPI).
+        /// </summary>
+        /// <param name="dpi">The dots per inch of the device.</param>
+        /// <returns>The device-independent rect.</returns>
+        public Rect ToRectWithDpi(Vector dpi) => new Rect(Position.ToPointWithDpi(dpi), Size.ToSizeWithDpi(dpi));
+
+        /// <summary>
+        /// Converts a <see cref="Rect"/> to device pixels using the specified scaling factor.
+        /// </summary>
+        /// <param name="rect">The rect.</param>
+        /// <param name="scale">The scaling factor.</param>
+        /// <returns>The device-independent rect.</returns>
+        public static PixelRect FromRect(Rect rect, double scale) => new PixelRect(
+            PixelPoint.FromPoint(rect.Position, scale),
+            FromPointCeiling(rect.BottomRight, new Vector(scale, scale)));
+
+        /// <summary>
+        /// Converts a <see cref="Rect"/> to device pixels using the specified scaling factor.
+        /// </summary>
+        /// <param name="rect">The rect.</param>
+        /// <param name="scale">The scaling factor.</param>
+        /// <returns>The device-independent point.</returns>
+        public static PixelRect FromRect(Rect rect, Vector scale) => new PixelRect(
+            PixelPoint.FromPoint(rect.Position, scale),
+            FromPointCeiling(rect.BottomRight, scale));
+
+        /// <summary>
+        /// Converts a <see cref="Rect"/> to device pixels using the specified dots per inch (DPI).
+        /// </summary>
+        /// <param name="rect">The rect.</param>
+        /// <param name="dpi">The dots per inch of the device.</param>
+        /// <returns>The device-independent point.</returns>
+        public static PixelRect FromRectWithDpi(Rect rect, double dpi) => new PixelRect(
+            PixelPoint.FromPointWithDpi(rect.Position, dpi),
+            FromPointCeiling(rect.BottomRight, new Vector(dpi / 96, dpi / 96)));
+
+        /// <summary>
+        /// Converts a <see cref="Rect"/> to device pixels using the specified dots per inch (DPI).
+        /// </summary>
+        /// <param name="rect">The rect.</param>
+        /// <param name="dpi">The dots per inch of the device.</param>
+        /// <returns>The device-independent point.</returns>
+        public static PixelRect FromRectWithDpi(Rect rect, Vector dpi) => new PixelRect(
+            PixelPoint.FromPointWithDpi(rect.Position, dpi),
+            FromPointCeiling(rect.BottomRight, dpi / 96));
+
+        /// <summary>
+        /// Returns the string representation of the rectangle.
+        /// </summary>
+        /// <returns>The string representation of the rectangle.</returns>
+        public override string ToString()
+        {
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                "{0}, {1}, {2}, {3}",
+                X,
+                Y,
+                Width,
+                Height);
+        }
+
+        /// <summary>
+        /// Parses a <see cref="PixelRect"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The parsed <see cref="PixelRect"/>.</returns>
+        public static PixelRect Parse(string s)
+        {
+            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid PixelRect."))
+            {
+                return new PixelRect(
+                    tokenizer.ReadInt32(),
+                    tokenizer.ReadInt32(),
+                    tokenizer.ReadInt32(),
+                    tokenizer.ReadInt32()
+                );
+            }
+        }
+
+        private static PixelPoint FromPointCeiling(Point point, Vector scale)
+        {
+            return new PixelPoint(
+                (int)Math.Ceiling(point.X * scale.X),
+                (int)Math.Ceiling(point.Y * scale.Y));
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/PixelSize.cs b/src/Avalonia.Base/PixelSize.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PixelSize.cs
rename to src/Avalonia.Base/PixelSize.cs
diff --git a/src/Avalonia.Visuals/Media/PixelVector.cs b/src/Avalonia.Base/PixelVector.cs
similarity index 100%
rename from src/Avalonia.Visuals/Media/PixelVector.cs
rename to src/Avalonia.Base/PixelVector.cs
diff --git a/src/Avalonia.Visuals/Platform/AlphaFormat.cs b/src/Avalonia.Base/Platform/AlphaFormat.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/AlphaFormat.cs
rename to src/Avalonia.Base/Platform/AlphaFormat.cs
diff --git a/src/Avalonia.Base/Platform/AssetLoader.cs b/src/Avalonia.Base/Platform/AssetLoader.cs
new file mode 100644
index 0000000000..a74da2a178
--- /dev/null
+++ b/src/Avalonia.Base/Platform/AssetLoader.cs
@@ -0,0 +1,221 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Avalonia.Platform.Internal;
+using Avalonia.Utilities;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Loads assets compiled into the application binary.
+    /// </summary>
+    public class AssetLoader : IAssetLoader
+    {
+        private static IAssemblyDescriptorResolver s_assemblyDescriptorResolver = new AssemblyDescriptorResolver();
+
+        private AssemblyDescriptor? _defaultResmAssembly;
+
+        /// <remarks>
+        /// Introduced for tests.
+        /// </remarks>
+        internal static void SetAssemblyDescriptorResolver(IAssemblyDescriptorResolver resolver) =>
+            s_assemblyDescriptorResolver = resolver;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AssetLoader"/> class.
+        /// </summary>
+        /// <param name="assembly">
+        /// The default assembly from which to load resm: assets for which no assembly is specified.
+        /// </param>
+        public AssetLoader(Assembly? assembly = null)
+        {
+            if (assembly == null)
+                assembly = Assembly.GetEntryAssembly();
+            if (assembly != null)
+                _defaultResmAssembly = new AssemblyDescriptor(assembly);
+        }
+
+        /// <summary>
+        /// Sets the default assembly from which to load assets for which no assembly is specified.
+        /// </summary>
+        /// <param name="assembly">The default assembly.</param>
+        public void SetDefaultAssembly(Assembly assembly)
+        {
+            _defaultResmAssembly = new AssemblyDescriptor(assembly);
+        }
+
+        /// <summary>
+        /// Checks if an asset with the specified URI exists.
+        /// </summary>
+        /// <param name="uri">The URI.</param>
+        /// <param name="baseUri">
+        /// A base URI to use if <paramref name="uri"/> is relative.
+        /// </param>
+        /// <returns>True if the asset could be found; otherwise false.</returns>
+        public bool Exists(Uri uri, Uri? baseUri = null)
+        {
+            return GetAsset(uri, baseUri) != null;
+        }
+
+        /// <summary>
+        /// Opens the asset with the requested URI.
+        /// </summary>
+        /// <param name="uri">The URI.</param>
+        /// <param name="baseUri">
+        /// A base URI to use if <paramref name="uri"/> is relative.
+        /// </param>
+        /// <returns>A stream containing the asset contents.</returns>
+        /// <exception cref="FileNotFoundException">
+        /// The asset could not be found.
+        /// </exception>
+        public Stream Open(Uri uri, Uri? baseUri = null) => OpenAndGetAssembly(uri, baseUri).Item1;
+
+        /// <summary>
+        /// Opens the asset with the requested URI and returns the asset stream and the
+        /// assembly containing the asset.
+        /// </summary>
+        /// <param name="uri">The URI.</param>
+        /// <param name="baseUri">
+        /// A base URI to use if <paramref name="uri"/> is relative.
+        /// </param>
+        /// <returns>
+        /// The stream containing the resource contents together with the assembly.
+        /// </returns>
+        /// <exception cref="FileNotFoundException">
+        /// The asset could not be found.
+        /// </exception>
+        public (Stream stream, Assembly assembly) OpenAndGetAssembly(Uri uri, Uri? baseUri = null)
+        {
+            var asset = GetAsset(uri, baseUri);
+
+            if (asset == null)
+            {
+                throw new FileNotFoundException($"The resource {uri} could not be found.");
+            }
+
+            return (asset.GetStream(), asset.Assembly);
+        }
+
+        public Assembly? GetAssembly(Uri uri, Uri? baseUri)
+        {
+            if (!uri.IsAbsoluteUri && baseUri != null)
+                uri = new Uri(baseUri, uri);
+            return GetAssembly(uri)?.Assembly;
+        }
+
+        /// <summary>
+        /// Gets all assets of a folder and subfolders that match specified uri.
+        /// </summary>
+        /// <param name="uri">The URI.</param>
+        /// <param name="baseUri">Base URI that is used if <paramref name="uri"/> is relative.</param>
+        /// <returns>All matching assets as a tuple of the absolute path to the asset and the assembly containing the asset</returns>
+        public IEnumerable<Uri> GetAssets(Uri uri, Uri? baseUri)
+        {
+            if (uri.IsAbsoluteResm())
+            {
+                var assembly = GetAssembly(uri);
+
+                return assembly?.Resources?
+                           .Where(x => x.Key.IndexOf(uri.GetUnescapeAbsolutePath(), StringComparison.Ordinal) >= 0)
+                           .Select(x =>new Uri($"resm:{x.Key}?assembly={assembly.Name}")) ??
+                       Enumerable.Empty<Uri>();
+            }
+
+            uri = uri.EnsureAbsolute(baseUri);
+            if (uri.IsAvares())
+            {
+                var (asm, path) = GetResAsmAndPath(uri);
+                if (asm == null)
+                {
+                    throw new ArgumentException(
+                        "No default assembly, entry assembly or explicit assembly specified; " +
+                        "don't know where to look up for the resource, try specifying assembly explicitly.");
+                }
+
+                if (asm.AvaloniaResources == null)
+                    return Enumerable.Empty<Uri>();
+
+                if (path[path.Length - 1] != '/')
+                    path += '/';
+
+                return asm.AvaloniaResources
+                    .Where(r => r.Key.StartsWith(path, StringComparison.Ordinal))
+                    .Select(x => new Uri($"avares://{asm.Name}{x.Key}"));
+            }
+
+            return Enumerable.Empty<Uri>();
+        }
+        
+        private IAssetDescriptor? GetAsset(Uri uri, Uri? baseUri)
+        {           
+            if (uri.IsAbsoluteResm())
+            {
+                var asm = GetAssembly(uri) ?? GetAssembly(baseUri) ?? _defaultResmAssembly;
+
+                if (asm == null)
+                {
+                    throw new ArgumentException(
+                        "No default assembly, entry assembly or explicit assembly specified; " +
+                        "don't know where to look up for the resource, try specifying assembly explicitly.");
+                }
+
+                var resourceKey = uri.AbsolutePath;
+                IAssetDescriptor? rv = null;
+                asm.Resources?.TryGetValue(resourceKey, out rv);
+                return rv;
+            }
+
+            uri = uri.EnsureAbsolute(baseUri);
+
+            if (uri.IsAvares())
+            {
+                var (asm, path) = GetResAsmAndPath(uri);
+                if (asm.AvaloniaResources == null)
+                    return null;
+                asm.AvaloniaResources.TryGetValue(path, out var desc);
+                return desc;
+            }
+
+            throw new ArgumentException($"Unsupported url type: " + uri.Scheme, nameof(uri));
+        }
+
+        private (IAssemblyDescriptor asm, string path) GetResAsmAndPath(Uri uri)
+        {
+            var asm = s_assemblyDescriptorResolver.GetAssembly(uri.Authority);
+            return (asm, uri.GetUnescapeAbsolutePath());
+        }
+        
+        private IAssemblyDescriptor? GetAssembly(Uri? uri)
+        {
+            if (uri != null)
+            {
+                if (!uri.IsAbsoluteUri)
+                    return null;
+                if (uri.IsAvares())
+                    return GetResAsmAndPath(uri).asm;
+
+                if (uri.IsResm())
+                {
+                    var assemblyName = uri.GetAssemblyNameFromQuery();
+                    if (assemblyName.Length > 0)
+                        return s_assemblyDescriptorResolver.GetAssembly(assemblyName);
+                }
+            }
+
+            return null;
+        }
+
+        public static void RegisterResUriParsers()
+        {
+            if (!UriParser.IsKnownScheme("avares"))
+                UriParser.Register(new GenericUriParser(
+                    GenericUriParserOptions.GenericAuthority |
+                    GenericUriParserOptions.NoUserInfo |
+                    GenericUriParserOptions.NoPort |
+                    GenericUriParserOptions.NoQuery |
+                    GenericUriParserOptions.NoFragment), "avares", -1);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IAssetLoader.cs b/src/Avalonia.Base/Platform/IAssetLoader.cs
index e3899784ad..b65d61803f 100644
--- a/src/Avalonia.Base/Platform/IAssetLoader.cs
+++ b/src/Avalonia.Base/Platform/IAssetLoader.cs
@@ -2,12 +2,14 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
     /// <summary>
     /// Loads assets compiled into the application binary.
     /// </summary>
+    [Unstable]
     public interface IAssetLoader
     {
         /// <summary>
diff --git a/src/Avalonia.Base/Platform/IBitmapImpl.cs b/src/Avalonia.Base/Platform/IBitmapImpl.cs
new file mode 100644
index 0000000000..8f11f68e7c
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IBitmapImpl.cs
@@ -0,0 +1,40 @@
+using System;
+using System.IO;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.Imaging.Bitmap"/>.
+    /// </summary>
+    [Unstable]
+    public interface IBitmapImpl : IDisposable
+    {
+        /// <summary>
+        /// Gets the dots per inch (DPI) of the image.
+        /// </summary>
+        Vector Dpi { get; }
+
+        /// <summary>
+        /// Gets the size of the bitmap, in device pixels.
+        /// </summary>
+        PixelSize PixelSize { get; }
+        
+        /// <summary>
+        /// Version of the pixel data
+        /// </summary>
+        int Version { get; }
+
+        /// <summary>
+        /// Saves the bitmap to a file.
+        /// </summary>
+        /// <param name="fileName">The filename.</param>
+        void Save(string fileName);
+
+        /// <summary>
+        /// Saves the bitmap to a stream in png format.
+        /// </summary>
+        /// <param name="stream">The stream.</param>
+        void Save(Stream stream);
+    }
+}
diff --git a/src/Avalonia.Input/Platform/ICursorFactory.cs b/src/Avalonia.Base/Platform/ICursorFactory.cs
similarity index 100%
rename from src/Avalonia.Input/Platform/ICursorFactory.cs
rename to src/Avalonia.Base/Platform/ICursorFactory.cs
diff --git a/src/Avalonia.Base/Platform/ICursorImpl.cs b/src/Avalonia.Base/Platform/ICursorImpl.cs
new file mode 100644
index 0000000000..74e0ba2e5c
--- /dev/null
+++ b/src/Avalonia.Base/Platform/ICursorImpl.cs
@@ -0,0 +1,16 @@
+using System;
+using Avalonia.Input;
+using Avalonia.Metadata;
+
+#nullable enable
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Represents a platform implementation of a <see cref="Cursor"/>.
+    /// </summary>
+    [Unstable]
+    public interface ICursorImpl : IDisposable
+    {
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IDrawingContextImpl.cs b/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
new file mode 100644
index 0000000000..d84a509234
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
@@ -0,0 +1,190 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
+using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the interface through which drawing occurs.
+    /// </summary>
+    [Unstable]
+    public interface IDrawingContextImpl : IDisposable
+    {
+        /// <summary>
+        /// Gets or sets the current transform of the drawing context.
+        /// </summary>
+        Matrix Transform { get; set; }
+
+        /// <summary>
+        /// Clears the render target to the specified color.
+        /// </summary>
+        /// <param name="color">The color.</param>
+        void Clear(Color color);
+
+        /// <summary>
+        /// Draws a bitmap image.
+        /// </summary>
+        /// <param name="source">The bitmap image.</param>
+        /// <param name="opacity">The opacity to draw with.</param>
+        /// <param name="sourceRect">The rect in the image to draw.</param>
+        /// <param name="destRect">The rect in the output to draw to.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default);
+
+        /// <summary>
+        /// Draws a bitmap image.
+        /// </summary>
+        /// <param name="source">The bitmap image.</param>
+        /// <param name="opacityMask">The opacity mask to draw with.</param>
+        /// <param name="opacityMaskRect">The destination rect for the opacity mask.</param>
+        /// <param name="destRect">The rect in the output to draw to.</param>
+        void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect);
+
+        /// <summary>
+        /// Draws a line.
+        /// </summary>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="p1">The first point of the line.</param>
+        /// <param name="p2">The second point of the line.</param>
+        void DrawLine(IPen pen, Point p1, Point p2);
+
+        /// <summary>
+        /// Draws a geometry.
+        /// </summary>
+        /// <param name="brush">The fill brush.</param>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="geometry">The geometry.</param>
+        void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry);
+
+        /// <summary>
+        /// Draws a rectangle with the specified Brush and Pen.
+        /// </summary>
+        /// <param name="brush">The brush used to fill the rectangle, or <c>null</c> for no fill.</param>
+        /// <param name="pen">The pen used to stroke the rectangle, or <c>null</c> for no stroke.</param>
+        /// <param name="rect">The rectangle bounds.</param>
+        /// <param name="boxShadows">Box shadow effect parameters</param>
+        /// <remarks>
+        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
+        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
+        /// </remarks>
+        void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect,
+            BoxShadows boxShadows = default);
+
+        /// <summary>
+        /// Draws an ellipse with the specified Brush and Pen.
+        /// </summary>
+        /// <param name="brush">The brush used to fill the ellipse, or <c>null</c> for no fill.</param>
+        /// <param name="pen">The pen used to stroke the ellipse, or <c>null</c> for no stroke.</param>
+        /// <param name="rect">The ellipse bounds.</param>
+        /// <remarks>
+        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
+        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
+        /// </remarks>
+        void DrawEllipse(IBrush? brush, IPen? pen, Rect rect);
+
+
+        /// <summary>
+        /// Draws a glyph run.
+        /// </summary>
+        /// <param name="foreground">The foreground.</param>
+        /// <param name="glyphRun">The glyph run.</param>
+        void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun);
+
+        /// <summary>
+        /// Creates a new <see cref="IRenderTargetBitmapImpl"/> that can be used as a render layer
+        /// for the current render target.
+        /// </summary>
+        /// <param name="size">The size of the layer in DIPs.</param>
+        /// <returns>An <see cref="IRenderTargetBitmapImpl"/></returns>
+        /// <remarks>
+        /// Depending on the rendering backend used, a layer created via this method may be more
+        /// performant than a standard render target bitmap. In particular the Direct2D backend
+        /// has to do a format conversion each time a standard render target bitmap is rendered,
+        /// but a layer created via this method has no such overhead.
+        /// </remarks>
+        IDrawingContextLayerImpl CreateLayer(Size size);
+
+        /// <summary>
+        /// Pushes a clip rectangle.
+        /// </summary>
+        /// <param name="clip">The clip rectangle.</param>
+        void PushClip(Rect clip);
+
+        /// <summary>
+        /// Pushes a clip rounded rectangle.
+        /// </summary>
+        /// <param name="clip">The clip rounded rectangle</param>
+        void PushClip(RoundedRect clip);
+
+        /// <summary>
+        /// Pops the latest pushed clip rectangle.
+        /// </summary>
+        void PopClip();
+
+        /// <summary>
+        /// Pushes an opacity value.
+        /// </summary>
+        /// <param name="opacity">The opacity.</param>
+        void PushOpacity(double opacity);
+
+        /// <summary>
+        /// Pops the latest pushed opacity value.
+        /// </summary>
+        void PopOpacity();
+
+        /// <summary>
+        /// Pushes an opacity mask
+        /// </summary>
+        void PushOpacityMask(IBrush mask, Rect bounds);
+
+        /// <summary>
+        /// Pops the latest pushed opacity mask.
+        /// </summary>
+        void PopOpacityMask();
+
+        /// <summary>
+        /// Pushes a clip geometry.
+        /// </summary>
+        /// <param name="clip">The clip geometry.</param>
+        void PushGeometryClip(IGeometryImpl clip);
+
+        /// <summary>
+        /// Pops the latest pushed geometry clip.
+        /// </summary>
+        void PopGeometryClip();
+        
+        /// <summary>
+        /// Pushes a bitmap blending value.
+        /// </summary>
+        /// <param name="blendingMode">The bitmap blending mode.</param>
+        void PushBitmapBlendMode(BitmapBlendingMode blendingMode);
+
+        /// <summary>
+        /// Pops the latest pushed bitmap blending value.
+        /// </summary>
+        void PopBitmapBlendMode();
+
+        /// <summary>
+        /// Adds a custom draw operation
+        /// </summary>
+        /// <param name="custom">Custom draw operation</param>
+        void Custom(ICustomDrawOperation custom);
+    }
+
+    public interface IDrawingContextLayerImpl : IRenderTargetBitmapImpl
+    {
+        /// <summary>
+        /// Does optimized blit with Src blend mode
+        /// </summary>
+        /// <param name="context"></param>
+        void Blit(IDrawingContextImpl context);
+        
+        /// <summary>
+        /// Returns true if layer supports optimized blit
+        /// </summary>
+        bool CanBlit { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextWithAcrylicLikeSupport.cs b/src/Avalonia.Base/Platform/IDrawingContextWithAcrylicLikeSupport.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/IDrawingContextWithAcrylicLikeSupport.cs
rename to src/Avalonia.Base/Platform/IDrawingContextWithAcrylicLikeSupport.cs
diff --git a/src/Avalonia.Base/Platform/IFontManagerImpl.cs b/src/Avalonia.Base/Platform/IFontManagerImpl.cs
new file mode 100644
index 0000000000..932249bd52
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IFontManagerImpl.cs
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Globalization;
+using Avalonia.Media;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    [Unstable]
+    public interface IFontManagerImpl
+    {
+        /// <summary>
+        ///     Gets the system's default font family's name.
+        /// </summary>
+        string GetDefaultFontFamilyName();
+
+        /// <summary>
+        ///     Get all installed fonts in the system.
+        /// <param name="checkForUpdates">If <c>true</c> the font collection is updated.</param>
+        /// </summary>
+        IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false);
+
+        /// <summary>
+        ///     Tries to match a specified character to a typeface that supports specified font properties.
+        /// </summary>
+        /// <param name="codepoint">The codepoint to match against.</param>
+        /// <param name="fontStyle">The font style.</param>
+        /// <param name="fontWeight">The font weight.</param>
+        /// <param name="fontStretch">The font stretch.</param>
+        /// <param name="fontFamily">The font family. This is optional and used for fallback lookup.</param>
+        /// <param name="culture">The culture.</param>
+        /// <param name="typeface">The matching typeface.</param>
+        /// <returns>
+        ///     <c>True</c>, if the <see cref="IFontManagerImpl"/> could match the character to specified parameters, <c>False</c> otherwise.
+        /// </returns>
+        bool TryMatchCharacter(int codepoint, FontStyle fontStyle,
+            FontWeight fontWeight, FontStretch fontStretch,
+            FontFamily? fontFamily, CultureInfo? culture, out Typeface typeface);
+
+        /// <summary>
+        ///     Creates a glyph typeface.
+        /// </summary>
+        /// <param name="typeface">The typeface.</param>
+        /// <returns>0
+        ///     The created glyph typeface. Can be <c>Null</c> if it was not possible to create a glyph typeface.
+        /// </returns>
+        IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IGeometryContext.cs b/src/Avalonia.Base/Platform/IGeometryContext.cs
new file mode 100644
index 0000000000..87db9f1dd4
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IGeometryContext.cs
@@ -0,0 +1,63 @@
+using System;
+using Avalonia.Media;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Describes a geometry using drawing commands.
+    /// </summary>
+    public interface IGeometryContext : IDisposable
+    {
+        /// <summary>
+        /// Draws an arc to the specified point.
+        /// </summary>
+        /// <param name="point">The destination point.</param>
+        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
+        /// <param name="rotationAngle">The rotation angle (in radians) of the oval that specifies the curve.</param>
+        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
+        /// <param name="sweepDirection">
+        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
+        /// </param>
+        void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection);
+
+        /// <summary>
+        /// Begins a new figure.
+        /// </summary>
+        /// <param name="startPoint">The starting point for the figure.</param>
+        /// <param name="isFilled">Whether the figure is filled.</param>
+        void BeginFigure(Point startPoint, bool isFilled = true);
+
+        /// <summary>
+        /// Draws a Bezier curve to the specified point.
+        /// </summary>
+        /// <param name="point1">The first control point used to specify the shape of the curve.</param>
+        /// <param name="point2">The second control point used to specify the shape of the curve.</param>
+        /// <param name="point3">The destination point for the end of the curve.</param>
+        void CubicBezierTo(Point point1, Point point2, Point point3);
+
+        /// <summary>
+        /// Draws a quadratic Bezier curve to the specified point
+        /// </summary>
+        /// <param name="control">Control point</param>
+        /// <param name="endPoint">DestinationPoint</param>
+        void QuadraticBezierTo(Point control, Point endPoint);
+
+        /// <summary>
+        /// Draws a line to the specified point.
+        /// </summary>
+        /// <param name="point">The destination point.</param>
+        void LineTo(Point point);
+
+        /// <summary>
+        /// Ends the figure started by <see cref="BeginFigure(Point, bool)"/>.
+        /// </summary>
+        /// <param name="isClosed">Whether the figure is closed.</param>
+        void EndFigure(bool isClosed);
+
+        /// <summary>
+        /// Sets the fill rule.
+        /// </summary>
+        /// <param name="fillRule">The fill rule.</param>
+        void SetFillRule(FillRule fillRule);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IGeometryImpl.cs b/src/Avalonia.Base/Platform/IGeometryImpl.cs
new file mode 100644
index 0000000000..c80f8923ef
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IGeometryImpl.cs
@@ -0,0 +1,92 @@
+using Avalonia.Media;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the platform-specific interface for a <see cref="Geometry"/>.
+    /// </summary>
+    [Unstable]
+    public interface IGeometryImpl
+    {
+        /// <summary>
+        /// Gets the geometry's bounding rectangle.
+        /// </summary>
+        Rect Bounds { get; }
+        
+        /// <summary>
+        /// Gets the geometry's total length as if all its contours are placed
+        /// in a straight line.
+        /// </summary>
+        double ContourLength { get; }
+
+        /// <summary>
+        /// Gets the geometry's bounding rectangle with the specified pen.
+        /// </summary>
+        /// <param name="pen">The pen to use. May be null.</param>
+        /// <returns>The bounding rectangle.</returns>
+        Rect GetRenderBounds(IPen? pen);
+
+        /// <summary>
+        /// Indicates whether the geometry's fill contains the specified point.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
+        bool FillContains(Point point);
+
+        /// <summary>
+        /// Intersects the geometry with another geometry.
+        /// </summary>
+        /// <param name="geometry">The other geometry.</param>
+        /// <returns>A new <see cref="IGeometryImpl"/> representing the intersection.</returns>
+        IGeometryImpl Intersect(IGeometryImpl geometry);
+
+        /// <summary>
+        /// Indicates whether the geometry's stroke contains the specified point.
+        /// </summary>
+        /// <param name="pen">The stroke to use.</param>
+        /// <param name="point">The point.</param>
+        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
+        bool StrokeContains(IPen pen, Point point);
+
+        /// <summary>
+        /// Makes a clone of the geometry with the specified transform.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <returns>The cloned geometry.</returns>
+        ITransformedGeometryImpl WithTransform(Matrix transform);
+
+        /// <summary>
+        /// Attempts to get the corresponding point at the
+        /// specified distance
+        /// </summary>
+        /// <param name="distance">The contour distance to get from.</param>
+        /// <param name="point">The point in the specified distance.</param>
+        /// <returns>If there's valid point at the specified distance.</returns>
+        bool TryGetPointAtDistance(double distance, out Point point);
+
+        /// <summary>
+        /// Attempts to get the corresponding point and
+        /// tangent from the specified distance along the
+        /// contour of the geometry.
+        /// </summary>
+        /// <param name="distance">The contour distance to get from.</param>
+        /// <param name="point">The point in the specified distance.</param>
+        /// <param name="tangent">The tangent in the specified distance.</param>
+        /// <returns>If there's valid point and tangent at the specified distance.</returns>
+        bool TryGetPointAndTangentAtDistance(double distance, out Point point, out Point tangent);
+        
+        /// <summary>
+        /// Attempts to get the corresponding path segment
+        /// given by the two distances specified.
+        /// Imagine it like snipping a part of the current
+        /// geometry.
+        /// </summary>
+        /// <param name="startDistance">The contour distance to start snipping from.</param>
+        /// <param name="stopDistance">The contour distance to stop snipping to.</param>
+        /// <param name="startOnBeginFigure">If ture, the resulting snipped path will start with a BeginFigure call.</param>
+        /// <param name="segmentGeometry">The resulting snipped path.</param>
+        /// <returns>If the snipping operation is successful.</returns>
+        bool TryGetSegment(double startDistance, double stopDistance, bool startOnBeginFigure, out IGeometryImpl segmentGeometry);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IGlyphRunImpl.cs b/src/Avalonia.Base/Platform/IGlyphRunImpl.cs
new file mode 100644
index 0000000000..7801bdd50f
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IGlyphRunImpl.cs
@@ -0,0 +1,11 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    ///     Actual implementation of a glyph run that stores platform dependent resources.
+    /// </summary>
+    [Unstable]
+    public interface IGlyphRunImpl : IDisposable { }
+}
diff --git a/src/Avalonia.Base/Platform/IGlyphTypefaceImpl.cs b/src/Avalonia.Base/Platform/IGlyphTypefaceImpl.cs
new file mode 100644
index 0000000000..415f34fb29
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IGlyphTypefaceImpl.cs
@@ -0,0 +1,93 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    [Unstable]
+    public interface IGlyphTypefaceImpl : IDisposable
+    {
+        /// <summary>
+        ///     Gets the font design units per em.
+        /// </summary>
+        short DesignEmHeight { get; }
+
+        /// <summary>
+        ///     Gets the recommended distance above the baseline in design em size. 
+        /// </summary>
+        int Ascent { get; }
+
+        /// <summary>
+        ///     Gets the recommended distance under the baseline in design em size. 
+        /// </summary>
+        int Descent { get; }
+
+        /// <summary>
+        ///      Gets the recommended additional space between two lines of text in design em size. 
+        /// </summary>
+        int LineGap { get; }
+
+        /// <summary>
+        ///     Gets a value that indicates the distance of the underline from the baseline in design em size.
+        /// </summary>
+        int UnderlinePosition { get; }
+
+        /// <summary>
+        ///     Gets a value that indicates the thickness of the underline in design em size.
+        /// </summary>
+        int UnderlineThickness { get; }
+
+        /// <summary>
+        ///     Gets a value that indicates the distance of the strikethrough from the baseline in design em size.
+        /// </summary>
+        int StrikethroughPosition { get; }
+
+        /// <summary>
+        ///     Gets a value that indicates the thickness of the underline in design em size.
+        /// </summary>
+        int StrikethroughThickness { get; }
+
+        /// <summary>
+        ///     A <see cref="bool"/> value indicating whether all glyphs in the font have the same advancement. 
+        /// </summary>
+        bool IsFixedPitch { get; }
+
+        /// <summary>
+        ///     Returns an glyph index for the specified codepoint.
+        /// </summary>
+        /// <remarks>
+        ///     Returns <c>0</c> if a glyph isn't found.
+        /// </remarks>
+        /// <param name="codepoint">The codepoint.</param>
+        /// <returns>
+        ///     A glyph index.
+        /// </returns>
+        ushort GetGlyph(uint codepoint);
+
+        /// <summary>
+        ///     Returns an array of glyph indices. Codepoints that are not represented by the font are returned as <code>0</code>.
+        /// </summary>
+        /// <param name="codepoints">The codepoints to map.</param>
+        /// <returns>
+        ///     An array of glyph indices.
+        /// </returns>
+        ushort[] GetGlyphs(ReadOnlySpan<uint> codepoints);
+
+        /// <summary>
+        ///     Returns the glyph advance for the specified glyph.
+        /// </summary>
+        /// <param name="glyph">The glyph.</param>
+        /// <returns>
+        ///     The advance.
+        /// </returns>
+        int GetGlyphAdvance(ushort glyph);
+
+        /// <summary>
+        ///     Returns an array of glyph advances in design em size.
+        /// </summary>
+        /// <param name="glyphs">The glyph indices.</param>
+        /// <returns>
+        ///     An array of glyph advances.
+        /// </returns>
+        int[] GetGlyphAdvances(ReadOnlySpan<ushort> glyphs);
+    }
+}
diff --git a/src/Avalonia.Visuals/Platform/ILockedFramebuffer.cs b/src/Avalonia.Base/Platform/ILockedFramebuffer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/ILockedFramebuffer.cs
rename to src/Avalonia.Base/Platform/ILockedFramebuffer.cs
diff --git a/src/Avalonia.Base/Platform/IMacOSTopLevelPlatformHandle.cs b/src/Avalonia.Base/Platform/IMacOSTopLevelPlatformHandle.cs
index e399976bbe..b087724079 100644
--- a/src/Avalonia.Base/Platform/IMacOSTopLevelPlatformHandle.cs
+++ b/src/Avalonia.Base/Platform/IMacOSTopLevelPlatformHandle.cs
@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IMacOSTopLevelPlatformHandle
     {
         IntPtr NSView { get; }
diff --git a/src/Avalonia.Visuals/Platform/IModuleEnvironmentChecker.cs b/src/Avalonia.Base/Platform/IModuleEnvironmentChecker.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/IModuleEnvironmentChecker.cs
rename to src/Avalonia.Base/Platform/IModuleEnvironmentChecker.cs
diff --git a/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
new file mode 100644
index 0000000000..bfa9e70fce
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
@@ -0,0 +1,200 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the main platform-specific interface for the rendering subsystem.
+    /// </summary>
+    [Unstable]
+    public interface IPlatformRenderInterface
+    {
+        /// <summary>
+        /// Creates an ellipse geometry implementation.
+        /// </summary>
+        /// <param name="rect">The bounds of the ellipse.</param>
+        /// <returns>An ellipse geometry..</returns>
+        IGeometryImpl CreateEllipseGeometry(Rect rect);
+
+        /// <summary>
+        /// Creates a line geometry implementation.
+        /// </summary>
+        /// <param name="p1">The start of the line.</param>
+        /// <param name="p2">The end of the line.</param>
+        /// <returns>A line geometry.</returns>
+        IGeometryImpl CreateLineGeometry(Point p1, Point p2);
+
+        /// <summary>
+        /// Creates a rectangle geometry implementation.
+        /// </summary>
+        /// <param name="rect">The bounds of the rectangle.</param>
+        /// <returns>A rectangle.</returns>
+        IGeometryImpl CreateRectangleGeometry(Rect rect);
+
+        /// <summary>
+        /// Creates a stream geometry implementation.
+        /// </summary>
+        /// <returns>An <see cref="IStreamGeometryImpl"/>.</returns>
+        IStreamGeometryImpl CreateStreamGeometry();
+
+        /// <summary>
+        /// Creates a geometry group implementation.
+        /// </summary>
+        /// <param name="fillRule">The fill rule.</param>
+        /// <param name="children">The geometries to group.</param>
+        /// <returns>A combined geometry.</returns>
+        IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children);
+
+        /// <summary>
+        /// Creates a geometry group implementation.
+        /// </summary>
+        /// <param name="combineMode">The combine mode</param>
+        /// <param name="g1">The first geometry.</param>
+        /// <param name="g2">The second geometry.</param>
+        /// <returns>A combined geometry.</returns>
+        IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2);
+
+        /// <summary>
+        /// Created a geometry implementation for the glyph run.
+        /// </summary>
+        /// <param name="glyphRun">The glyph run to build a geometry from.</param>
+        /// <param name="scale">The scaling of the produces geometry.</param>
+        /// <returns>The geometry returned contains the combined geometry of all glyphs in the glyph run.</returns>
+        IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun, out Matrix scale);
+
+        /// <summary>
+        /// Creates a renderer.
+        /// </summary>
+        /// <param name="surfaces">
+        /// The list of native platform surfaces that can be used for output.
+        /// </param>
+        /// <returns>An <see cref="IRenderTarget"/>.</returns>
+        IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces);
+
+        /// <summary>
+        /// Creates a render target bitmap implementation.
+        /// </summary>
+        /// <param name="size">The size of the bitmap in device pixels.</param>
+        /// <param name="dpi">The DPI of the bitmap.</param>
+        /// <returns>An <see cref="IRenderTargetBitmapImpl"/>.</returns>
+        IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi);
+
+        /// <summary>
+        /// Creates a writeable bitmap implementation.
+        /// </summary>
+        /// <param name="size">The size of the bitmap in device pixels.</param>
+        /// <param name="dpi">The DPI of the bitmap.</param>
+        /// <param name="format">Pixel format.</param>
+        /// <param name="alphaFormat">Alpha format .</param>
+        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
+        IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat format, AlphaFormat alphaFormat);
+
+        /// <summary>
+        /// Loads a bitmap implementation from a file..
+        /// </summary>
+        /// <param name="fileName">The filename of the bitmap.</param>        
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IBitmapImpl LoadBitmap(string fileName);
+
+        /// <summary>
+        /// Loads a bitmap implementation from a file..
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param>        
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IBitmapImpl LoadBitmap(Stream stream);
+
+        /// <summary>
+        /// Loads a WriteableBitmap implementation from a stream to a specified width maintaining aspect ratio.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param> 
+        /// <param name="width">The desired width of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
+        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
+        IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
+
+        /// <summary>
+        /// Loads a WriteableBitmap implementation from a stream to a specified height maintaining aspect ratio.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param> 
+        /// <param name="height">The desired height of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
+        
+        /// <summary>
+        /// Loads a WriteableBitmap implementation from a file.
+        /// </summary>
+        /// <param name="fileName">The filename of the bitmap.</param>        
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IWriteableBitmapImpl LoadWriteableBitmap(string fileName);
+
+        /// <summary>
+        /// Loads a WriteableBitmap implementation from a file.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param>        
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IWriteableBitmapImpl LoadWriteableBitmap(Stream stream);
+
+        /// <summary>
+        /// Loads a bitmap implementation from a stream to a specified width maintaining aspect ratio.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param> 
+        /// <param name="width">The desired width of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
+
+        /// <summary>
+        /// Loads a bitmap implementation from a stream to a specified height maintaining aspect ratio.
+        /// </summary>
+        /// <param name="stream">The stream to read the bitmap from.</param> 
+        /// <param name="height">The desired height of the resulting bitmap.</param>
+        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IBitmapImpl LoadBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
+
+        IBitmapImpl ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
+
+        /// <summary>
+        /// Loads a bitmap implementation from a pixels in memory.
+        /// </summary>
+        /// <param name="format">The pixel format.</param>
+        /// <param name="alphaFormat">The alpha format.</param>
+        /// <param name="data">The pointer to source bytes.</param>
+        /// <param name="size">The size of the bitmap in device pixels.</param>
+        /// <param name="dpi">The DPI of the bitmap.</param>
+        /// <param name="stride">The number of bytes per row.</param>
+        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
+        IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride);
+
+        /// <summary>
+        /// Creates a platform implementation of a glyph run.
+        /// </summary>
+        /// <param name="glyphRun">The glyph run.</param>
+        /// <returns></returns>
+        IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun);
+
+        /// <summary>
+        /// Gets a value indicating whether the platform directly supports rectangles with rounded corners.
+        /// </summary>
+        /// <remarks>
+        /// Some platform renderers can't directly handle rounded corners on rectangles.
+        /// In this case, code that requires rounded corners must generate and retain a geometry instead.
+        /// </remarks>
+        bool SupportsIndividualRoundRects { get; }
+
+        /// <summary>
+        /// Default <see cref="AlphaFormat"/> used on this platform.
+        /// </summary>
+        public AlphaFormat DefaultAlphaFormat { get; }
+
+        /// <summary>
+        /// Default <see cref="PixelFormat"/> used on this platform.
+        /// </summary>
+        public PixelFormat DefaultPixelFormat { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IPlatformSettings.cs b/src/Avalonia.Base/Platform/IPlatformSettings.cs
new file mode 100644
index 0000000000..78d1817312
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IPlatformSettings.cs
@@ -0,0 +1,23 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    [Unstable]
+    public interface IPlatformSettings
+    {
+        Size DoubleClickSize { get; }
+
+        TimeSpan DoubleClickTime { get; }
+
+        /// <summary>
+        /// Determines the size of the area within that you should click twice in order for a double click to be counted.
+        /// </summary>
+        Size TouchDoubleClickSize { get; }
+
+        /// <summary>
+        /// Determines the time span that what will be used to determine the double-click.
+        /// </summary>
+        TimeSpan TouchDoubleClickTime { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs b/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs
index 2137f965cc..bf18a7da5b 100644
--- a/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs
+++ b/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading;
+using Avalonia.Metadata;
 using Avalonia.Threading;
 
 namespace Avalonia.Platform
@@ -7,6 +8,7 @@ namespace Avalonia.Platform
     /// <summary>
     /// Provides platform-specific services relating to threading.
     /// </summary>
+    [Unstable]
     public interface IPlatformThreadingInterface
     {
         void RunLoop(CancellationToken cancellationToken);
diff --git a/src/Avalonia.Visuals/Platform/IRenderTarget.cs b/src/Avalonia.Base/Platform/IRenderTarget.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/IRenderTarget.cs
rename to src/Avalonia.Base/Platform/IRenderTarget.cs
diff --git a/src/Avalonia.Base/Platform/IRenderTargetBitmapImpl.cs b/src/Avalonia.Base/Platform/IRenderTargetBitmapImpl.cs
new file mode 100644
index 0000000000..d33c503650
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IRenderTargetBitmapImpl.cs
@@ -0,0 +1,13 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the platform-specific interface for a
+    /// <see cref="Avalonia.Media.Imaging.RenderTargetBitmap"/>.
+    /// </summary>
+    [Unstable]
+    public interface IRenderTargetBitmapImpl : IBitmapImpl, IRenderTarget
+    {
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IRuntimePlatform.cs b/src/Avalonia.Base/Platform/IRuntimePlatform.cs
index 850757a1ee..8ab04f5995 100644
--- a/src/Avalonia.Base/Platform/IRuntimePlatform.cs
+++ b/src/Avalonia.Base/Platform/IRuntimePlatform.cs
@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IRuntimePlatform
     {
         IDisposable StartSystemTimer(TimeSpan interval, Action tick);
@@ -9,6 +11,7 @@ namespace Avalonia.Platform
         IUnmanagedBlob AllocBlob(int size);
     }
 
+    [Unstable]
     public interface IUnmanagedBlob : IDisposable
     {
         IntPtr Address { get; }
@@ -17,6 +20,7 @@ namespace Avalonia.Platform
         
     }
 
+    [Unstable]
     public struct RuntimePlatformInfo
     {
         public OperatingSystemType OperatingSystem { get; set; }
@@ -29,6 +33,7 @@ namespace Avalonia.Platform
         public bool IsUnix { get; set; }
     }
 
+    [Unstable]
     public enum OperatingSystemType
     {
         Unknown,
diff --git a/src/Avalonia.Base/Platform/IStreamGeometryContextImpl.cs b/src/Avalonia.Base/Platform/IStreamGeometryContextImpl.cs
new file mode 100644
index 0000000000..3d5ee36608
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IStreamGeometryContextImpl.cs
@@ -0,0 +1,12 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Describes a geometry using drawing commands.
+    /// </summary>
+    [Unstable]
+    public interface IStreamGeometryContextImpl : IGeometryContext
+    {      
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IStreamGeometryImpl.cs b/src/Avalonia.Base/Platform/IStreamGeometryImpl.cs
new file mode 100644
index 0000000000..bd4411f3a4
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IStreamGeometryImpl.cs
@@ -0,0 +1,25 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.StreamGeometry"/>.
+    /// </summary>
+    [Unstable]
+    public interface IStreamGeometryImpl : IGeometryImpl
+    {
+        /// <summary>
+        /// Clones the geometry.
+        /// </summary>
+        /// <returns>A cloned geometry.</returns>
+        IStreamGeometryImpl Clone();
+
+        /// <summary>
+        /// Opens the geometry to start defining it.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="IStreamGeometryContextImpl"/> which can be used to define the geometry.
+        /// </returns>
+        IStreamGeometryContextImpl Open();
+    }
+}
diff --git a/src/Avalonia.Base/Platform/ITextShaperImpl.cs b/src/Avalonia.Base/Platform/ITextShaperImpl.cs
new file mode 100644
index 0000000000..10e58b7d0b
--- /dev/null
+++ b/src/Avalonia.Base/Platform/ITextShaperImpl.cs
@@ -0,0 +1,21 @@
+using Avalonia.Media.TextFormatting;
+using Avalonia.Metadata;
+using Avalonia.Utilities;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// An abstraction that is used produce shaped text.
+    /// </summary>
+    [Unstable]
+    public interface ITextShaperImpl
+    {
+        /// <summary>
+        /// Shapes the specified region within the text and returns a shaped buffer.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <param name="options">Text shaper options to customize the shaping process.</param>
+        /// <returns>A shaped glyph run.</returns>
+        ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options);
+    }   
+}
diff --git a/src/Avalonia.Base/Platform/ITransformedGeometryImpl.cs b/src/Avalonia.Base/Platform/ITransformedGeometryImpl.cs
new file mode 100644
index 0000000000..2754414cd1
--- /dev/null
+++ b/src/Avalonia.Base/Platform/ITransformedGeometryImpl.cs
@@ -0,0 +1,25 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Represents a geometry with a transform applied.
+    /// </summary>
+    /// <remarks>
+    /// An <see cref="ITransformedGeometryImpl"/> transforms a geometry without transforming its
+    /// stroke thickness.
+    /// </remarks>
+    [Unstable]
+    public interface ITransformedGeometryImpl : IGeometryImpl
+    {
+        /// <summary>
+        /// Gets the source geometry that the <see cref="Transform"/> is applied to.
+        /// </summary>
+        IGeometryImpl SourceGeometry { get; }
+
+        /// <summary>
+        /// Gets the applied transform.
+        /// </summary>
+        Matrix Transform { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IWriteableBitmapImpl.cs b/src/Avalonia.Base/Platform/IWriteableBitmapImpl.cs
new file mode 100644
index 0000000000..fa1e1862b7
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IWriteableBitmapImpl.cs
@@ -0,0 +1,13 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.Imaging.WriteableBitmap"/>.
+    /// </summary>
+    [Unstable]
+    public interface IWriteableBitmapImpl : IBitmapImpl
+    {
+        ILockedFramebuffer Lock();
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Internal/AssemblyDescriptor.cs b/src/Avalonia.Base/Platform/Internal/AssemblyDescriptor.cs
new file mode 100644
index 0000000000..df2a26ddd3
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/AssemblyDescriptor.cs
@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Avalonia.Utilities;
+
+namespace Avalonia.Platform.Internal;
+
+internal interface IAssemblyDescriptor
+{
+    Assembly Assembly { get; }
+    Dictionary<string, IAssetDescriptor>? Resources { get; }
+    Dictionary<string, IAssetDescriptor>? AvaloniaResources { get; }
+    string? Name { get; }
+}
+
+internal class AssemblyDescriptor : IAssemblyDescriptor
+{
+    public AssemblyDescriptor(Assembly assembly)
+    {
+        Assembly = assembly;
+
+        if (assembly != null)
+        {
+            Resources = assembly.GetManifestResourceNames()
+                .ToDictionary(n => n, n => (IAssetDescriptor)new AssemblyResourceDescriptor(assembly, n));
+            Name = assembly.GetName().Name;
+            using (var resources = assembly.GetManifestResourceStream(Constants.AvaloniaResourceName))
+            {
+                if (resources != null)
+                {
+                    Resources.Remove(Constants.AvaloniaResourceName);
+
+                    var indexLength = new BinaryReader(resources).ReadInt32();
+                    var index = AvaloniaResourcesIndexReaderWriter.Read(new SlicedStream(resources, 4, indexLength));
+                    var baseOffset = indexLength + 4;
+                    AvaloniaResources = index.ToDictionary(r => GetPathRooted(r), r => (IAssetDescriptor)
+                        new AvaloniaResourceDescriptor(assembly, baseOffset + r.Offset, r.Size));
+                }
+            }
+        }
+    }
+
+    public Assembly Assembly { get; }
+    public Dictionary<string, IAssetDescriptor>? Resources { get; }
+    public Dictionary<string, IAssetDescriptor>? AvaloniaResources { get; }
+    public string? Name { get; }
+    private static string GetPathRooted(AvaloniaResourcesIndexEntry r) =>
+        r.Path![0] == '/' ? r.Path : '/' + r.Path;
+}
diff --git a/src/Avalonia.Base/Platform/Internal/AssemblyDescriptorResolver.cs b/src/Avalonia.Base/Platform/Internal/AssemblyDescriptorResolver.cs
new file mode 100644
index 0000000000..b12130b1f7
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/AssemblyDescriptorResolver.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace Avalonia.Platform.Internal;
+
+internal interface IAssemblyDescriptorResolver
+{
+    IAssemblyDescriptor GetAssembly(string name);
+}
+
+internal class AssemblyDescriptorResolver: IAssemblyDescriptorResolver
+{
+    private readonly Dictionary<string, IAssemblyDescriptor> _assemblyNameCache = new();
+
+    public IAssemblyDescriptor GetAssembly(string name)
+    {
+        if (name == null)
+            throw new ArgumentNullException(nameof(name));
+
+        if (!_assemblyNameCache.TryGetValue(name, out var rv))
+        {
+            var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+            var match = loadedAssemblies.FirstOrDefault(a => a.GetName().Name == name);
+            if (match != null)
+            {
+                _assemblyNameCache[name] = rv = new AssemblyDescriptor(match);
+            }
+            else
+            {
+#if NET6_0_OR_GREATER
+                if (!RuntimeFeature.IsDynamicCodeSupported)
+                {
+                    throw new InvalidOperationException(
+                        $"Assembly {name} needs to be referenced and explicitly loaded before loading resources");
+                }
+#endif
+                name = Uri.UnescapeDataString(name);
+                _assemblyNameCache[name] = rv = new AssemblyDescriptor(Assembly.Load(name));
+            }
+        }
+
+        return rv;
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Internal/AssetDescriptor.cs b/src/Avalonia.Base/Platform/Internal/AssetDescriptor.cs
new file mode 100644
index 0000000000..52f8f5e68d
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/AssetDescriptor.cs
@@ -0,0 +1,52 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace Avalonia.Platform.Internal;
+
+internal interface IAssetDescriptor
+{
+    Stream GetStream();
+    Assembly Assembly { get; }
+}
+
+internal class AssemblyResourceDescriptor : IAssetDescriptor
+{
+    private readonly Assembly _asm;
+    private readonly string _name;
+
+    public AssemblyResourceDescriptor(Assembly asm, string name)
+    {
+        _asm = asm;
+        _name = name;
+    }
+
+    public Stream GetStream()
+    {
+        var s = _asm.GetManifestResourceStream(_name);
+        return s ?? throw new InvalidOperationException($"Could not find manifest resource stream '{_name}',");
+    }
+
+    public Assembly Assembly => _asm;
+}
+        
+internal class AvaloniaResourceDescriptor : IAssetDescriptor
+{
+    private readonly int _offset;
+    private readonly int _length;
+    public Assembly Assembly { get; }
+
+    public AvaloniaResourceDescriptor(Assembly asm, int offset, int length)
+    {
+        _offset = offset;
+        _length = length;
+        Assembly = asm;
+    }
+
+    public Stream GetStream()
+    {
+        var s = Assembly.GetManifestResourceStream(Constants.AvaloniaResourceName) ??
+                throw new InvalidOperationException($"Could not find manifest resource stream '{Constants.AvaloniaResourceName}',");
+        return new SlicedStream(s, _offset, _length);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Internal/Constants.cs b/src/Avalonia.Base/Platform/Internal/Constants.cs
new file mode 100644
index 0000000000..cad864e7e3
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/Constants.cs
@@ -0,0 +1,6 @@
+namespace Avalonia.Platform.Internal;
+
+internal static class Constants
+{
+    public static string AvaloniaResourceName => "!AvaloniaResources";
+}
diff --git a/src/Avalonia.Base/Platform/Internal/DynLoader.cs b/src/Avalonia.Base/Platform/Internal/DynLoader.cs
new file mode 100644
index 0000000000..07903669b1
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/DynLoader.cs
@@ -0,0 +1,161 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Platform.Interop;
+
+// ReSharper disable InconsistentNaming
+namespace Avalonia.Platform.Internal
+{
+    class UnixLoader : IDynamicLibraryLoader
+    {
+        static class LinuxImports
+        {
+            [DllImport("libdl.so.2")]
+            private static extern IntPtr dlopen(string path, int flags);
+
+            [DllImport("libdl.so.2")]
+            private static extern IntPtr dlsym(IntPtr handle, string symbol);
+
+            [DllImport("libdl.so.2")]
+            private static extern IntPtr dlerror();
+
+            public static void Init()
+            {
+                DlOpen = dlopen;
+                DlSym = dlsym;
+                DlError = dlerror;
+            }
+        }
+
+        static class OsXImports
+        {
+            [DllImport("/usr/lib/libSystem.dylib")]
+            private static extern IntPtr dlopen(string path, int flags);
+
+            [DllImport("/usr/lib/libSystem.dylib")]
+            private static extern IntPtr dlsym(IntPtr handle, string symbol);
+
+            [DllImport("/usr/lib/libSystem.dylib")]
+            private static extern IntPtr dlerror();
+
+            public static void Init()
+            {
+                DlOpen = dlopen;
+                DlSym = dlsym;
+                DlError = dlerror;
+            }
+            
+        }
+        
+
+        [DllImport("libc")]
+        static extern int uname(IntPtr buf);
+
+        static UnixLoader()
+        {
+            var buffer = Marshal.AllocHGlobal(0x1000);
+            uname(buffer);
+            var unixName = Marshal.PtrToStringAnsi(buffer);
+            Marshal.FreeHGlobal(buffer);
+            if (unixName == "Darwin")
+                OsXImports.Init();
+            else
+                LinuxImports.Init();
+        }
+
+        private static Func<string, int, IntPtr>? DlOpen;
+        private static Func<IntPtr, string, IntPtr>? DlSym;
+        private static Func<IntPtr>? DlError;
+        // ReSharper restore InconsistentNaming
+
+        static string? DlErrorString() => Marshal.PtrToStringAnsi(DlError!.Invoke());
+
+        public IntPtr LoadLibrary(string dll)
+        {
+            var handle = DlOpen!.Invoke(dll, 1);
+            if (handle == IntPtr.Zero)
+                throw new DynamicLibraryLoaderException(DlErrorString()!);
+            return handle;
+        }
+
+        public IntPtr GetProcAddress(IntPtr dll, string proc, bool optional)
+        {
+            var ptr = DlSym!.Invoke(dll, proc);
+            if (ptr == IntPtr.Zero && !optional)
+                throw new DynamicLibraryLoaderException(DlErrorString()!);
+            return ptr;
+        }
+    }
+
+    internal class Win32Loader : IDynamicLibraryLoader
+    {
+        [DllImport("kernel32", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
+        private static extern IntPtr GetProcAddress(IntPtr hModule, string procName);
+
+        [DllImport("kernel32", EntryPoint = "LoadLibraryW", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern IntPtr LoadLibrary(string lpszLib);
+
+        IntPtr IDynamicLibraryLoader.LoadLibrary(string dll)
+        {
+            var handle = LoadLibrary(dll);
+            if (handle != IntPtr.Zero)
+                return handle;
+            var err = Marshal.GetLastWin32Error();
+
+            throw new DynamicLibraryLoaderException("Error loading " + dll + " error " + err);
+        }
+
+        IntPtr IDynamicLibraryLoader.GetProcAddress(IntPtr dll, string proc, bool optional)
+        {
+            var ptr = GetProcAddress(dll, proc);
+            if (ptr == IntPtr.Zero && !optional)
+                throw new DynamicLibraryLoaderException("Error " + Marshal.GetLastWin32Error());
+            return ptr;
+        }
+    }
+
+#if NET6_0_OR_GREATER
+    internal class Net6Loader : IDynamicLibraryLoader
+    {
+        public IntPtr LoadLibrary(string dll)
+        {
+            try
+            {
+                return NativeLibrary.Load(dll);
+            }
+            catch (Exception ex)
+            {
+                throw new DynamicLibraryLoaderException("Error loading " + dll, ex);
+            }
+        }
+
+        public IntPtr GetProcAddress(IntPtr dll, string proc, bool optional)
+        {
+            try
+            {
+                if (optional)
+                {
+                    return NativeLibrary.TryGetExport(dll, proc, out var address) ? address : default;
+                }
+                return NativeLibrary.GetExport(dll, proc);
+            }
+            catch (Exception ex)
+            {
+                throw new DynamicLibraryLoaderException("Error " + dll, ex);
+            }
+        }
+    }
+#endif
+    
+    internal class NotSupportedLoader : IDynamicLibraryLoader
+    {
+        IntPtr IDynamicLibraryLoader.LoadLibrary(string dll)
+        {
+            throw new PlatformNotSupportedException();
+        }
+
+        IntPtr IDynamicLibraryLoader.GetProcAddress(IntPtr dll, string proc, bool optional)
+        {
+            throw new PlatformNotSupportedException();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Internal/SlicedStream.cs b/src/Avalonia.Base/Platform/Internal/SlicedStream.cs
new file mode 100644
index 0000000000..124c248aa8
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/SlicedStream.cs
@@ -0,0 +1,59 @@
+using System;
+using System.IO;
+
+namespace Avalonia.Platform.Internal;
+
+internal class SlicedStream : Stream
+{
+    private readonly Stream _baseStream;
+    private readonly int _from;
+
+    public SlicedStream(Stream baseStream, int from, int length)
+    {
+        Length = length;
+        _baseStream = baseStream;
+        _from = from;
+        _baseStream.Position = from;
+    }
+    public override void Flush()
+    {
+    }
+
+    public override int Read(byte[] buffer, int offset, int count)
+    {
+        return _baseStream.Read(buffer, offset, (int)Math.Min(count, Length - Position));
+    }
+
+    public override long Seek(long offset, SeekOrigin origin)
+    {
+        if (origin == SeekOrigin.Begin)
+            Position = offset;
+        if (origin == SeekOrigin.End)
+            Position = _from + Length + offset;
+        if (origin == SeekOrigin.Current)
+            Position = Position + offset;
+        return Position;
+    }
+
+    public override void SetLength(long value) => throw new NotSupportedException();
+
+    public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
+
+    public override bool CanRead => true;
+    public override bool CanSeek => _baseStream.CanRead;
+    public override bool CanWrite => false;
+    public override long Length { get; }
+    public override long Position
+    {
+        get => _baseStream.Position - _from;
+        set => _baseStream.Position = value + _from;
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
+            _baseStream.Dispose();
+    }
+
+    public override void Close() => _baseStream.Close();
+}
diff --git a/src/Avalonia.Base/Platform/Internal/UnmanagedBlob.cs b/src/Avalonia.Base/Platform/Internal/UnmanagedBlob.cs
new file mode 100644
index 0000000000..a56d9ffd1c
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Internal/UnmanagedBlob.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+namespace Avalonia.Platform.Internal;
+
+internal class UnmanagedBlob : IUnmanagedBlob
+{
+    private IntPtr _address;
+    private readonly object _lock = new object();
+#if DEBUG
+    private static readonly List<string> Backtraces = new List<string>();
+    private static Thread? GCThread;
+    private readonly string _backtrace;
+    private static readonly object _btlock = new object();
+
+    class GCThreadDetector
+    {
+        ~GCThreadDetector()
+        {
+            GCThread = Thread.CurrentThread;
+        }
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    static void Spawn() => new GCThreadDetector();
+
+    static UnmanagedBlob()
+    {
+        Spawn();
+        GC.WaitForPendingFinalizers();
+    }
+#endif
+
+    public UnmanagedBlob(int size)
+    {
+        try
+        {
+            if (size <= 0)
+                throw new ArgumentException("Positive number required", nameof(size));
+            _address = Alloc(size);
+            GC.AddMemoryPressure(size);
+            Size = size;
+        }
+        catch
+        {
+            GC.SuppressFinalize(this);
+            throw;
+        }
+#if DEBUG
+        _backtrace = Environment.StackTrace;
+        lock (_btlock)
+            Backtraces.Add(_backtrace);
+#endif
+    }
+
+    void DoDispose()
+    {
+        lock (_lock)
+        {
+            if (!IsDisposed)
+            {
+#if DEBUG
+                lock (_btlock)
+                    Backtraces.Remove(_backtrace);
+#endif
+                Free(_address, Size);
+                GC.RemoveMemoryPressure(Size);
+                IsDisposed = true;
+                _address = IntPtr.Zero;
+                Size = 0;
+            }
+        }
+    }
+
+    public void Dispose()
+    {
+#if DEBUG
+        if (Thread.CurrentThread.ManagedThreadId == GCThread?.ManagedThreadId)
+        {
+            lock (_lock)
+            {
+                if (!IsDisposed)
+                {
+                    Console.Error.WriteLine("Native blob disposal from finalizer thread\nBacktrace: "
+                                         + Environment.StackTrace
+                                         + "\n\nBlob created by " + _backtrace);
+                }
+            }
+        }
+#endif
+        DoDispose();
+        GC.SuppressFinalize(this);
+    }
+
+    ~UnmanagedBlob()
+    {
+#if DEBUG
+        Console.Error.WriteLine("Undisposed native blob created by " + _backtrace);
+#endif
+        DoDispose();
+    }
+
+    public IntPtr Address => IsDisposed ? throw new ObjectDisposedException("UnmanagedBlob") : _address;
+    public int Size { get; private set; }
+    public bool IsDisposed { get; private set; }
+
+    [DllImport("libc", SetLastError = true)]
+    private static extern IntPtr mmap(IntPtr addr, IntPtr length, int prot, int flags, int fd, IntPtr offset);
+    [DllImport("libc", SetLastError = true)]
+    private static extern int munmap(IntPtr addr, IntPtr length);
+    [DllImport("libc", SetLastError = true)]
+    private static extern long sysconf(int name);
+
+    private bool? _useMmap;
+    private bool UseMmap
+        => _useMmap ?? ((_useMmap = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)).Value);
+
+    // Could be replaced with https://github.com/dotnet/runtime/issues/40892 when it will be available.
+    private IntPtr Alloc(int size)
+    {
+        if (!UseMmap)
+        {
+            return Marshal.AllocHGlobal(size);
+        }
+        else
+        {
+            var rv = mmap(IntPtr.Zero, new IntPtr(size), 3, 0x22, -1, IntPtr.Zero);
+            if (rv.ToInt64() == -1 || (ulong)rv.ToInt64() == 0xffffffff)
+            {
+                var errno = Marshal.GetLastWin32Error();
+                throw new Exception("Unable to allocate memory: " + errno);
+            }
+            return rv;
+        }
+    }
+
+    private void Free(IntPtr ptr, int len)
+    {
+        if (!UseMmap)
+        {
+            Marshal.FreeHGlobal(ptr);
+        }
+        else
+        {
+            if (munmap(ptr, new IntPtr(len)) == -1)
+            {
+                var errno = Marshal.GetLastWin32Error();
+                throw new Exception("Unable to free memory: " + errno);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Interop/IDynamicLibraryLoader.cs b/src/Avalonia.Base/Platform/Interop/IDynamicLibraryLoader.cs
index 8124ce6bc4..d9db4b71d5 100644
--- a/src/Avalonia.Base/Platform/Interop/IDynamicLibraryLoader.cs
+++ b/src/Avalonia.Base/Platform/Interop/IDynamicLibraryLoader.cs
@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform.Interop
 {
+    [Unstable]
     public interface IDynamicLibraryLoader
     {
         IntPtr LoadLibrary(string dll);
@@ -14,5 +16,10 @@ namespace Avalonia.Platform.Interop
         {
             
         }
+        
+        public DynamicLibraryLoaderException(string message, Exception innerException) : base(message, innerException)
+        {
+            
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Platform/LockedFramebuffer.cs b/src/Avalonia.Base/Platform/LockedFramebuffer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/LockedFramebuffer.cs
rename to src/Avalonia.Base/Platform/LockedFramebuffer.cs
diff --git a/src/Avalonia.Visuals/Platform/PathGeometryContext.cs b/src/Avalonia.Base/Platform/PathGeometryContext.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/PathGeometryContext.cs
rename to src/Avalonia.Base/Platform/PathGeometryContext.cs
diff --git a/src/Avalonia.Visuals/Platform/PixelFormat.cs b/src/Avalonia.Base/Platform/PixelFormat.cs
similarity index 100%
rename from src/Avalonia.Visuals/Platform/PixelFormat.cs
rename to src/Avalonia.Base/Platform/PixelFormat.cs
diff --git a/src/Avalonia.Base/Platform/StandardRuntimePlatform.cs b/src/Avalonia.Base/Platform/StandardRuntimePlatform.cs
new file mode 100644
index 0000000000..4df9e8e917
--- /dev/null
+++ b/src/Avalonia.Base/Platform/StandardRuntimePlatform.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Avalonia.Platform.Internal;
+
+namespace Avalonia.Platform
+{
+    public class StandardRuntimePlatform : IRuntimePlatform
+    {
+        public IDisposable StartSystemTimer(TimeSpan interval, Action tick)
+        {
+            return new Timer(_ => tick(), null, interval, interval);
+        }
+
+        public IUnmanagedBlob AllocBlob(int size) => new UnmanagedBlob(size);
+        
+        private static readonly Lazy<RuntimePlatformInfo> Info = new(() =>
+        {
+            OperatingSystemType os;
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                os = OperatingSystemType.OSX;
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                os = OperatingSystemType.Linux;
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                os = OperatingSystemType.WinNT;
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("Android")))
+                os = OperatingSystemType.Android;
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("iOS")))
+                os = OperatingSystemType.iOS;
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("Browser")))
+                os = OperatingSystemType.Browser;
+            else
+                throw new Exception("Unknown OS platform " + RuntimeInformation.OSDescription);
+
+            // Source: https://github.com/dotnet/runtime/blob/main/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
+            var isCoreClr = Environment.Version.Major >= 5 || RuntimeInformation.FrameworkDescription.StartsWith(".NET Core", StringComparison.OrdinalIgnoreCase);
+            var isMonoRuntime = Type.GetType("Mono.Runtime") != null;
+            var isFramework = !isCoreClr && RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase);
+            
+            return new RuntimePlatformInfo
+            {
+                IsCoreClr = isCoreClr,
+                IsDotNetFramework = isFramework,
+                IsMono = isMonoRuntime,
+                
+                IsDesktop = os is OperatingSystemType.Linux or OperatingSystemType.OSX or OperatingSystemType.WinNT,
+                IsMobile = os is OperatingSystemType.Android or OperatingSystemType.iOS,
+                IsUnix = os is OperatingSystemType.Linux or OperatingSystemType.OSX or OperatingSystemType.Android,
+                IsBrowser = os == OperatingSystemType.Browser,
+                OperatingSystem = os,
+            };
+        });
+
+
+        public virtual RuntimePlatformInfo GetRuntimeInfo() => Info.Value;
+    }
+}
diff --git a/src/Avalonia.Base/Platform/StandardRuntimePlatformServices.cs b/src/Avalonia.Base/Platform/StandardRuntimePlatformServices.cs
new file mode 100644
index 0000000000..65d6733399
--- /dev/null
+++ b/src/Avalonia.Base/Platform/StandardRuntimePlatformServices.cs
@@ -0,0 +1,34 @@
+using System.Reflection;
+using Avalonia.Platform.Internal;
+using Avalonia.Platform.Interop;
+
+namespace Avalonia.Platform
+{
+    public static class StandardRuntimePlatformServices
+    {
+        public static void Register(Assembly? assembly = null)
+        {
+            var standardPlatform = new StandardRuntimePlatform();
+
+            AssetLoader.RegisterResUriParsers();
+            AvaloniaLocator.CurrentMutable
+                .Bind<IRuntimePlatform>().ToConstant(standardPlatform)
+                .Bind<IAssetLoader>().ToConstant(new AssetLoader(assembly))
+                .Bind<IDynamicLibraryLoader>().ToConstant(
+#if NET6_0_OR_GREATER
+                    new Net6Loader()
+#else
+                    standardPlatform.GetRuntimeInfo().OperatingSystem switch
+                    {
+                        OperatingSystemType.WinNT => (IDynamicLibraryLoader)new Win32Loader(),
+                        OperatingSystemType.OSX => new UnixLoader(),
+                        OperatingSystemType.Linux => new UnixLoader(),
+                        OperatingSystemType.Android => new UnixLoader(),
+                        // iOS, WASM, ...
+                        _ => new NotSupportedLoader()
+                    }
+#endif
+                );
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Point.cs b/src/Avalonia.Base/Point.cs
new file mode 100644
index 0000000000..fbdf0db800
--- /dev/null
+++ b/src/Avalonia.Base/Point.cs
@@ -0,0 +1,282 @@
+using System;
+using System.Globalization;
+using System.Numerics;
+#if !BUILDTASK
+using Avalonia.Animation.Animators;
+#endif
+using Avalonia.Utilities;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Defines a point.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct Point : IEquatable<Point>
+    {
+        static Point()
+        {
+#if !BUILDTASK
+            Animation.Animation.RegisterAnimator<PointAnimator>(prop => typeof(Point).IsAssignableFrom(prop.PropertyType));
+#endif
+        }
+
+        /// <summary>
+        /// The X position.
+        /// </summary>
+        private readonly double _x;
+
+        /// <summary>
+        /// The Y position.
+        /// </summary>
+        private readonly double _y;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Point"/> structure.
+        /// </summary>
+        /// <param name="x">The X position.</param>
+        /// <param name="y">The Y position.</param>
+        public Point(double x, double y)
+        {
+            _x = x;
+            _y = y;
+        }
+
+        /// <summary>
+        /// Gets the X position.
+        /// </summary>
+        public double X => _x;
+
+        /// <summary>
+        /// Gets the Y position.
+        /// </summary>
+        public double Y => _y;
+
+        /// <summary>
+        /// Converts the <see cref="Point"/> to a <see cref="Vector"/>.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        public static implicit operator Vector(Point p)
+        {
+            return new Vector(p._x, p._y);
+        }
+
+        /// <summary>
+        /// Negates a point.
+        /// </summary>
+        /// <param name="a">The point.</param>
+        /// <returns>The negated point.</returns>
+        public static Point operator -(Point a)
+        {
+            return new Point(-a._x, -a._y);
+        }
+
+        /// <summary>
+        /// Checks for equality between two <see cref="Point"/>s.
+        /// </summary>
+        /// <param name="left">The first point.</param>
+        /// <param name="right">The second point.</param>
+        /// <returns>True if the points are equal; otherwise false.</returns>
+        public static bool operator ==(Point left, Point right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Checks for inequality between two <see cref="Point"/>s.
+        /// </summary>
+        /// <param name="left">The first point.</param>
+        /// <param name="right">The second point.</param>
+        /// <returns>True if the points are unequal; otherwise false.</returns>
+        public static bool operator !=(Point left, Point right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Adds two points.
+        /// </summary>
+        /// <param name="a">The first point.</param>
+        /// <param name="b">The second point.</param>
+        /// <returns>A point that is the result of the addition.</returns>
+        public static Point operator +(Point a, Point b)
+        {
+            return new Point(a._x + b._x, a._y + b._y);
+        }
+
+        /// <summary>
+        /// Adds a vector to a point.
+        /// </summary>
+        /// <param name="a">The point.</param>
+        /// <param name="b">The vector.</param>
+        /// <returns>A point that is the result of the addition.</returns>
+        public static Point operator +(Point a, Vector b)
+        {
+            return new Point(a._x + b.X, a._y + b.Y);
+        }
+
+        /// <summary>
+        /// Subtracts two points.
+        /// </summary>
+        /// <param name="a">The first point.</param>
+        /// <param name="b">The second point.</param>
+        /// <returns>A point that is the result of the subtraction.</returns>
+        public static Point operator -(Point a, Point b)
+        {
+            return new Point(a._x - b._x, a._y - b._y);
+        }
+
+        /// <summary>
+        /// Subtracts a vector from a point.
+        /// </summary>
+        /// <param name="a">The point.</param>
+        /// <param name="b">The vector.</param>
+        /// <returns>A point that is the result of the subtraction.</returns>
+        public static Point operator -(Point a, Vector b)
+        {
+            return new Point(a._x - b.X, a._y - b.Y);
+        }
+
+        /// <summary>
+        /// Multiplies a point by a factor coordinate-wise
+        /// </summary>
+        /// <param name="p">Point to multiply</param>
+        /// <param name="k">Factor</param>
+        /// <returns>Points having its coordinates multiplied</returns>
+        public static Point operator *(Point p, double k) => new Point(p.X * k, p.Y * k);
+
+        /// <summary>
+        /// Multiplies a point by a factor coordinate-wise
+        /// </summary>
+        /// <param name="p">Point to multiply</param>
+        /// <param name="k">Factor</param>
+        /// <returns>Points having its coordinates multiplied</returns>
+        public static Point operator *(double k, Point p) => new Point(p.X * k, p.Y * k);
+
+        /// <summary>
+        /// Divides a point by a factor coordinate-wise
+        /// </summary>
+        /// <param name="p">Point to divide by</param>
+        /// <param name="k">Factor</param>
+        /// <returns>Points having its coordinates divided</returns>
+        public static Point operator /(Point p, double k) => new Point(p.X / k, p.Y / k);
+
+        /// <summary>
+        /// Applies a matrix to a point.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <param name="matrix">The matrix.</param>
+        /// <returns>The resulting point.</returns>
+        public static Point operator *(Point point, Matrix matrix) => matrix.Transform(point);
+
+        /// <summary>
+        /// Parses a <see cref="Point"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The <see cref="Point"/>.</returns>
+        public static Point Parse(string s)
+        {
+            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Point."))
+            {
+                return new Point(
+                    tokenizer.ReadDouble(),
+                    tokenizer.ReadDouble()
+                );
+            }
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the point is equal to the other given point.
+        /// </summary>
+        /// <param name="other">The other point to test equality against.</param>
+        /// <returns>True if this point is equal to other; False otherwise.</returns>
+        public bool Equals(Point other)
+        {
+            // ReSharper disable CompareOfFloatsByEqualityOperator
+            return _x == other._x &&
+                   _y == other._y;
+            // ReSharper enable CompareOfFloatsByEqualityOperator
+        }
+
+        /// <summary>
+        /// Checks for equality between a point and an object.
+        /// </summary>
+        /// <param name="obj">The object.</param>
+        /// <returns>
+        /// True if <paramref name="obj"/> is a point that equals the current point.
+        /// </returns>
+        public override bool Equals(object? obj) => obj is Point other && Equals(other);
+
+        /// <summary>
+        /// Returns a hash code for a <see cref="Point"/>.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hash = 17;
+                hash = (hash * 23) + _x.GetHashCode();
+                hash = (hash * 23) + _y.GetHashCode();
+                return hash;
+            }
+        }
+
+        /// <summary>
+        /// Returns the string representation of the point.
+        /// </summary>
+        /// <returns>The string representation of the point.</returns>
+        public override string ToString()
+        {
+            return string.Format(CultureInfo.InvariantCulture, "{0}, {1}", _x, _y);
+        }
+
+        /// <summary>
+        /// Transforms the point by a matrix.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <returns>The transformed point.</returns>
+        public Point Transform(Matrix transform) => transform.Transform(this);
+
+        /// <summary>
+        /// Returns a new point with the specified X coordinate.
+        /// </summary>
+        /// <param name="x">The X coordinate.</param>
+        /// <returns>The new point.</returns>
+        public Point WithX(double x)
+        {
+            return new Point(x, _y);
+        }
+
+        /// <summary>
+        /// Returns a new point with the specified Y coordinate.
+        /// </summary>
+        /// <param name="y">The Y coordinate.</param>
+        /// <returns>The new point.</returns>
+        public Point WithY(double y)
+        {
+            return new Point(_x, y);
+        }
+
+        /// <summary>
+        /// Deconstructs the point into its X and Y coordinates.
+        /// </summary>
+        /// <param name="x">The X coordinate.</param>
+        /// <param name="y">The Y coordinate.</param>
+        public void Deconstruct(out double x, out double y)
+        {
+            x = this._x;
+            y = this._y;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the X and Y coordinates are zero.
+        /// </summary>
+        public bool IsDefault
+        {
+            get { return (_x == 0) && (_y == 0); }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Points.cs b/src/Avalonia.Base/Points.cs
similarity index 100%
rename from src/Avalonia.Visuals/Points.cs
rename to src/Avalonia.Base/Points.cs
diff --git a/src/Avalonia.Base/Properties/AssemblyInfo.cs b/src/Avalonia.Base/Properties/AssemblyInfo.cs
index 053c7a7547..c8368e6d7a 100644
--- a/src/Avalonia.Base/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Base/Properties/AssemblyInfo.cs
@@ -1,14 +1,33 @@
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Easings")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Data.Converters")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input.GestureRecognizers")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input.TextInput")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Layout")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.LogicalTree")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media.Imaging")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media.Transformation")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Styling")]
+
 [assembly: InternalsVisibleTo("Avalonia.Base.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] 
+[assembly: InternalsVisibleTo("Avalonia.Controls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Controls.ColorPicker, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 [assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Controls.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.DesignerSupport, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.LeakTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 [assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Visuals, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
+[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Web.Blazor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Avalonia.Base/PropertyStore/BindingEntry.cs b/src/Avalonia.Base/PropertyStore/BindingEntry.cs
index cffbaed6b0..9a25e98a23 100644
--- a/src/Avalonia.Base/PropertyStore/BindingEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/BindingEntry.cs
@@ -18,19 +18,19 @@ namespace Avalonia.PropertyStore
     /// <typeparam name="T">The property type.</typeparam>
     internal class BindingEntry<T> : IBindingEntry, IPriorityValueEntry<T>, IObserver<BindingValue<T>>
     {
-        private readonly IAvaloniaObject _owner;
-        private IValueSink _sink;
+        private readonly AvaloniaObject _owner;
+        private ValueOwner<T> _sink;
         private IDisposable? _subscription;
         private bool _isSubscribed;
         private bool _batchUpdate;
         private Optional<T> _value;
 
         public BindingEntry(
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             StyledPropertyBase<T> property,
             IObservable<BindingValue<T>> source,
             BindingPriority priority,
-            IValueSink sink)
+            ValueOwner<T> sink)
         {
             _owner = owner;
             Property = property;
@@ -50,7 +50,7 @@ namespace Avalonia.PropertyStore
         {
             _batchUpdate = false;
 
-            if (_sink is ValueStore)
+            if (_sink.IsValueStore)
                 Start();
         }
 
@@ -113,16 +113,15 @@ namespace Avalonia.PropertyStore
             }
         }
 
-        public void Reparent(IValueSink sink) => _sink = sink;
+        public void Reparent(PriorityValue<T> parent) => _sink = new(parent);
 
         public void RaiseValueChanged(
-            IValueSink sink,
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             AvaloniaProperty property,
             Optional<object?> oldValue,
             Optional<object?> newValue)
         {
-            sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+            owner.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
                 owner,
                 (AvaloniaProperty<T>)property,
                 oldValue.Cast<T>(),
diff --git a/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs b/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs
index c7fbf56abc..4116f4abd9 100644
--- a/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs
@@ -18,14 +18,14 @@ namespace Avalonia.PropertyStore
     /// <typeparam name="T">The property type.</typeparam>
     internal class ConstantValueEntry<T> : IPriorityValueEntry<T>, IConstantValueEntry
     {
-        private IValueSink _sink;
+        private ValueOwner<T> _sink;
         private Optional<T> _value;
 
         public ConstantValueEntry(
             StyledPropertyBase<T> property,
             T value,
             BindingPriority priority,
-            IValueSink sink)
+            ValueOwner<T> sink)
         {
             Property = property;
             _value = value;
@@ -37,7 +37,7 @@ namespace Avalonia.PropertyStore
             StyledPropertyBase<T> property,
             Optional<T> value,
             BindingPriority priority,
-            IValueSink sink)
+            ValueOwner<T> sink)
         {
             Property = property;
             _value = value;
@@ -62,17 +62,16 @@ namespace Avalonia.PropertyStore
             _sink.Completed(Property, this, oldValue);
         }
 
-        public void Reparent(IValueSink sink) => _sink = sink;
+        public void Reparent(PriorityValue<T> sink) => _sink = new(sink);
         public void Start() { }
 
         public void RaiseValueChanged(
-            IValueSink sink,
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             AvaloniaProperty property,
             Optional<object?> oldValue,
             Optional<object?> newValue)
         {
-            sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+            owner.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
                 owner,
                 (AvaloniaProperty<T>)property,
                 oldValue.Cast<T>(),
diff --git a/src/Avalonia.Base/PropertyStore/IPriorityValueEntry.cs b/src/Avalonia.Base/PropertyStore/IPriorityValueEntry.cs
index 26665ab683..45bbd0cda5 100644
--- a/src/Avalonia.Base/PropertyStore/IPriorityValueEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/IPriorityValueEntry.cs
@@ -5,7 +5,6 @@
     /// </summary>
     internal interface IPriorityValueEntry : IValue
     {
-        void Reparent(IValueSink sink);
     }
 
     /// <summary>
@@ -14,5 +13,6 @@
     /// <typeparam name="T">The property type.</typeparam>
     internal interface IPriorityValueEntry<T> : IPriorityValueEntry, IValue<T>
     {
+        void Reparent(PriorityValue<T> parent);
     }
 }
diff --git a/src/Avalonia.Base/PropertyStore/IValue.cs b/src/Avalonia.Base/PropertyStore/IValue.cs
index a4ec06e64e..b493df92e6 100644
--- a/src/Avalonia.Base/PropertyStore/IValue.cs
+++ b/src/Avalonia.Base/PropertyStore/IValue.cs
@@ -11,8 +11,7 @@ namespace Avalonia.PropertyStore
         Optional<object?> GetValue();
         void Start();
         void RaiseValueChanged(
-            IValueSink sink,
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             AvaloniaProperty property,
             Optional<object?> oldValue,
             Optional<object?> newValue);
diff --git a/src/Avalonia.Base/PropertyStore/IValueSink.cs b/src/Avalonia.Base/PropertyStore/IValueSink.cs
deleted file mode 100644
index 738fdef267..0000000000
--- a/src/Avalonia.Base/PropertyStore/IValueSink.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Avalonia.Data;
-
-namespace Avalonia.PropertyStore
-{
-    /// <summary>
-    /// Represents an entity that can receive change notifications in a <see cref="ValueStore"/>.
-    /// </summary>
-    internal interface IValueSink
-    {
-        void ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change);
-
-        void Completed<T>(
-            StyledPropertyBase<T> property,
-            IPriorityValueEntry entry,
-            Optional<T> oldValue);
-    }
-}
diff --git a/src/Avalonia.Base/PropertyStore/LocalValueEntry.cs b/src/Avalonia.Base/PropertyStore/LocalValueEntry.cs
index cb5f3556d1..13ca69681f 100644
--- a/src/Avalonia.Base/PropertyStore/LocalValueEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/LocalValueEntry.cs
@@ -25,13 +25,12 @@ namespace Avalonia.PropertyStore
         public void Start() { }
 
         public void RaiseValueChanged(
-            IValueSink sink,
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             AvaloniaProperty property,
             Optional<object?> oldValue,
             Optional<object?> newValue)
         {
-            sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+            owner.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
                 owner,
                 (AvaloniaProperty<T>)property,
                 oldValue.Cast<T>(),
diff --git a/src/Avalonia.Base/PropertyStore/PriorityValue.cs b/src/Avalonia.Base/PropertyStore/PriorityValue.cs
index f670160e75..112cf6619f 100644
--- a/src/Avalonia.Base/PropertyStore/PriorityValue.cs
+++ b/src/Avalonia.Base/PropertyStore/PriorityValue.cs
@@ -1,10 +1,17 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using Avalonia.Data;
 
 namespace Avalonia.PropertyStore
 {
+    /// <summary>
+    /// Represents an untyped interface to <see cref="PriorityValue{T}"/>.
+    /// </summary>
+    interface IPriorityValue : IValue
+    {
+        void UpdateEffectiveValue();
+    }
+
     /// <summary>
     /// Stores a set of prioritized values and bindings in a <see cref="ValueStore"/>.
     /// </summary>
@@ -16,10 +23,10 @@ namespace Avalonia.PropertyStore
     /// <see cref="IPriorityValueEntry{T}"/> entries (sorted first by priority and then in the order
     /// they were added) plus a local value.
     /// </remarks>
-    internal class PriorityValue<T> : IValue<T>, IValueSink, IBatchUpdate
+    internal class PriorityValue<T> : IPriorityValue, IValue<T>, IBatchUpdate
     {
-        private readonly IAvaloniaObject _owner;
-        private readonly IValueSink _sink;
+        private readonly AvaloniaObject _owner;
+        private readonly ValueStore _store;
         private readonly List<IPriorityValueEntry<T>> _entries = new List<IPriorityValueEntry<T>>();
         private readonly Func<IAvaloniaObject, T, T>? _coerceValue;
         private Optional<T> _localValue;
@@ -28,13 +35,13 @@ namespace Avalonia.PropertyStore
         private bool _batchUpdate;
 
         public PriorityValue(
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             StyledPropertyBase<T> property,
-            IValueSink sink)
+            ValueStore store)
         {
             _owner = owner;
             Property = property;
-            _sink = sink;
+            _store = store;
 
             if (property.HasCoercion)
             {
@@ -44,11 +51,11 @@ namespace Avalonia.PropertyStore
         }
 
         public PriorityValue(
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             StyledPropertyBase<T> property,
-            IValueSink sink,
+            ValueStore store,
             IPriorityValueEntry<T> existing)
-            : this(owner, property, sink)
+            : this(owner, property, store)
         {
             existing.Reparent(this);
             _entries.Add(existing);
@@ -75,9 +82,9 @@ namespace Avalonia.PropertyStore
         }
 
         public PriorityValue(
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             StyledPropertyBase<T> property,
-            IValueSink sink,
+            ValueStore sink,
             LocalValueEntry<T> existing)
             : this(owner, property, sink)
         {
@@ -148,7 +155,7 @@ namespace Avalonia.PropertyStore
             else
             {
                 var insert = FindInsertPoint(priority);
-                var entry = new ConstantValueEntry<T>(Property, value, priority, this);
+                var entry = new ConstantValueEntry<T>(Property, value, priority, new ValueOwner<T>(this));
                 _entries.Insert(insert, entry);
                 result = entry;
             }
@@ -165,7 +172,7 @@ namespace Avalonia.PropertyStore
 
         public BindingEntry<T> AddBinding(IObservable<BindingValue<T>> source, BindingPriority priority)
         {
-            var binding = new BindingEntry<T>(_owner, Property, source, priority, this);
+            var binding = new BindingEntry<T>(_owner, Property, source, priority, new(this));
             var insert = FindInsertPoint(binding.Priority);
             _entries.Insert(insert, binding);
 
@@ -186,13 +193,12 @@ namespace Avalonia.PropertyStore
         public void Start() => UpdateEffectiveValue(null);
 
         public void RaiseValueChanged(
-            IValueSink sink,
-            IAvaloniaObject owner,
+            AvaloniaObject owner,
             AvaloniaProperty property,
             Optional<object?> oldValue,
             Optional<object?> newValue)
         {
-            sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+            owner.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
                 owner,
                 (AvaloniaProperty<T>)property,
                 oldValue.Cast<T>(),
@@ -200,7 +206,7 @@ namespace Avalonia.PropertyStore
                 Priority));
         }
 
-        void IValueSink.ValueChanged<TValue>(AvaloniaPropertyChangedEventArgs<TValue> change)
+        public void ValueChanged<TValue>(AvaloniaPropertyChangedEventArgs<TValue> change)
         {
             if (change.Priority == BindingPriority.LocalValue)
             {
@@ -213,22 +219,15 @@ namespace Avalonia.PropertyStore
             }
         }
 
-        void IValueSink.Completed<TValue>(
-            StyledPropertyBase<TValue> property,
-            IPriorityValueEntry entry,
-            Optional<TValue> oldValue)
+        public void Completed(IPriorityValueEntry entry, Optional<T> oldValue)
         {
             _entries.Remove((IPriorityValueEntry<T>)entry);
-
-            if (oldValue is Optional<T> o)
-            {
-                UpdateEffectiveValue(new AvaloniaPropertyChangedEventArgs<T>(
-                    _owner,
-                    Property,
-                    o,
-                    default,
-                    entry.Priority));
-            }
+            UpdateEffectiveValue(new AvaloniaPropertyChangedEventArgs<T>(
+                _owner,
+                Property,
+                oldValue,
+                default,
+                entry.Priority));
         }
 
         private int FindInsertPoint(BindingPriority priority)
@@ -308,7 +307,7 @@ namespace Avalonia.PropertyStore
                 var old = _value;
                 _value = value;
 
-                _sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+                _store.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
                     _owner,
                     Property,
                     old,
@@ -319,7 +318,7 @@ namespace Avalonia.PropertyStore
             {
                 change.MarkNonEffectiveValue();
                 change.SetOldValue(default);
-                _sink.ValueChanged(change);
+                _store.ValueChanged(change);
             }
         }
     }
diff --git a/src/Avalonia.Base/PropertyStore/ValueOwner.cs b/src/Avalonia.Base/PropertyStore/ValueOwner.cs
new file mode 100644
index 0000000000..c68435f7a5
--- /dev/null
+++ b/src/Avalonia.Base/PropertyStore/ValueOwner.cs
@@ -0,0 +1,45 @@
+using Avalonia.Data;
+
+namespace Avalonia.PropertyStore
+{
+    /// <summary>
+    /// Represents a union type of <see cref="ValueStore"/> and <see cref="PriorityValue{T}"/>,
+    /// which are the valid owners of a value store <see cref="IValue"/>.
+    /// </summary>
+    /// <typeparam name="T">The value type.</typeparam>
+    internal readonly struct ValueOwner<T>
+    {
+        private readonly ValueStore? _store;
+        private readonly PriorityValue<T>? _priorityValue;
+
+        public ValueOwner(ValueStore o)
+        {
+            _store = o;
+            _priorityValue = null;
+        }
+
+        public ValueOwner(PriorityValue<T> v)
+        {
+            _store = null;
+            _priorityValue = v;
+        }
+
+        public bool IsValueStore => _store is not null;
+
+        public void Completed(StyledPropertyBase<T> property, IPriorityValueEntry entry, Optional<T> oldValue)
+        {
+            if (_store is not null)
+                _store?.Completed(property, entry, oldValue);
+            else
+                _priorityValue!.Completed(entry, oldValue);
+        }
+
+        public void ValueChanged(AvaloniaPropertyChangedEventArgs<T> e)
+        {
+            if (_store is not null)
+                _store?.ValueChanged(e);
+            else
+                _priorityValue!.ValueChanged(e);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs b/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs
index 238bb16e3e..9f038214c4 100644
--- a/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs
+++ b/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs
@@ -51,7 +51,7 @@ namespace Avalonia.Reactive
             {
                 if (e is AvaloniaPropertyChangedEventArgs<T> typedArgs)
                 {
-                    var newValue = e.Sender.GetValue(typedArgs.Property);
+                    var newValue = e.Sender.GetValue<T>(typedArgs.Property);
 
                     if (!_value.HasValue || !EqualityComparer<T>.Default.Equals(newValue, _value.Value))
                     {
diff --git a/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs b/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs
index fbc126bb05..cafce58c9c 100644
--- a/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs
+++ b/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs
@@ -49,23 +49,31 @@ namespace Avalonia.Reactive
         {
             if (e.Property == _property)
             {
-                T newValue;
-
-                if (e is AvaloniaPropertyChangedEventArgs<T> typed)
+                if (e.Sender is AvaloniaObject ao)
                 {
-                    newValue = typed.Sender.GetValue(typed.Property);
+                    T newValue;
+
+                    if (e is AvaloniaPropertyChangedEventArgs<T> typed)
+                    {
+                        newValue = AvaloniaObjectExtensions.GetValue(ao, typed.Property);
+                    }
+                    else
+                    {
+                        newValue = (T)e.Sender.GetValue(e.Property)!;
+                    }
+
+                    if (!_value.HasValue ||
+                        !EqualityComparer<T>.Default.Equals(newValue, _value.Value))
+                    {
+                        _value = newValue;
+                        PublishNext(_value.Value!);
+                    }
                 }
                 else
                 {
-                    newValue = (T)e.Sender.GetValue(e.Property)!;
+                    throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.");
                 }
 
-                if (!_value.HasValue ||
-                    !EqualityComparer<T>.Default.Equals(newValue, _value.Value))
-                {
-                    _value = newValue;
-                    PublishNext(_value.Value!);
-                }
             }
         }
     }
diff --git a/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs b/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs
index f60ef247d5..f75917a00e 100644
--- a/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs
+++ b/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs
@@ -30,13 +30,15 @@ namespace Avalonia.Reactive
             }
             catch (InvalidCastException e)
             {
+                var unwrappedValue = value.HasValue ? value.Value : null;
+                
                 Logger.TryGet(LogEventLevel.Error, LogArea.Binding)?.Log(
                     _target,
                     "Binding produced invalid value for {$Property} ({$PropertyType}): {$Value} ({$ValueType})",
                     _property.Name,
                     _property.PropertyType,
-                    value.Value,
-                    value.Value?.GetType());
+                    unwrappedValue,
+                    unwrappedValue?.GetType());
                 PublishNext(BindingValue<T>.BindingError(e));
             }
         }
diff --git a/src/Avalonia.Base/Rect.cs b/src/Avalonia.Base/Rect.cs
new file mode 100644
index 0000000000..7930228d99
--- /dev/null
+++ b/src/Avalonia.Base/Rect.cs
@@ -0,0 +1,588 @@
+using System;
+using System.Globalization;
+using Avalonia.Animation.Animators;
+using Avalonia.Utilities;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Defines a rectangle.
+    /// </summary>
+    public readonly struct Rect : IEquatable<Rect>
+    {
+        static Rect()
+        {
+            Animation.Animation.RegisterAnimator<RectAnimator>(prop => typeof(Rect).IsAssignableFrom(prop.PropertyType));
+        }
+
+        /// <summary>
+        /// An empty rectangle.
+        /// </summary>
+        public static readonly Rect Empty = default(Rect);
+
+        /// <summary>
+        /// The X position.
+        /// </summary>
+        private readonly double _x;
+
+        /// <summary>
+        /// The Y position.
+        /// </summary>
+        private readonly double _y;
+
+        /// <summary>
+        /// The width.
+        /// </summary>
+        private readonly double _width;
+
+        /// <summary>
+        /// The height.
+        /// </summary>
+        private readonly double _height;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rect"/> structure.
+        /// </summary>
+        /// <param name="x">The X position.</param>
+        /// <param name="y">The Y position.</param>
+        /// <param name="width">The width.</param>
+        /// <param name="height">The height.</param>
+        public Rect(double x, double y, double width, double height)
+        {
+            _x = x;
+            _y = y;
+            _width = width;
+            _height = height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rect"/> structure.
+        /// </summary>
+        /// <param name="size">The size of the rectangle.</param>
+        public Rect(Size size)
+        {
+            _x = 0;
+            _y = 0;
+            _width = size.Width;
+            _height = size.Height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rect"/> structure.
+        /// </summary>
+        /// <param name="position">The position of the rectangle.</param>
+        /// <param name="size">The size of the rectangle.</param>
+        public Rect(Point position, Size size)
+        {
+            _x = position.X;
+            _y = position.Y;
+            _width = size.Width;
+            _height = size.Height;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rect"/> structure.
+        /// </summary>
+        /// <param name="topLeft">The top left position of the rectangle.</param>
+        /// <param name="bottomRight">The bottom right position of the rectangle.</param>
+        public Rect(Point topLeft, Point bottomRight)
+        {
+            _x = topLeft.X;
+            _y = topLeft.Y;
+            _width = bottomRight.X - topLeft.X;
+            _height = bottomRight.Y - topLeft.Y;
+        }
+
+        /// <summary>
+        /// Gets the X position.
+        /// </summary>
+        public double X => _x;
+
+        /// <summary>
+        /// Gets the Y position.
+        /// </summary>
+        public double Y => _y;
+
+        /// <summary>
+        /// Gets the width.
+        /// </summary>
+        public double Width => _width;
+
+        /// <summary>
+        /// Gets the height.
+        /// </summary>
+        public double Height => _height;
+
+        /// <summary>
+        /// Gets the position of the rectangle.
+        /// </summary>
+        public Point Position => new Point(_x, _y);
+
+        /// <summary>
+        /// Gets the size of the rectangle.
+        /// </summary>
+        public Size Size => new Size(_width, _height);
+
+        /// <summary>
+        /// Gets the right position of the rectangle.
+        /// </summary>
+        public double Right => _x + _width;
+
+        /// <summary>
+        /// Gets the bottom position of the rectangle.
+        /// </summary>
+        public double Bottom => _y + _height;
+        
+        /// <summary>
+        /// Gets the left position.
+        /// </summary>
+        public double Left => _x;
+
+        /// <summary>
+        /// Gets the top position.
+        /// </summary>
+        public double Top => _y;
+
+        /// <summary>
+        /// Gets the top left point of the rectangle.
+        /// </summary>
+        public Point TopLeft => new Point(_x, _y);
+
+        /// <summary>
+        /// Gets the top right point of the rectangle.
+        /// </summary>
+        public Point TopRight => new Point(Right, _y);
+
+        /// <summary>
+        /// Gets the bottom left point of the rectangle.
+        /// </summary>
+        public Point BottomLeft => new Point(_x, Bottom);
+
+        /// <summary>
+        /// Gets the bottom right point of the rectangle.
+        /// </summary>
+        public Point BottomRight => new Point(Right, Bottom);
+
+        /// <summary>
+        /// Gets the center point of the rectangle.
+        /// </summary>
+        public Point Center => new Point(_x + (_width / 2), _y + (_height / 2));
+
+        /// <summary>
+        /// Gets a value that indicates whether the rectangle is empty.
+        /// </summary>
+        // ReSharper disable CompareOfFloatsByEqualityOperator
+        public bool IsEmpty => _width == 0 && _height == 0;
+        // ReSharper restore CompareOfFloatsByEqualityOperator
+
+        /// <summary>
+        /// Checks for equality between two <see cref="Rect"/>s.
+        /// </summary>
+        /// <param name="left">The first rect.</param>
+        /// <param name="right">The second rect.</param>
+        /// <returns>True if the rects are equal; otherwise false.</returns>
+        public static bool operator ==(Rect left, Rect right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Checks for inequality between two <see cref="Rect"/>s.
+        /// </summary>
+        /// <param name="left">The first rect.</param>
+        /// <param name="right">The second rect.</param>
+        /// <returns>True if the rects are unequal; otherwise false.</returns>
+        public static bool operator !=(Rect left, Rect right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Multiplies a rectangle by a scaling vector.
+        /// </summary>
+        /// <param name="rect">The rectangle.</param>
+        /// <param name="scale">The vector scale.</param>
+        /// <returns>The scaled rectangle.</returns>
+        public static Rect operator *(Rect rect, Vector scale)
+        {
+            return new Rect(
+                rect.X * scale.X,
+                rect.Y * scale.Y,
+                rect.Width * scale.X,
+                rect.Height * scale.Y);
+        }
+        
+        /// <summary>
+        /// Multiplies a rectangle by a scale.
+        /// </summary>
+        /// <param name="rect">The rectangle.</param>
+        /// <param name="scale">The scale.</param>
+        /// <returns>The scaled rectangle.</returns>
+        public static Rect operator *(Rect rect, double scale)
+        {
+            return new Rect(
+                rect.X * scale,
+                rect.Y * scale,
+                rect.Width * scale,
+                rect.Height * scale);
+        }
+
+        /// <summary>
+        /// Divides a rectangle by a vector.
+        /// </summary>
+        /// <param name="rect">The rectangle.</param>
+        /// <param name="scale">The vector scale.</param>
+        /// <returns>The scaled rectangle.</returns>
+        public static Rect operator /(Rect rect, Vector scale)
+        {
+            return new Rect(
+                rect.X / scale.X, 
+                rect.Y / scale.Y, 
+                rect.Width / scale.X, 
+                rect.Height / scale.Y);
+        }
+
+        /// <summary>
+        /// Determines whether a point in in the bounds of the rectangle.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>
+        public bool Contains(Point p)
+        {
+            return p.X >= _x && p.X <= _x + _width &&
+                   p.Y >= _y && p.Y <= _y + _height;
+        }
+        
+        /// <summary>
+        /// Determines whether a point is in the bounds of the rectangle, exclusive of the
+        /// rectangle's bottom/right edge.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>    
+        public bool ContainsExclusive(Point p)
+        {
+            return p.X >= _x && p.X < _x + _width &&
+                   p.Y >= _y && p.Y < _y + _height;
+        }
+
+        /// <summary>
+        /// Determines whether the rectangle fully contains another rectangle.
+        /// </summary>
+        /// <param name="r">The rectangle.</param>
+        /// <returns>true if the rectangle is fully contained; otherwise false.</returns>
+        public bool Contains(Rect r)
+        {
+            return Contains(r.TopLeft) && Contains(r.BottomRight);
+        }
+
+        /// <summary>
+        /// Centers another rectangle in this rectangle.
+        /// </summary>
+        /// <param name="rect">The rectangle to center.</param>
+        /// <returns>The centered rectangle.</returns>
+        public Rect CenterRect(Rect rect)
+        {
+            return new Rect(
+                _x + ((_width - rect._width) / 2),
+                _y + ((_height - rect._height) / 2),
+                rect._width,
+                rect._height);
+        }
+
+        /// <summary>
+        /// Inflates the rectangle.
+        /// </summary>
+        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
+        /// <returns>The inflated rectangle.</returns>
+        public Rect Inflate(double thickness)
+        {
+            return Inflate(new Thickness(thickness));
+        }
+
+        /// <summary>
+        /// Inflates the rectangle.
+        /// </summary>
+        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
+        /// <returns>The inflated rectangle.</returns>
+        public Rect Inflate(Thickness thickness)
+        {
+            return new Rect(
+                new Point(_x - thickness.Left, _y - thickness.Top),
+                Size.Inflate(thickness));
+        }
+
+        /// <summary>
+        /// Deflates the rectangle.
+        /// </summary>
+        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
+        /// <returns>The deflated rectangle.</returns>
+        public Rect Deflate(double thickness)
+        {
+            return Deflate(new Thickness(thickness));
+        }
+
+        /// <summary>
+        /// Deflates the rectangle by a <see cref="Thickness"/>.
+        /// </summary>
+        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
+        /// <returns>The deflated rectangle.</returns>
+        public Rect Deflate(Thickness thickness)
+        {
+            return new Rect(
+                new Point(_x + thickness.Left, _y + thickness.Top),
+                Size.Deflate(thickness));
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the rect is equal to the other given rect.
+        /// </summary>
+        /// <param name="other">The other rect to test equality against.</param>
+        /// <returns>True if this rect is equal to other; False otherwise.</returns>
+        public bool Equals(Rect other)
+        {
+            // ReSharper disable CompareOfFloatsByEqualityOperator
+            return _x == other._x &&
+                   _y == other._y &&
+                   _width == other._width &&
+                   _height == other._height;
+            // ReSharper enable CompareOfFloatsByEqualityOperator
+        }
+
+        /// <summary>
+        /// Returns a boolean indicating whether the given object is equal to this rectangle.
+        /// </summary>
+        /// <param name="obj">The object to compare against.</param>
+        /// <returns>True if the object is equal to this rectangle; false otherwise.</returns>
+        public override bool Equals(object? obj) => obj is Rect other && Equals(other);
+
+        /// <summary>
+        /// Returns the hash code for this instance.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hash = 17;
+                hash = (hash * 23) + X.GetHashCode();
+                hash = (hash * 23) + Y.GetHashCode();
+                hash = (hash * 23) + Width.GetHashCode();
+                hash = (hash * 23) + Height.GetHashCode();
+                return hash;
+            }
+        }
+
+        /// <summary>
+        /// Gets the intersection of two rectangles.
+        /// </summary>
+        /// <param name="rect">The other rectangle.</param>
+        /// <returns>The intersection.</returns>
+        public Rect Intersect(Rect rect)
+        {
+            var newLeft = (rect.X > X) ? rect.X : X;
+            var newTop = (rect.Y > Y) ? rect.Y : Y;
+            var newRight = (rect.Right < Right) ? rect.Right : Right;
+            var newBottom = (rect.Bottom < Bottom) ? rect.Bottom : Bottom;
+
+            if ((newRight > newLeft) && (newBottom > newTop))
+            {
+                return new Rect(newLeft, newTop, newRight - newLeft, newBottom - newTop);
+            }
+            else
+            {
+                return Empty;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether a rectangle intersects with this rectangle.
+        /// </summary>
+        /// <param name="rect">The other rectangle.</param>
+        /// <returns>
+        /// True if the specified rectangle intersects with this one; otherwise false.
+        /// </returns>
+        public bool Intersects(Rect rect)
+        {
+            return (rect.X < Right) && (X < rect.Right) && (rect.Y < Bottom) && (Y < rect.Bottom);
+        }
+
+        /// <summary>
+        /// Returns the axis-aligned bounding box of a transformed rectangle.
+        /// </summary>
+        /// <param name="matrix">The transform.</param>
+        /// <returns>The bounding box</returns>
+        public Rect TransformToAABB(Matrix matrix)
+        {
+            ReadOnlySpan<Point> points = stackalloc Point[4]
+            {
+                TopLeft.Transform(matrix),
+                TopRight.Transform(matrix),
+                BottomRight.Transform(matrix),
+                BottomLeft.Transform(matrix)
+            };
+
+            var left = double.MaxValue;
+            var right = double.MinValue;
+            var top = double.MaxValue;
+            var bottom = double.MinValue;
+
+            foreach (var p in points)
+            {
+                if (p.X < left) left = p.X;
+                if (p.X > right) right = p.X;
+                if (p.Y < top) top = p.Y;
+                if (p.Y > bottom) bottom = p.Y;
+            }
+
+            return new Rect(new Point(left, top), new Point(right, bottom));
+        }
+
+        /// <summary>
+        /// Translates the rectangle by an offset.
+        /// </summary>
+        /// <param name="offset">The offset.</param>
+        /// <returns>The translated rectangle.</returns>
+        public Rect Translate(Vector offset)
+        {
+            return new Rect(Position + offset, Size);
+        }
+
+        /// <summary>
+		/// Normalizes the rectangle so both the <see cref="Width"/> and <see 
+        /// cref="Height"/> are positive, without changing the location of the rectangle
+		/// </summary>
+        /// <returns>Normalized Rect</returns>
+		/// <remarks>
+		/// Empty rect will be return when Rect contains invalid values. Like NaN.
+		/// </remarks>
+		public Rect Normalize()
+        {
+            Rect rect = this;            
+
+            if(double.IsNaN(rect.Right) || double.IsNaN(rect.Bottom) || 
+                double.IsNaN(rect.X) || double.IsNaN(rect.Y) || 
+                double.IsNaN(Height) || double.IsNaN(Width))
+            {
+                return Rect.Empty;
+            }
+
+            if (rect.Width < 0)
+            {
+                var x = X + Width;
+                var width = X - x;
+
+                rect = rect.WithX(x).WithWidth(width);
+            }
+
+            if (rect.Height < 0)
+            {
+                var y = Y + Height;
+                var height = Y - y;
+
+                rect = rect.WithY(y).WithHeight(height);
+            }
+
+            return rect;
+        }
+
+
+            /// <summary>
+            /// Gets the union of two rectangles.
+            /// </summary>
+            /// <param name="rect">The other rectangle.</param>
+            /// <returns>The union.</returns>
+            public Rect Union(Rect rect)
+        {
+            if (IsEmpty)
+            {
+                return rect;
+            }
+            else if (rect.IsEmpty)
+            {
+                return this;
+            }
+            else
+            {
+                var x1 = Math.Min(X, rect.X);
+                var x2 = Math.Max(Right, rect.Right);
+                var y1 = Math.Min(Y, rect.Y);
+                var y2 = Math.Max(Bottom, rect.Bottom);
+
+                return new Rect(new Point(x1, y1), new Point(x2, y2));
+            }
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="Rect"/> with the specified X position.
+        /// </summary>
+        /// <param name="x">The x position.</param>
+        /// <returns>The new <see cref="Rect"/>.</returns>
+        public Rect WithX(double x)
+        {
+            return new Rect(x, _y, _width, _height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="Rect"/> with the specified Y position.
+        /// </summary>
+        /// <param name="y">The y position.</param>
+        /// <returns>The new <see cref="Rect"/>.</returns>
+        public Rect WithY(double y)
+        {
+            return new Rect(_x, y, _width, _height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="Rect"/> with the specified width.
+        /// </summary>
+        /// <param name="width">The width.</param>
+        /// <returns>The new <see cref="Rect"/>.</returns>
+        public Rect WithWidth(double width)
+        {
+            return new Rect(_x, _y, width, _height);
+        }
+
+        /// <summary>
+        /// Returns a new <see cref="Rect"/> with the specified height.
+        /// </summary>
+        /// <param name="height">The height.</param>
+        /// <returns>The new <see cref="Rect"/>.</returns>
+        public Rect WithHeight(double height)
+        {
+            return new Rect(_x, _y, _width, height);
+        }
+
+        /// <summary>
+        /// Returns the string representation of the rectangle.
+        /// </summary>
+        /// <returns>The string representation of the rectangle.</returns>
+        public override string ToString()
+        {
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                "{0}, {1}, {2}, {3}",
+                _x,
+                _y,
+                _width,
+                _height);
+        }
+
+        /// <summary>
+        /// Parses a <see cref="Rect"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The parsed <see cref="Rect"/>.</returns>
+        public static Rect Parse(string s)
+        {
+            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Rect."))
+            {
+                return new Rect(
+                    tokenizer.ReadDouble(),
+                    tokenizer.ReadDouble(),
+                    tokenizer.ReadDouble(),
+                    tokenizer.ReadDouble()
+                );
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/RelativePoint.cs b/src/Avalonia.Base/RelativePoint.cs
new file mode 100644
index 0000000000..e1fd0093b6
--- /dev/null
+++ b/src/Avalonia.Base/RelativePoint.cs
@@ -0,0 +1,205 @@
+using System;
+using System.Globalization;
+#if !BUILDTASK
+using Avalonia.Animation.Animators;
+#endif
+using Avalonia.Utilities;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Defines the reference point units of an <see cref="RelativePoint"/> or 
+    /// <see cref="RelativeRect"/>.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    enum RelativeUnit
+    {
+        /// <summary>
+        /// The point is expressed as a fraction of the containing element's size.
+        /// </summary>
+        Relative,
+
+        /// <summary>
+        /// The point is absolute (i.e. in pixels).
+        /// </summary>
+        Absolute,
+    }
+
+    /// <summary>
+    /// Defines a point that may be defined relative to a containing element.
+    /// </summary>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct RelativePoint : IEquatable<RelativePoint>
+    {
+        /// <summary>
+        /// A point at the top left of the containing element.
+        /// </summary>
+        public static readonly RelativePoint TopLeft = new RelativePoint(0, 0, RelativeUnit.Relative);
+
+        /// <summary>
+        /// A point at the center of the containing element.
+        /// </summary>
+        public static readonly RelativePoint Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+
+        /// <summary>
+        /// A point at the bottom right of the containing element.
+        /// </summary>
+        public static readonly RelativePoint BottomRight = new RelativePoint(1, 1, RelativeUnit.Relative);
+
+        private readonly Point _point;
+
+        private readonly RelativeUnit _unit;
+
+        static RelativePoint()
+        {
+#if !BUILDTASK
+            Animation.Animation.RegisterAnimator<RelativePointAnimator>(prop => typeof(RelativePoint).IsAssignableFrom(prop.PropertyType));
+#endif
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RelativePoint"/> struct.
+        /// </summary>
+        /// <param name="x">The X point.</param>
+        /// <param name="y">The Y point</param>
+        /// <param name="unit">The unit.</param>
+        public RelativePoint(double x, double y, RelativeUnit unit)
+            : this(new Point(x, y), unit)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RelativePoint"/> struct.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <param name="unit">The unit.</param>
+        public RelativePoint(Point point, RelativeUnit unit)
+        {
+            _point = point;
+            _unit = unit;
+        }
+
+        /// <summary>
+        /// Gets the point.
+        /// </summary>
+        public Point Point => _point;
+
+        /// <summary>
+        /// Gets the unit.
+        /// </summary>
+        public RelativeUnit Unit => _unit;
+
+        /// <summary>
+        /// Checks for equality between two <see cref="RelativePoint"/>s.
+        /// </summary>
+        /// <param name="left">The first point.</param>
+        /// <param name="right">The second point.</param>
+        /// <returns>True if the points are equal; otherwise false.</returns>
+        public static bool operator ==(RelativePoint left, RelativePoint right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Checks for inequality between two <see cref="RelativePoint"/>s.
+        /// </summary>
+        /// <param name="left">The first point.</param>
+        /// <param name="right">The second point.</param>
+        /// <returns>True if the points are unequal; otherwise false.</returns>
+        public static bool operator !=(RelativePoint left, RelativePoint right)
+        {
+            return !left.Equals(right);
+        }
+
+        /// <summary>
+        /// Checks if the <see cref="RelativePoint"/> equals another object.
+        /// </summary>
+        /// <param name="obj">The other object.</param>
+        /// <returns>True if the objects are equal, otherwise false.</returns>
+        public override bool Equals(object? obj) => obj is RelativePoint other && Equals(other);
+
+        /// <summary>
+        /// Checks if the <see cref="RelativePoint"/> equals another point.
+        /// </summary>
+        /// <param name="p">The other point.</param>
+        /// <returns>True if the objects are equal, otherwise false.</returns>
+        public bool Equals(RelativePoint p)
+        {
+            return Unit == p.Unit && Point == p.Point;
+        }
+
+        /// <summary>
+        /// Gets a hashcode for a <see cref="RelativePoint"/>.
+        /// </summary>
+        /// <returns>A hash code.</returns>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (_point.GetHashCode() * 397) ^ (int)_unit;
+            }
+        }
+
+        /// <summary>
+        /// Converts a <see cref="RelativePoint"/> into pixels.
+        /// </summary>
+        /// <param name="size">The size of the visual.</param>
+        /// <returns>The origin point in pixels.</returns>
+        public Point ToPixels(Size size)
+        {
+            return _unit == RelativeUnit.Absolute ?
+                _point :
+                new Point(_point.X * size.Width, _point.Y * size.Height);
+        }
+
+        /// <summary>
+        /// Parses a <see cref="RelativePoint"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The parsed <see cref="RelativePoint"/>.</returns>
+        public static RelativePoint Parse(string s)
+        {
+            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid RelativePoint."))
+            {
+                var x = tokenizer.ReadString();
+                var y = tokenizer.ReadString();
+
+                var unit = RelativeUnit.Absolute;
+                var scale = 1.0;
+
+                if (x.EndsWith("%"))
+                {
+                    if (!y.EndsWith("%"))
+                    {
+                        throw new FormatException("If one coordinate is relative, both must be.");
+                    }
+
+                    x = x.TrimEnd('%');
+                    y = y.TrimEnd('%');
+                    unit = RelativeUnit.Relative;
+                    scale = 0.01;
+                }
+
+                return new RelativePoint(
+                    double.Parse(x, CultureInfo.InvariantCulture) * scale,
+                    double.Parse(y, CultureInfo.InvariantCulture) * scale,
+                    unit);
+            }
+        }
+
+        /// <summary>
+        /// Returns a String representing this RelativePoint instance.
+        /// </summary>
+        /// <returns>The string representation.</returns>
+        public override string ToString()
+        {
+            return _unit == RelativeUnit.Absolute ?
+                _point.ToString() :
+                 string.Format(CultureInfo.InvariantCulture, "{0}%, {1}%", _point.X * 100, _point.Y * 100);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/RelativeRect.cs b/src/Avalonia.Base/RelativeRect.cs
similarity index 100%
rename from src/Avalonia.Visuals/RelativeRect.cs
rename to src/Avalonia.Base/RelativeRect.cs
diff --git a/src/Avalonia.Visuals/RenderTargetCorruptedException.cs b/src/Avalonia.Base/RenderTargetCorruptedException.cs
similarity index 100%
rename from src/Avalonia.Visuals/RenderTargetCorruptedException.cs
rename to src/Avalonia.Base/RenderTargetCorruptedException.cs
diff --git a/src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs b/src/Avalonia.Base/Rendering/DefaultRenderTimer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs
rename to src/Avalonia.Base/Rendering/DefaultRenderTimer.cs
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Base/Rendering/DeferredRenderer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
rename to src/Avalonia.Base/Rendering/DeferredRenderer.cs
diff --git a/src/Avalonia.Visuals/Rendering/DirtyRects.cs b/src/Avalonia.Base/Rendering/DirtyRects.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/DirtyRects.cs
rename to src/Avalonia.Base/Rendering/DirtyRects.cs
diff --git a/src/Avalonia.Visuals/Rendering/DirtyVisuals.cs b/src/Avalonia.Base/Rendering/DirtyVisuals.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/DirtyVisuals.cs
rename to src/Avalonia.Base/Rendering/DirtyVisuals.cs
diff --git a/src/Avalonia.Visuals/Rendering/DisplayDirtyRect.cs b/src/Avalonia.Base/Rendering/DisplayDirtyRect.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/DisplayDirtyRect.cs
rename to src/Avalonia.Base/Rendering/DisplayDirtyRect.cs
diff --git a/src/Avalonia.Visuals/Rendering/DisplayDirtyRects.cs b/src/Avalonia.Base/Rendering/DisplayDirtyRects.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/DisplayDirtyRects.cs
rename to src/Avalonia.Base/Rendering/DisplayDirtyRects.cs
diff --git a/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs b/src/Avalonia.Base/Rendering/ICustomSimpleHitTest.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
rename to src/Avalonia.Base/Rendering/ICustomSimpleHitTest.cs
diff --git a/src/Avalonia.Base/Rendering/IDeferredRendererLock.cs b/src/Avalonia.Base/Rendering/IDeferredRendererLock.cs
new file mode 100644
index 0000000000..1c6bd69158
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IDeferredRendererLock.cs
@@ -0,0 +1,11 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Rendering
+{
+    [Unstable]
+    public interface IDeferredRendererLock
+    {
+        IDisposable? TryLock();
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/IRenderLoop.cs b/src/Avalonia.Base/Rendering/IRenderLoop.cs
new file mode 100644
index 0000000000..9838967261
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IRenderLoop.cs
@@ -0,0 +1,31 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// The application render loop.
+    /// </summary>
+    /// <remarks>
+    /// The render loop is responsible for advancing the animation timer and updating the scene
+    /// graph for visible windows.
+    /// </remarks>
+    [NotClientImplementable]
+    public interface IRenderLoop
+    {
+        /// <summary>
+        /// Adds an update task.
+        /// </summary>
+        /// <param name="i">The update task.</param>
+        /// <remarks>
+        /// Registered update tasks will be polled on each tick of the render loop after the
+        /// animation timer has been pulsed.
+        /// </remarks>
+        void Add(IRenderLoopTask i);
+
+        /// <summary>
+        /// Removes an update task.
+        /// </summary>
+        /// <param name="i">The update task.</param>
+        void Remove(IRenderLoopTask i);
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderLoopTask.cs b/src/Avalonia.Base/Rendering/IRenderLoopTask.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/IRenderLoopTask.cs
rename to src/Avalonia.Base/Rendering/IRenderLoopTask.cs
diff --git a/src/Avalonia.Base/Rendering/IRenderRoot.cs b/src/Avalonia.Base/Rendering/IRenderRoot.cs
new file mode 100644
index 0000000000..1aa44158b2
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IRenderRoot.cs
@@ -0,0 +1,54 @@
+using Avalonia.Metadata;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Represents the root of a renderable tree.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IRenderRoot : IVisual
+    {
+        /// <summary>
+        /// Gets the client size of the window.
+        /// </summary>
+        Size ClientSize { get; }
+
+        /// <summary>
+        /// Gets the renderer for the window.
+        /// </summary>
+        IRenderer Renderer { get; }
+
+        /// <summary>
+        /// The scaling factor to use in rendering.
+        /// </summary>
+        double RenderScaling { get; }
+
+        /// <summary>
+        /// Creates a render target for the window.
+        /// </summary>
+        /// <returns>An <see cref="IRenderTarget"/>.</returns>
+        IRenderTarget CreateRenderTarget();
+
+        /// <summary>
+        /// Adds a rectangle to the window's dirty region.
+        /// </summary>
+        /// <param name="rect">The rectangle.</param>
+        void Invalidate(Rect rect);
+
+        /// <summary>
+        /// Converts a point from screen to client coordinates.
+        /// </summary>
+        /// <param name="point">The point in screen device coordinates.</param>
+        /// <returns>The point in client coordinates.</returns>
+        Point PointToClient(PixelPoint point);
+
+        /// <summary>
+        /// Converts a point from client to screen coordinates.
+        /// </summary>
+        /// <param name="point">The point in client coordinates.</param>
+        /// <returns>The point in screen device coordinates.</returns>
+        PixelPoint PointToScreen(Point point);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/IRenderTimer.cs b/src/Avalonia.Base/Rendering/IRenderTimer.cs
new file mode 100644
index 0000000000..ee74c345be
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IRenderTimer.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Defines the interface implemented by an application render timer.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IRenderTimer
+    {
+        /// <summary>
+        /// Raised when the render timer ticks to signal a new frame should be drawn.
+        /// </summary>
+        /// <remarks>
+        /// This event can be raised on any thread; it is the responsibility of the subscriber to
+        /// switch execution to the right thread.
+        /// </remarks>
+        event Action<TimeSpan> Tick;
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderer.cs b/src/Avalonia.Base/Rendering/IRenderer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/IRenderer.cs
rename to src/Avalonia.Base/Rendering/IRenderer.cs
diff --git a/src/Avalonia.Visuals/Rendering/IRendererFactory.cs b/src/Avalonia.Base/Rendering/IRendererFactory.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/IRendererFactory.cs
rename to src/Avalonia.Base/Rendering/IRendererFactory.cs
diff --git a/src/Avalonia.Base/Rendering/IVisualBrushInitialize.cs b/src/Avalonia.Base/Rendering/IVisualBrushInitialize.cs
new file mode 100644
index 0000000000..b5ab8ed0bd
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IVisualBrushInitialize.cs
@@ -0,0 +1,18 @@
+using Avalonia.Media;
+using Avalonia.Metadata;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Internal interface for initializing controls that are to be used as the visual in a
+    /// <see cref="VisualBrush"/>.
+    /// </summary>
+    [Unstable]
+    public interface IVisualBrushInitialize
+    {
+        /// <summary>
+        /// Ensures that the control is ready to use as the visual in a visual brush.
+        /// </summary>
+        void EnsureInitialized();
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/IVisualBrushRenderer.cs b/src/Avalonia.Base/Rendering/IVisualBrushRenderer.cs
new file mode 100644
index 0000000000..f5312ad39b
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/IVisualBrushRenderer.cs
@@ -0,0 +1,29 @@
+using Avalonia.Media;
+using Avalonia.Metadata;
+using Avalonia.Platform;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// Defines a renderer used to render a visual brush to a bitmap.
+    /// </summary>
+    [Unstable]
+    public interface IVisualBrushRenderer
+    {
+        /// <summary>
+        /// Gets the size of the intermediate render target to which the visual brush should be
+        /// drawn.
+        /// </summary>
+        /// <param name="brush">The visual brush.</param>
+        /// <returns>The size of the intermediate render target to create.</returns>
+        Size GetRenderTargetSize(IVisualBrush brush);
+
+        /// <summary>
+        /// Renders a visual brush to a bitmap.
+        /// </summary>
+        /// <param name="context">The drawing context to render to.</param>
+        /// <param name="brush">The visual brush.</param>
+        /// <returns>A bitmap containing the rendered brush.</returns>
+        void RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush);
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/ImmediateRenderer.cs b/src/Avalonia.Base/Rendering/ImmediateRenderer.cs
new file mode 100644
index 0000000000..54b2ce5a25
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/ImmediateRenderer.cs
@@ -0,0 +1,359 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Logging;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering
+{
+    /// <summary>
+    /// A renderer which renders the state of the visual tree without an intermediate scene graph
+    /// representation.
+    /// </summary>
+    /// <remarks>
+    /// The immediate renderer supports only clip-bound-based hit testing; a control's geometry is
+    /// not taken into account.
+    /// </remarks>
+    public class ImmediateRenderer : RendererBase, IRenderer, IVisualBrushRenderer
+    {
+        private readonly IVisual _root;
+        private readonly IRenderRoot? _renderRoot;
+        private bool _updateTransformedBounds = true;
+        private IRenderTarget? _renderTarget;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImmediateRenderer"/> class.
+        /// </summary>
+        /// <param name="root">The control to render.</param>
+        public ImmediateRenderer(IVisual root)
+        {
+            _root = root ?? throw new ArgumentNullException(nameof(root));
+            _renderRoot = root as IRenderRoot;
+        }
+
+        private ImmediateRenderer(IVisual root, bool updateTransformedBounds)
+        {
+            _root = root ?? throw new ArgumentNullException(nameof(root));
+            _renderRoot = root as IRenderRoot;
+            _updateTransformedBounds = updateTransformedBounds;
+        }
+
+        /// <inheritdoc/>
+        public bool DrawFps { get; set; }
+
+        /// <inheritdoc/>
+        public bool DrawDirtyRects { get; set; }
+
+        /// <inheritdoc/>
+        public event EventHandler<SceneInvalidatedEventArgs>? SceneInvalidated;
+
+        /// <inheritdoc/>
+        public void Paint(Rect rect)
+        {
+            if (_renderTarget == null)
+            {
+                _renderTarget = ((IRenderRoot)_root).CreateRenderTarget();
+            }
+
+            try
+            {
+                using (var context = new DrawingContext(_renderTarget.CreateDrawingContext(this)))
+                {
+                    context.PlatformImpl.Clear(Colors.Transparent);
+
+                    using (context.PushTransformContainer())
+                    {
+                        Render(context, _root, _root.Bounds);
+                    }
+
+                    if (DrawDirtyRects)
+                    {
+                        var color = (uint)new Random().Next(0xffffff) | 0x44000000;
+                        context.FillRectangle(
+                            new SolidColorBrush(color),
+                            rect);
+                    }
+
+                    if (DrawFps)
+                    {
+                        RenderFps(context, _root.Bounds, null);
+                    }
+                }
+            }
+            catch (RenderTargetCorruptedException ex)
+            {
+                Logger.TryGet(LogEventLevel.Information, LogArea.Animations)?.Log(this, "Render target was corrupted. Exception: {0}", ex);
+                _renderTarget.Dispose();
+                _renderTarget = null;
+            }
+
+            SceneInvalidated?.Invoke(this, new SceneInvalidatedEventArgs((IRenderRoot)_root, rect));
+        }
+
+        /// <inheritdoc/>
+        public void Resized(Size size)
+        {
+        }
+
+        /// <summary>
+        /// Renders a visual to a render target.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <param name="target">The render target.</param>
+        public static void Render(IVisual visual, IRenderTarget target)
+        {
+            using (var renderer = new ImmediateRenderer(visual, updateTransformedBounds: false))
+            using (var context = new DrawingContext(target.CreateDrawingContext(renderer)))
+            {
+                renderer.Render(context, visual, visual.Bounds);
+            }
+        }
+
+        /// <summary>
+        /// Renders a visual to a drawing context.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <param name="context">The drawing context.</param>
+        public static void Render(IVisual visual, DrawingContext context)
+        {
+            using (var renderer = new ImmediateRenderer(visual, updateTransformedBounds: false))
+            {
+                renderer.Render(context, visual, visual.Bounds);
+            }
+        }
+
+        /// <inheritdoc/>
+        public void AddDirty(IVisual visual)
+        {
+            if (visual.Bounds != Rect.Empty)
+            {
+                var m = visual.TransformToVisual(_root);
+
+                if (m.HasValue)
+                {
+                    var bounds = new Rect(visual.Bounds.Size).TransformToAABB(m.Value);
+
+                    //use transformedbounds as previous render state of the visual bounds
+                    //so we can invalidate old and new bounds of a control in case it moved/shrinked
+                    if (visual.TransformedBounds.HasValue)
+                    {
+                        var trb = visual.TransformedBounds.Value;
+                        var trBounds = trb.Bounds.TransformToAABB(trb.Transform);
+
+                        if (trBounds != bounds)
+                        {
+                            _renderRoot?.Invalidate(trBounds);
+                        }
+                    }
+
+                    _renderRoot?.Invalidate(bounds);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Ends the operation of the renderer.
+        /// </summary>
+        public void Dispose()
+        {
+            _renderTarget?.Dispose();
+        }
+
+        /// <inheritdoc/>
+        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter)
+        {
+            return HitTest(root, p, filter);
+        }
+
+        public IVisual? HitTestFirst(Point p, IVisual root, Func<IVisual, bool> filter)
+        {
+            return HitTest(root, p, filter).FirstOrDefault();
+        }
+
+        /// <inheritdoc/>
+        public void RecalculateChildren(IVisual visual) => AddDirty(visual);
+
+        /// <inheritdoc/>
+        public void Start()
+        {
+        }
+
+        /// <inheritdoc/>
+        public void Stop()
+        {
+        }
+
+        /// <inheritdoc/>
+        Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
+        {
+            (brush.Visual as IVisualBrushInitialize)?.EnsureInitialized();
+            return brush.Visual?.Bounds.Size ?? Size.Empty;
+        }
+
+        /// <inheritdoc/>
+        void IVisualBrushRenderer.RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush)
+        {
+            var visual = brush.Visual;
+            Render(new DrawingContext(context), visual, visual.Bounds);
+        }
+
+        internal static void Render(IVisual visual, DrawingContext context, bool updateTransformedBounds)
+        {
+            using var renderer = new ImmediateRenderer(visual, updateTransformedBounds);
+            renderer.Render(context, visual, visual.Bounds);
+        }
+
+        private static void ClearTransformedBounds(IVisual visual)
+        {
+            foreach (var e in visual.GetSelfAndVisualDescendants())
+            {
+                visual.TransformedBounds = null;
+            }
+        }
+
+        private static Rect GetTransformedBounds(IVisual visual)
+        {
+            if (visual.RenderTransform == null)
+            {
+                return visual.Bounds;
+            }
+            else
+            {
+                var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
+                var offset = Matrix.CreateTranslation(visual.Bounds.Position + origin);
+                var m = (-offset) * visual.RenderTransform.Value * (offset);
+                return visual.Bounds.TransformToAABB(m);
+            }
+        }
+
+        private static IEnumerable<IVisual> HitTest(
+           IVisual visual,
+           Point p,
+           Func<IVisual, bool>? filter)
+        {
+            _ = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            if (filter?.Invoke(visual) != false)
+            {
+                bool containsPoint;
+
+                if (visual is ICustomSimpleHitTest custom)
+                {
+                    containsPoint = custom.HitTest(p);
+                }
+                else
+                {
+                    containsPoint = visual.TransformedBounds?.Contains(p) == true;
+                }
+
+                if ((containsPoint || !visual.ClipToBounds) && visual.VisualChildren.Count > 0)
+                {
+                    foreach (var child in visual.VisualChildren.SortByZIndex())
+                    {
+                        foreach (var result in HitTest(child, p, filter))
+                        {
+                            yield return result;
+                        }
+                    }
+                }
+
+                if (containsPoint)
+                {
+                    yield return visual;
+                }
+            }
+        }
+
+        private void Render(DrawingContext context, IVisual visual, Rect clipRect)
+        {
+            var opacity = visual.Opacity;
+            var clipToBounds = visual.ClipToBounds;
+            var bounds = new Rect(visual.Bounds.Size);
+
+            if (visual.IsVisible && opacity > 0)
+            {
+                var m = Matrix.CreateTranslation(visual.Bounds.Position);
+
+                var renderTransform = Matrix.Identity;
+                
+                // this should be calculated BEFORE renderTransform
+                if (visual.HasMirrorTransform)
+                {
+                    var mirrorMatrix = new Matrix(-1.0, 0.0, 0.0, 1.0, visual.Bounds.Width, 0);
+                    renderTransform *= mirrorMatrix;
+                }
+
+                if (visual.RenderTransform != null)
+                {
+                    var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
+                    var offset = Matrix.CreateTranslation(origin);
+                    var finalTransform = (-offset) * visual.RenderTransform.Value * (offset);
+                    renderTransform *= finalTransform;
+                }
+
+                m = renderTransform * m;
+
+                if (clipToBounds)
+                {
+                    if (visual.RenderTransform != null)
+                    {
+                        clipRect = new Rect(visual.Bounds.Size);
+                    }
+                    else
+                    {
+                        clipRect = clipRect.Intersect(new Rect(visual.Bounds.Size));
+                    }
+                }
+
+                using (context.PushPostTransform(m))
+                using (context.PushOpacity(opacity))
+                using (clipToBounds
+#pragma warning disable CS0618 // Type or member is obsolete
+                    ? visual is IVisualWithRoundRectClip roundClipVisual
+                        ? context.PushClip(new RoundedRect(bounds, roundClipVisual.ClipToBoundsRadius))
+                        : context.PushClip(bounds) 
+                    : default(DrawingContext.PushedState))
+#pragma warning restore CS0618 // Type or member is obsolete
+
+                using (visual.Clip != null ? context.PushGeometryClip(visual.Clip) : default(DrawingContext.PushedState))
+                using (visual.OpacityMask != null ? context.PushOpacityMask(visual.OpacityMask, bounds) : default(DrawingContext.PushedState))
+                using (context.PushTransformContainer())
+                {
+                    visual.Render(context);
+
+#pragma warning disable 0618
+                    var transformed =
+                        new TransformedBounds(bounds, new Rect(), context.CurrentContainerTransform);
+#pragma warning restore 0618
+
+                    if (_updateTransformedBounds)
+                        visual.TransformedBounds = transformed;
+
+                    foreach (var child in visual.VisualChildren.OrderBy(x => x, ZIndexComparer.Instance))
+                    {
+                        var childBounds = GetTransformedBounds(child);
+
+                        if (!child.ClipToBounds || clipRect.Intersects(childBounds))
+                        {
+                            var childClipRect = child.RenderTransform == null
+                                ? clipRect.Translate(-childBounds.Position)
+                                : clipRect;
+                            Render(context, child, childClipRect);
+                        }
+                        else if (_updateTransformedBounds)
+                        {
+                            ClearTransformedBounds(child);
+                        }
+                    }
+                }
+            }
+
+            if (!visual.IsVisible && _updateTransformedBounds)
+            {
+                ClearTransformedBounds(visual);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/ManagedDeferredRendererLock.cs b/src/Avalonia.Base/Rendering/ManagedDeferredRendererLock.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/ManagedDeferredRendererLock.cs
rename to src/Avalonia.Base/Rendering/ManagedDeferredRendererLock.cs
diff --git a/src/Avalonia.Visuals/Rendering/RenderLayer.cs b/src/Avalonia.Base/Rendering/RenderLayer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/RenderLayer.cs
rename to src/Avalonia.Base/Rendering/RenderLayer.cs
diff --git a/src/Avalonia.Visuals/Rendering/RenderLayers.cs b/src/Avalonia.Base/Rendering/RenderLayers.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/RenderLayers.cs
rename to src/Avalonia.Base/Rendering/RenderLayers.cs
diff --git a/src/Avalonia.Visuals/Rendering/RenderLoop.cs b/src/Avalonia.Base/Rendering/RenderLoop.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/RenderLoop.cs
rename to src/Avalonia.Base/Rendering/RenderLoop.cs
diff --git a/src/Avalonia.Visuals/Rendering/RendererBase.cs b/src/Avalonia.Base/Rendering/RendererBase.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/RendererBase.cs
rename to src/Avalonia.Base/Rendering/RendererBase.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs
new file mode 100644
index 0000000000..98e89f6549
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/BitmapBlendModeNode.cs
@@ -0,0 +1,68 @@
+using Avalonia.Platform;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents an bitmap blending mode push or pop.
+    /// </summary>
+    internal class BitmapBlendModeNode : IDrawOperation
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BitmapBlendModeNode"/> class that represents an
+        /// <see cref="BitmapBlendingMode"/> push.
+        /// </summary>
+        /// <param name="bitmapBlend">The <see cref="BitmapBlendingMode"/> to push.</param>
+        public BitmapBlendModeNode(BitmapBlendingMode bitmapBlend)
+        {
+            BlendingMode = bitmapBlend;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BitmapBlendModeNode"/> class that represents an
+        /// <see cref="BitmapBlendingMode"/> pop.
+        /// </summary>
+        public BitmapBlendModeNode()
+        {
+        }
+
+        /// <inheritdoc/>
+        public Rect Bounds => Rect.Empty;
+
+        /// <summary>
+        /// Gets the BitmapBlend to be pushed or null if the operation represents a pop.
+        /// </summary>
+        public BitmapBlendingMode? BlendingMode { get; }
+
+        /// <inheritdoc/>
+        public bool HitTest(Point p) => false;
+
+        /// <summary>
+        /// Determines if this draw operation equals another.
+        /// </summary>
+        /// <param name="blendingMode">the <see cref="BitmapBlendModeNode"/> how to compare</param>
+        /// <returns>True if the draw operations are the same, otherwise false.</returns>
+        /// <remarks>
+        /// The properties of the other draw operation are passed in as arguments to prevent
+        /// allocation of a not-yet-constructed draw operation object.
+        /// </remarks>
+        public bool Equals(BitmapBlendingMode? blendingMode) => BlendingMode == blendingMode;
+
+        /// <inheritdoc/>
+        public void Render(IDrawingContextImpl context)
+        {
+            if (BlendingMode.HasValue)
+            {
+                context.PushBitmapBlendMode(BlendingMode.Value);
+            }
+            else
+            {
+                context.PopBitmapBlendMode();
+            }
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs b/src/Avalonia.Base/Rendering/SceneGraph/BrushDrawOperation.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/BrushDrawOperation.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/ClipNode.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs b/src/Avalonia.Base/Rendering/SceneGraph/CustomDrawOperation.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/CustomDrawOperation.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
new file mode 100644
index 0000000000..5225b85020
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -0,0 +1,479 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+using Avalonia.Media.Imaging;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A drawing context which builds a scene graph.
+    /// </summary>
+    internal class DeferredDrawingContextImpl : IDrawingContextImpl, IDrawingContextWithAcrylicLikeSupport
+    {
+        private readonly ISceneBuilder _sceneBuilder;
+        private VisualNode? _node;
+        private int _childIndex;
+        private int _drawOperationindex;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeferredDrawingContextImpl"/> class.
+        /// </summary>
+        /// <param name="sceneBuilder">
+        /// A scene builder used for constructing child scenes for visual brushes.
+        /// </param>
+        /// <param name="layers">The scene layers.</param>
+        public DeferredDrawingContextImpl(ISceneBuilder sceneBuilder, SceneLayers layers)
+        {
+            _sceneBuilder = sceneBuilder;
+            Layers = layers;
+        }
+
+        /// <inheritdoc/>
+        public Matrix Transform { get; set; } = Matrix.Identity;
+
+        /// <summary>
+        /// Gets the layers in the scene being built.
+        /// </summary>
+        public SceneLayers Layers { get; }
+
+        /// <summary>
+        /// Informs the drawing context of the visual node that is about to be rendered.
+        /// </summary>
+        /// <param name="node">The visual node.</param>
+        /// <returns>
+        /// An object which when disposed will commit the changes to visual node.
+        /// </returns>
+        public UpdateState BeginUpdate(VisualNode node)
+        {
+            _ = node ?? throw new ArgumentNullException(nameof(node));
+
+            if (_node != null)
+            {
+                if (_childIndex < _node.Children.Count)
+                {
+                    _node.ReplaceChild(_childIndex, node);
+                }
+                else
+                {
+                    _node.AddChild(node);
+                }
+
+                ++_childIndex;
+            }
+
+            var state = new UpdateState(this, _node, _childIndex, _drawOperationindex);
+            _node = node;
+            _childIndex = _drawOperationindex = 0;
+            return state;
+        }
+
+        /// <inheritdoc/>
+        public void Clear(Color color)
+        {
+            // Cannot clear a deferred scene.
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            // Nothing to do here since we allocate no unmanaged resources.
+        }
+
+        /// <summary>
+        /// Removes any remaining drawing operations from the visual node.
+        /// </summary>
+        /// <remarks>
+        /// Drawing operations are updated in place, overwriting existing drawing operations if
+        /// they are different. Once drawing has completed for the current visual node, it is
+        /// possible that there are stale drawing operations at the end of the list. This method
+        /// trims these stale drawing operations.
+        /// </remarks>
+        public void TrimChildren()
+        {
+            _node!.TrimChildren(_childIndex);
+        }
+
+        /// <inheritdoc/>
+        public void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry)
+        {
+            var next = NextDrawAs<GeometryNode>();
+
+            if (next == null || !next.Item.Equals(Transform, brush, pen, geometry))
+            {
+                Add(new GeometryNode(Transform, brush, pen, geometry, CreateChildScene(brush)));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            var next = NextDrawAs<ImageNode>();
+
+            if (next == null || !next.Item.Equals(Transform, source, opacity, sourceRect, destRect, bitmapInterpolationMode))
+            {
+                Add(new ImageNode(Transform, source, opacity, sourceRect, destRect, bitmapInterpolationMode));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect sourceRect)
+        {
+            // This method is currently only used to composite layers so shouldn't be called here.
+            throw new NotSupportedException();
+        }
+
+        /// <inheritdoc/>
+        public void DrawLine(IPen pen, Point p1, Point p2)
+        {
+            var next = NextDrawAs<LineNode>();
+
+            if (next == null || !next.Item.Equals(Transform, pen, p1, p2))
+            {
+                Add(new LineNode(Transform, pen, p1, p2, CreateChildScene(pen.Brush)));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect,
+            BoxShadows boxShadows = default)
+        {
+            var next = NextDrawAs<RectangleNode>();
+
+            if (next == null || !next.Item.Equals(Transform, brush, pen, rect, boxShadows))
+            {
+                Add(new RectangleNode(Transform, brush, pen, rect, boxShadows, CreateChildScene(brush)));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void DrawRectangle(IExperimentalAcrylicMaterial material, RoundedRect rect)
+        {
+            var next = NextDrawAs<ExperimentalAcrylicNode>();
+
+            if (next == null || !next.Item.Equals(Transform, material, rect))
+            {
+                Add(new ExperimentalAcrylicNode(Transform, material, rect));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        public void DrawEllipse(IBrush? brush, IPen? pen, Rect rect)
+        {
+            var next = NextDrawAs<EllipseNode>();
+
+            if (next == null || !next.Item.Equals(Transform, brush, pen, rect))
+            {
+                Add(new EllipseNode(Transform, brush, pen, rect, CreateChildScene(brush)));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        public void Custom(ICustomDrawOperation custom)
+        {
+            var next = NextDrawAs<CustomDrawOperation>();
+            if (next == null || !next.Item.Equals(Transform, custom))
+                Add(new CustomDrawOperation(custom, Transform));
+            else
+                ++_drawOperationindex;
+        }
+
+        /// <inheritdoc/>
+        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+        {
+            var next = NextDrawAs<GlyphRunNode>();
+
+            if (next == null || !next.Item.Equals(Transform, foreground, glyphRun))
+            {
+                Add(new GlyphRunNode(Transform, foreground, glyphRun, CreateChildScene(foreground)));
+            }
+
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+        public IDrawingContextLayerImpl CreateLayer(Size size)
+        {
+            throw new NotSupportedException("Creating layers on a deferred drawing context not supported");
+        }
+
+        /// <inheritdoc/>
+        public void PopClip()
+        {
+            var next = NextDrawAs<ClipNode>();
+
+            if (next == null || !next.Item.Equals(null))
+            {
+                Add(new ClipNode());
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PopGeometryClip()
+        {
+            var next = NextDrawAs<GeometryClipNode>();
+
+            if (next == null || !next.Item.Equals(null))
+            {
+                Add(new GeometryClipNode());
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PopBitmapBlendMode()
+        {
+            var next = NextDrawAs<BitmapBlendModeNode>();
+
+            if (next == null || !next.Item.Equals(null))
+            {
+                Add(new BitmapBlendModeNode());
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+        
+        /// <inheritdoc/>
+        public void PopOpacity()
+        {
+            var next = NextDrawAs<OpacityNode>();
+
+            if (next == null || !next.Item.Equals(null))
+            {
+                Add(new OpacityNode());
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PopOpacityMask()
+        {
+            var next = NextDrawAs<OpacityMaskNode>();
+
+            if (next == null || !next.Item.Equals(null, null))
+            {
+                Add(new OpacityMaskNode());
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PushClip(Rect clip)
+        {
+            var next = NextDrawAs<ClipNode>();
+
+            if (next == null || !next.Item.Equals(Transform, clip))
+            {
+                Add(new ClipNode(Transform, clip));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc />
+        public void PushClip(RoundedRect clip)
+        {
+            var next = NextDrawAs<ClipNode>();
+
+            if (next == null || !next.Item.Equals(Transform, clip))
+            {
+                Add(new ClipNode(Transform, clip));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PushGeometryClip(IGeometryImpl? clip)
+        {
+            if (clip is null)
+                return;
+
+            var next = NextDrawAs<GeometryClipNode>();
+
+            if (next == null || !next.Item.Equals(Transform, clip))
+            {
+                Add(new GeometryClipNode(Transform, clip));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PushOpacity(double opacity)
+        {
+            var next = NextDrawAs<OpacityNode>();
+
+            if (next == null || !next.Item.Equals(opacity))
+            {
+                Add(new OpacityNode(opacity));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PushOpacityMask(IBrush mask, Rect bounds)
+        {
+            var next = NextDrawAs<OpacityMaskNode>();
+
+            if (next == null || !next.Item.Equals(mask, bounds))
+            {
+                Add(new OpacityMaskNode(mask, bounds, CreateChildScene(mask)));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void PushBitmapBlendMode(BitmapBlendingMode blendingMode)
+        {
+            var next = NextDrawAs<BitmapBlendModeNode>();
+
+            if (next == null || !next.Item.Equals(blendingMode))
+            {
+                Add(new BitmapBlendModeNode(blendingMode));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+        
+        public readonly struct UpdateState : IDisposable
+        {
+            public UpdateState(
+                DeferredDrawingContextImpl owner,
+                VisualNode? node,
+                int childIndex,
+                int drawOperationIndex)
+            {
+                Owner = owner;
+                Node = node;
+                ChildIndex = childIndex;
+                DrawOperationIndex = drawOperationIndex;
+            }
+
+            public void Dispose()
+            {
+                Owner._node!.TrimDrawOperations(Owner._drawOperationindex);
+
+                var dirty = Owner.Layers.GetOrAdd(Owner._node.LayerRoot!).Dirty;
+
+                var drawOperations = Owner._node.DrawOperations;
+                var drawOperationsCount = drawOperations.Count;
+
+                for (var i = 0; i < drawOperationsCount; i++)
+                {
+                    dirty.Add(drawOperations[i].Item.Bounds);
+                }
+
+                Owner._node = Node;
+                Owner._childIndex = ChildIndex;
+                Owner._drawOperationindex = DrawOperationIndex;
+            }
+
+            public DeferredDrawingContextImpl Owner { get; }
+            public VisualNode? Node { get; }
+            public int ChildIndex { get; }
+            public int DrawOperationIndex { get; }
+        }
+
+        private void Add<T>(T node) where T : class, IDrawOperation
+        {
+            using (var refCounted = RefCountable.Create(node))
+            {
+                Add(refCounted);
+            }
+        }
+
+        private void Add(IRef<IDrawOperation> node)
+        {
+            if (_drawOperationindex < _node!.DrawOperations.Count)
+            {
+                _node.ReplaceDrawOperation(_drawOperationindex, node);
+            }
+            else
+            {
+                _node.AddDrawOperation(node);
+            }
+
+            ++_drawOperationindex;
+        }
+
+        private IRef<T>? NextDrawAs<T>() where T : class, IDrawOperation
+        {
+            return _drawOperationindex < _node!.DrawOperations.Count ? _node.DrawOperations[_drawOperationindex] as IRef<T> : null;
+        }
+
+        private IDictionary<IVisual, Scene>? CreateChildScene(IBrush? brush)
+        {
+            var visualBrush = brush as VisualBrush;
+
+            if (visualBrush != null)
+            {
+                var visual = visualBrush.Visual;
+
+                if (visual != null)
+                {
+                    (visual as IVisualBrushInitialize)?.EnsureInitialized();
+                    var scene = new Scene(visual);
+                    _sceneBuilder.UpdateAll(scene);
+                    return new Dictionary<IVisual, Scene> { { visualBrush.Visual, scene } };
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs b/src/Avalonia.Base/Rendering/SceneGraph/DrawOperation.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/DrawOperation.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/EllipseNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/EllipseNode.cs
new file mode 100644
index 0000000000..c1fc6a81f6
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/EllipseNode.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents an ellipse draw.
+    /// </summary>
+    internal class EllipseNode : BrushDrawOperation
+    {
+        public EllipseNode(
+            Matrix transform, 
+            IBrush? brush, 
+            IPen? pen, 
+            Rect rect, 
+            IDictionary<IVisual, Scene>? childScenes = null) 
+            : base(rect.Inflate(pen?.Thickness ?? 0), transform)
+        {
+            Transform = transform;
+            Brush = brush?.ToImmutable();
+            Pen = pen?.ToImmutable();
+            Rect = rect;
+            ChildScenes = childScenes;
+        }
+
+        /// <summary>
+        /// Gets the fill brush.
+        /// </summary>
+        public IBrush? Brush { get; }
+
+        /// <summary>
+        /// Gets the stroke pen.
+        /// </summary>
+        public ImmutablePen? Pen { get; }
+
+        /// <summary>
+        /// Gets the transform with which the node will be drawn.
+        /// </summary>
+        public Matrix Transform { get; }
+
+        /// <summary>
+        /// Gets the rect of the ellipse to draw.
+        /// </summary>
+        public Rect Rect { get; }
+
+        public override IDictionary<IVisual, Scene>? ChildScenes { get; }
+
+        public bool Equals(Matrix transform, IBrush? brush, IPen? pen, Rect rect)
+        {
+            return transform == Transform &&
+                   Equals(brush, Brush) &&
+                   Equals(Pen, pen) &&
+                   rect.Equals(Rect);
+        }
+
+        public override void Render(IDrawingContextImpl context)
+        {
+            context.Transform = Transform;
+            context.DrawEllipse(Brush, Pen, Rect);
+        }
+
+        public override bool HitTest(Point p)
+        {
+            if (!Transform.TryInvert(out Matrix inverted))
+            {
+                return false;
+            }
+
+            p *= inverted;
+
+            var center = Rect.Center;
+
+            var strokeThickness = Pen?.Thickness ?? 0;
+
+            var rx = Rect.Width / 2 + strokeThickness / 2;
+            var ry = Rect.Height / 2 + strokeThickness / 2;
+
+            var dx = p.X - center.X;
+            var dy = p.Y - center.Y;
+
+            if (Math.Abs(dx) > rx || Math.Abs(dy) > ry)
+            {
+                return false;
+            }
+
+            if (Brush != null)
+            {
+                return Contains(rx, ry);
+            }
+            else if (strokeThickness > 0)
+            {
+                bool inStroke = Contains(rx, ry);
+
+                rx = Rect.Width / 2 - strokeThickness / 2;
+                ry = Rect.Height / 2 - strokeThickness / 2;
+
+                bool inInner = Contains(rx, ry);
+
+                return inStroke && !inInner;
+            }
+
+            bool Contains(double radiusX, double radiusY)
+            {
+                var rx2 = radiusX * radiusX;
+                var ry2 = radiusY * radiusY;
+
+                var distance = ry2 * dx * dx + rx2 * dy * dy;
+
+                return distance <= rx2 * ry2;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ExperimentalAcrylicNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GeometryBoundsHelper.cs b/src/Avalonia.Base/Rendering/SceneGraph/GeometryBoundsHelper.cs
new file mode 100644
index 0000000000..b1129e81c4
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/GeometryBoundsHelper.cs
@@ -0,0 +1,31 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Rendering.SceneGraph;
+
+internal static class GeometryBoundsHelper
+{
+    /// <summary>
+    /// Calculates the bounds of a given geometry with respect to the pens <see cref="IPen.LineCap"/>
+    /// </summary>
+    /// <param name="originalBounds">The calculated bounds without <see cref="IPen.LineCap"/>s</param>
+    /// <param name="pen">The pen with information about the <see cref="IPen.LineCap"/>s</param>
+    /// <returns></returns>
+    public static Rect CalculateBoundsWithLineCaps(this Rect originalBounds, IPen? pen)
+    {
+        if (pen is null || MathUtilities.IsZero(pen.Thickness)) return originalBounds;
+
+        switch (pen.LineCap)
+        {
+            case PenLineCap.Flat:
+                return originalBounds;
+            case PenLineCap.Round:
+                return originalBounds.Inflate(pen.Thickness / 2);
+            case PenLineCap.Square:
+                return originalBounds.Inflate(pen.Thickness);
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryClipNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/GeometryClipNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/GeometryClipNode.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs
new file mode 100644
index 0000000000..70748989d6
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs
@@ -0,0 +1,99 @@
+using System.Collections.Generic;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents a geometry draw.
+    /// </summary>
+    internal class GeometryNode : BrushDrawOperation
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GeometryNode"/> class.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <param name="brush">The fill brush.</param>
+        /// <param name="pen">The stroke pen.</param>
+        /// <param name="geometry">The geometry.</param>
+        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
+        public GeometryNode(Matrix transform,
+            IBrush? brush,
+            IPen? pen,
+            IGeometryImpl geometry,
+            IDictionary<IVisual, Scene>? childScenes = null)
+            : base(geometry.GetRenderBounds(pen).CalculateBoundsWithLineCaps(pen), transform)
+        {
+            Transform = transform;
+            Brush = brush?.ToImmutable();
+            Pen = pen?.ToImmutable();
+            Geometry = geometry;
+            ChildScenes = childScenes;
+        }
+
+        /// <summary>
+        /// Gets the transform with which the node will be drawn.
+        /// </summary>
+        public Matrix Transform { get; }
+
+        /// <summary>
+        /// Gets the fill brush.
+        /// </summary>
+        public IBrush? Brush { get; }
+
+        /// <summary>
+        /// Gets the stroke pen.
+        /// </summary>
+        public ImmutablePen? Pen { get; }
+
+        /// <summary>
+        /// Gets the geometry to draw.
+        /// </summary>
+        public IGeometryImpl Geometry { get; }
+
+        /// <inheritdoc/>
+        public override IDictionary<IVisual, Scene>? ChildScenes { get; }
+
+        /// <summary>
+        /// Determines if this draw operation equals another.
+        /// </summary>
+        /// <param name="transform">The transform of the other draw operation.</param>
+        /// <param name="brush">The fill of the other draw operation.</param>
+        /// <param name="pen">The stroke of the other draw operation.</param>
+        /// <param name="geometry">The geometry of the other draw operation.</param>
+        /// <returns>True if the draw operations are the same, otherwise false.</returns>
+        /// <remarks>
+        /// The properties of the other draw operation are passed in as arguments to prevent
+        /// allocation of a not-yet-constructed draw operation object.
+        /// </remarks>
+        public bool Equals(Matrix transform, IBrush? brush, IPen? pen, IGeometryImpl geometry)
+        {
+            return transform == Transform &&
+                   Equals(brush, Brush) &&
+                   Equals(Pen, pen) &&
+                   Equals(geometry, Geometry);
+        }
+
+        /// <inheritdoc/>
+        public override void Render(IDrawingContextImpl context)
+        {
+            context.Transform = Transform;
+            context.DrawGeometry(Brush, Pen, Geometry);
+        }
+
+        /// <inheritdoc/>
+        public override bool HitTest(Point p)
+        {
+            if (Transform.HasInverse)
+            {
+                p *= Transform.Invert();
+                return (Brush != null && Geometry.FillContains(p)) ||
+                    (Pen != null && Geometry.StrokeContains(Pen, p));
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs b/src/Avalonia.Base/Rendering/SceneGraph/IDrawOperation.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/IDrawOperation.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ISceneBuilder.cs b/src/Avalonia.Base/Rendering/SceneGraph/ISceneBuilder.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/ISceneBuilder.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/ISceneBuilder.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/IVisualNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/IVisualNode.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs
new file mode 100644
index 0000000000..23267166a5
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs
@@ -0,0 +1,119 @@
+using Avalonia.Platform;
+using Avalonia.Utilities;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// A node in the scene graph which represents an image draw.
+    /// </summary>
+    internal class ImageNode : DrawOperation
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImageNode"/> class.
+        /// </summary>
+        /// <param name="transform">The transform.</param>
+        /// <param name="source">The image to draw.</param>
+        /// <param name="opacity">The draw opacity.</param>
+        /// <param name="sourceRect">The source rect.</param>
+        /// <param name="destRect">The destination rect.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        public ImageNode(Matrix transform, IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
+            : base(destRect, transform)
+        {
+            Transform = transform;
+            Source = source.Clone();
+            Opacity = opacity;
+            SourceRect = sourceRect;
+            DestRect = destRect;
+            BitmapInterpolationMode = bitmapInterpolationMode;
+            SourceVersion = Source.Item.Version;
+        }        
+
+        /// <summary>
+        /// Gets the transform with which the node will be drawn.
+        /// </summary>
+        public Matrix Transform { get; }
+
+        /// <summary>
+        /// Gets the image to draw.
+        /// </summary>
+        public IRef<IBitmapImpl> Source { get; }
+
+        /// <summary>
+        /// Source bitmap Version
+        /// </summary>
+        public int SourceVersion { get; }
+
+        /// <summary>
+        /// Gets the draw opacity.
+        /// </summary>
+        public double Opacity { get; }
+
+        /// <summary>
+        /// Gets the source rect.
+        /// </summary>
+        public Rect SourceRect { get; }
+
+        /// <summary>
+        /// Gets the destination rect.
+        /// </summary>
+        public Rect DestRect { get; }
+
+        /// <summary>
+        /// Gets the bitmap interpolation mode.
+        /// </summary>
+        /// <value>
+        /// The scaling mode.
+        /// </value>
+        public BitmapInterpolationMode BitmapInterpolationMode { get; }
+        
+        /// <summary>
+        /// The bitmap blending mode.
+        /// </summary>
+        /// <value>
+        /// The blending mode.
+        /// </value>
+        public BitmapBlendingMode BitmapBlendingMode { get; }
+
+        /// <summary>
+        /// Determines if this draw operation equals another.
+        /// </summary>
+        /// <param name="transform">The transform of the other draw operation.</param>
+        /// <param name="source">The image of the other draw operation.</param>
+        /// <param name="opacity">The opacity of the other draw operation.</param>
+        /// <param name="sourceRect">The source rect of the other draw operation.</param>
+        /// <param name="destRect">The dest rect of the other draw operation.</param>
+        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
+        /// <returns>True if the draw operations are the same, otherwise false.</returns>
+        /// <remarks>
+        /// The properties of the other draw operation are passed in as arguments to prevent
+        /// allocation of a not-yet-constructed draw operation object.
+        /// </remarks>
+        public bool Equals(Matrix transform, IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            return transform == Transform &&
+                   Equals(source.Item, Source.Item) &&
+                   source.Item.Version == SourceVersion &&
+                   opacity == Opacity &&
+                   sourceRect == SourceRect &&
+                   destRect == DestRect &&
+                   bitmapInterpolationMode == BitmapInterpolationMode;
+        }
+
+        /// <inheritdoc/>
+        public override void Render(IDrawingContextImpl context)
+        {
+            context.Transform = Transform;
+            context.DrawBitmap(Source, Opacity, SourceRect, DestRect, BitmapInterpolationMode);
+        }
+
+        /// <inheritdoc/>
+        public override bool HitTest(Point p) => Bounds.Contains(p);
+
+        public override void Dispose()
+        {
+            Source?.Dispose();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/LineBoundsHelper.cs b/src/Avalonia.Base/Rendering/SceneGraph/LineBoundsHelper.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/LineBoundsHelper.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/LineBoundsHelper.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/OpacityNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/OpacityNode.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Base/Rendering/SceneGraph/Scene.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/Scene.cs
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
new file mode 100644
index 0000000000..5dc426ab06
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
@@ -0,0 +1,474 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// Builds a scene graph from a visual tree.
+    /// </summary>
+    public class SceneBuilder : ISceneBuilder
+    {
+        /// <inheritdoc/>
+        public void UpdateAll(Scene scene)
+        {
+            _ = scene ?? throw new ArgumentNullException(nameof(scene));
+            Dispatcher.UIThread.VerifyAccess();
+
+            UpdateSize(scene);
+            scene.Layers.GetOrAdd(scene.Root.Visual);
+
+            using (var impl = new DeferredDrawingContextImpl(this, scene.Layers))
+            using (var context = new DrawingContext(impl))
+            {
+                var clip = new Rect(scene.Root.Visual.Bounds.Size);
+                Update(context, scene, (VisualNode)scene.Root, clip, true);
+            }
+        }
+
+        /// <inheritdoc/>
+        public bool Update(Scene scene, IVisual visual)
+        {
+            _ = scene ?? throw new ArgumentNullException(nameof(scene));
+            _ = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            Dispatcher.UIThread.VerifyAccess();
+
+            if (!scene.Root.Visual.IsVisible)
+            {
+                throw new AvaloniaInternalException("Cannot update the scene for an invisible root visual.");
+            }
+
+            var node = (VisualNode?)scene.FindNode(visual);
+
+            if (visual == scene.Root.Visual)
+            {
+                UpdateSize(scene);
+            }
+
+            if (visual.VisualRoot == scene.Root.Visual)
+            {
+                if (node?.Parent != null &&
+                    visual.VisualParent != null &&
+                    node.Parent.Visual != visual.VisualParent)
+                {
+                    // The control has changed parents. Remove the node and recurse into the new parent node.
+                    ((VisualNode)node.Parent).RemoveChild(node);
+                    Deindex(scene, node);
+                    node = (VisualNode?)scene.FindNode(visual.VisualParent);
+                }
+
+                if (visual.IsVisible)
+                {
+                    // If the node isn't yet part of the scene, find the nearest ancestor that is.
+                    node = node ?? FindExistingAncestor(scene, visual);
+
+                    // We don't need to do anything if this part of the tree has already been fully
+                    // updated.
+                    if (node != null && !node.SubTreeUpdated)
+                    {
+                        // If the control we've been asked to update isn't part of the scene then
+                        // we're carrying out an add operation, so recurse and add all the
+                        // descendents too.
+                        var recurse = node.Visual != visual;
+
+                        using (var impl = new DeferredDrawingContextImpl(this, scene.Layers))
+                        using (var context = new DrawingContext(impl))
+                        {
+                            var clip = new Rect(scene.Root.Visual.Bounds.Size);
+
+                            if (node.Parent != null)
+                            {
+                                context.PushPostTransform(node.Parent.Transform);
+                                clip = node.Parent.ClipBounds;
+                            }
+
+                            using (context.PushTransformContainer())
+                            {
+                                Update(context, scene, node, clip, recurse);
+                            }
+                        }
+
+                        return true;
+                    }
+                }
+                else
+                {
+                    if (node != null)
+                    {
+                        // The control has been hidden so remove it from its parent and deindex the
+                        // node and its descendents.
+                        ((VisualNode?)node.Parent)?.RemoveChild(node);
+                        Deindex(scene, node);
+                        return true;
+                    }
+                }
+            }
+            else if (node != null)
+            {
+                // The control has been removed so remove it from its parent and deindex the
+                // node and its descendents.
+                var trim = FindFirstDeadAncestor(scene, node);
+                ((VisualNode)trim.Parent!).RemoveChild(trim);
+                Deindex(scene, trim);
+                return true;
+            }
+
+            return false;
+        }
+
+        private static VisualNode? FindExistingAncestor(Scene scene, IVisual visual)
+        {
+            var node = scene.FindNode(visual);
+
+            while (node == null && visual.IsVisible)
+            {
+                var parent = visual.VisualParent;
+
+                if (parent is null)
+                    return null;
+
+                visual = parent;
+                node = scene.FindNode(visual);
+            }
+
+            return visual.IsVisible ? (VisualNode?)node : null;
+        }
+
+        private static VisualNode FindFirstDeadAncestor(Scene scene, IVisualNode node)
+        {
+            var parent = node.Parent;
+
+            while (parent!.Visual.VisualRoot == null)
+            {
+                node = parent;
+                parent = node.Parent;
+            }
+
+            return (VisualNode)node;
+        }
+
+        private static object GetOrCreateChildNode(Scene scene, IVisual child, VisualNode parent)
+        {
+            var result = (VisualNode?)scene.FindNode(child);
+
+            if (result != null && result.Parent != parent)
+            {
+                Deindex(scene, result);
+                result = null;
+            }
+
+            return result ?? CreateNode(scene, child, parent);
+        }
+
+        private static void Update(DrawingContext context, Scene scene, VisualNode node, Rect clip, bool forceRecurse)
+        {
+            var visual = node.Visual;
+            var opacity = visual.Opacity;
+            var clipToBounds = visual.ClipToBounds;
+#pragma warning disable CS0618 // Type or member is obsolete
+            var clipToBoundsRadius = visual is IVisualWithRoundRectClip roundRectClip ?
+                roundRectClip.ClipToBoundsRadius :
+                default;
+#pragma warning restore CS0618 // Type or member is obsolete
+
+            var bounds = new Rect(visual.Bounds.Size);
+            var contextImpl = (DeferredDrawingContextImpl)context.PlatformImpl;
+
+            contextImpl.Layers.Find(node.LayerRoot!)?.Dirty.Add(node.Bounds);
+
+            if (visual.IsVisible)
+            {
+                var m = node != scene.Root ? 
+                    Matrix.CreateTranslation(visual.Bounds.Position) :
+                    Matrix.Identity;
+
+                var renderTransform = Matrix.Identity;
+
+                // this should be calculated BEFORE renderTransform
+                if (visual.HasMirrorTransform)
+                {
+                    var mirrorMatrix = new Matrix(-1.0, 0.0, 0.0, 1.0, visual.Bounds.Width, 0);
+                    renderTransform *= mirrorMatrix;
+                }
+
+                if (visual.RenderTransform != null)
+                {
+                    var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
+                    var offset = Matrix.CreateTranslation(origin);
+                    var finalTransform = (-offset) * visual.RenderTransform.Value * (offset);
+                    renderTransform *= finalTransform;
+                }
+
+                m = renderTransform * m;
+
+                using (contextImpl.BeginUpdate(node))
+                using (context.PushPostTransform(m))
+                using (context.PushTransformContainer())
+                {
+                    var globalBounds = bounds.TransformToAABB(contextImpl.Transform);
+                    var clipBounds = clipToBounds ?
+                        globalBounds.Intersect(clip) :
+                        clip;
+
+                    forceRecurse = forceRecurse ||
+                        node.ClipBounds != clipBounds ||
+                        node.Opacity != opacity ||
+                        node.Transform != contextImpl.Transform;
+
+                    node.Transform = contextImpl.Transform;
+                    node.ClipBounds = clipBounds;
+                    node.ClipToBounds = clipToBounds;
+                    node.LayoutBounds = globalBounds;
+                    node.ClipToBoundsRadius = clipToBoundsRadius;
+                    node.GeometryClip = visual.Clip?.PlatformImpl;
+                    node.Opacity = opacity;
+
+                    // TODO: Check equality between node.OpacityMask and visual.OpacityMask before assigning.
+                    node.OpacityMask = visual.OpacityMask?.ToImmutable();
+
+                    if (ShouldStartLayer(visual))
+                    {
+                        if (node.LayerRoot != visual)
+                        {
+                            MakeLayer(scene, node);
+                        }
+                        else
+                        {
+                            UpdateLayer(node, scene.Layers[node.LayerRoot]);
+                        }
+                    }
+                    else if (node.LayerRoot == node.Visual && node.Parent != null)
+                    {
+                        ClearLayer(scene, node);
+                    }
+
+                    if (node.ClipToBounds)
+                    {
+                        clip = clip.Intersect(node.ClipBounds);
+                    }
+
+                    try
+                    {
+                        visual.Render(context);
+                    }
+                    catch { }
+
+                    var transformed = new TransformedBounds(new Rect(visual.Bounds.Size), clip, node.Transform);
+                    visual.TransformedBounds = transformed;
+
+                    if (forceRecurse)
+                    {
+                        var visualChildren = (IList<IVisual>) visual.VisualChildren;
+
+                        node.TryPreallocateChildren(visualChildren.Count);
+
+                        if (visualChildren.Count == 1)
+                        {
+                            var childNode = GetOrCreateChildNode(scene, visualChildren[0], node);
+                            Update(context, scene, (VisualNode)childNode, clip, forceRecurse);
+                        }
+                        else if (visualChildren.Count > 1)
+                        {
+                            var count = visualChildren.Count;
+                            var sortedChildren = new (IVisual visual, int index)[count];
+
+                            for (var i = 0; i < count; i++)
+                            {
+                                sortedChildren[i] = (visualChildren[i], i);
+                            }
+
+                            // Regular Array.Sort is unstable, we need to provide indices as well to avoid reshuffling elements.
+                            Array.Sort(sortedChildren, (lhs, rhs) =>
+                            {
+                                var result = ZIndexComparer.Instance.Compare(lhs.visual, rhs.visual);
+
+                                return result == 0 ? lhs.index.CompareTo(rhs.index) : result;
+                            });
+
+                            foreach (var child in sortedChildren)
+                            {
+                                var childNode = GetOrCreateChildNode(scene, child.Item1, node);
+                                Update(context, scene, (VisualNode)childNode, clip, forceRecurse);
+                            }
+                        }
+
+                        node.SubTreeUpdated = true;
+                        contextImpl.TrimChildren();
+                    }
+                }
+            }
+            else
+            {
+                contextImpl.BeginUpdate(node).Dispose();
+            }
+        }
+
+        private void UpdateSize(Scene scene)
+        {
+            var renderRoot = scene.Root.Visual as IRenderRoot;
+            var newSize = renderRoot?.ClientSize ?? scene.Root.Visual.Bounds.Size;
+
+            scene.Scaling = renderRoot?.RenderScaling ?? 1;
+
+            if (scene.Size != newSize)
+            {
+                var oldSize = scene.Size;
+
+                scene.Size = newSize;
+
+                Rect horizontalDirtyRect = Rect.Empty;
+                Rect verticalDirtyRect = Rect.Empty;
+
+                if (newSize.Width > oldSize.Width)
+                {
+                    horizontalDirtyRect = new Rect(oldSize.Width, 0, newSize.Width - oldSize.Width, oldSize.Height);
+                }
+
+                if (newSize.Height > oldSize.Height)
+                {
+                    verticalDirtyRect = new Rect(0, oldSize.Height, newSize.Width, newSize.Height - oldSize.Height);
+                }
+
+                foreach (var layer in scene.Layers)
+                {
+                    layer.Dirty.Add(horizontalDirtyRect);
+                    layer.Dirty.Add(verticalDirtyRect);
+                }
+            }
+        }
+
+        private static VisualNode CreateNode(Scene scene, IVisual visual, VisualNode parent)
+        {
+            var node = new VisualNode(visual, parent);
+            node.LayerRoot = parent.LayerRoot;
+            scene.Add(node);
+            return node;
+        }
+
+        private static void Deindex(Scene scene, VisualNode node)
+        {
+            var nodeChildren = node.Children;
+            var nodeChildrenCount = nodeChildren.Count;
+
+            for (var i = 0; i < nodeChildrenCount; i++)
+            {
+                if (nodeChildren[i] is VisualNode visual)
+                {
+                    Deindex(scene, visual);
+                }
+            }
+
+            scene.Remove(node);
+
+            node.SubTreeUpdated = true;
+
+            scene.Layers[node.LayerRoot!].Dirty.Add(node.Bounds);
+
+            node.Visual.TransformedBounds = null;
+
+            if (node.LayerRoot == node.Visual && node.Visual != scene.Root.Visual)
+            {
+                scene.Layers.Remove(node.LayerRoot);
+            }
+        }
+
+        private static void ClearLayer(Scene scene, VisualNode node)
+        {
+            var parent = (VisualNode)node.Parent!;
+            var oldLayerRoot = node.LayerRoot;
+            var newLayerRoot = parent.LayerRoot!;
+            var existingDirtyRects = scene.Layers[node.LayerRoot!].Dirty;
+            var newDirtyRects = scene.Layers[newLayerRoot].Dirty;
+
+            existingDirtyRects.Coalesce();
+
+            foreach (var r in existingDirtyRects)
+            {
+                newDirtyRects.Add(r);
+            }
+
+            var oldLayer = scene.Layers[oldLayerRoot!];
+            PropagateLayer(node, scene.Layers[newLayerRoot], oldLayer);
+            scene.Layers.Remove(oldLayer);
+        }
+
+        private static void MakeLayer(Scene scene, VisualNode node)
+        {
+            var oldLayerRoot = node.LayerRoot!;
+            var layer = scene.Layers.Add(node.Visual);
+            var oldLayer = scene.Layers[oldLayerRoot!];
+
+            UpdateLayer(node, layer);
+            PropagateLayer(node, layer, scene.Layers[oldLayerRoot]);
+        }
+
+        private static void UpdateLayer(VisualNode node, SceneLayer layer)
+        {
+            layer.Opacity = node.Visual.Opacity;
+
+            if (node.Visual.OpacityMask != null)
+            {
+                layer.OpacityMask = node.Visual.OpacityMask?.ToImmutable();
+                layer.OpacityMaskRect = node.ClipBounds;
+            }
+            else
+            {
+                layer.OpacityMask = null;
+                layer.OpacityMaskRect = Rect.Empty;
+            }
+
+            layer.GeometryClip = node.HasAncestorGeometryClip ?
+                CreateLayerGeometryClip(node) :
+                null;
+        }
+
+        private static void PropagateLayer(VisualNode node, SceneLayer layer, SceneLayer oldLayer)
+        {
+            node.LayerRoot = layer.LayerRoot;
+
+            layer.Dirty.Add(node.Bounds);
+            oldLayer.Dirty.Add(node.Bounds);
+
+            foreach (VisualNode child in node.Children)
+            {
+                // If the child is not the start of a new layer, recurse.
+                if (child.LayerRoot != child.Visual)
+                {
+                    PropagateLayer(child, layer, oldLayer);
+                }
+            }
+        }
+
+        // HACK: Disabled layers because they're broken in current renderer. See #2244.
+        private static bool ShouldStartLayer(IVisual visual) => false;
+
+        private static IGeometryImpl? CreateLayerGeometryClip(VisualNode node)
+        {
+            IGeometryImpl? result = null;
+            VisualNode? n = node;
+
+            for (;;)
+            {
+                n = (VisualNode?)n!.Parent;
+
+                if (n == null || (n.GeometryClip == null && !n.HasAncestorGeometryClip))
+                {
+                    break;
+                }
+
+                if (n?.GeometryClip != null)
+                {
+                    var transformed = n.GeometryClip.WithTransform(n.Transform);
+
+                    result = result == null ? transformed : result.Intersect(transformed);
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneLayer.cs b/src/Avalonia.Base/Rendering/SceneGraph/SceneLayer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/SceneLayer.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/SceneLayer.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneLayers.cs b/src/Avalonia.Base/Rendering/SceneGraph/SceneLayers.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/SceneLayers.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/SceneLayers.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
rename to src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs
diff --git a/src/Avalonia.Visuals/Rendering/SceneInvalidatedEventArgs.cs b/src/Avalonia.Base/Rendering/SceneInvalidatedEventArgs.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SceneInvalidatedEventArgs.cs
rename to src/Avalonia.Base/Rendering/SceneInvalidatedEventArgs.cs
diff --git a/src/Avalonia.Visuals/Rendering/SleepLoopRenderTimer.cs b/src/Avalonia.Base/Rendering/SleepLoopRenderTimer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/SleepLoopRenderTimer.cs
rename to src/Avalonia.Base/Rendering/SleepLoopRenderTimer.cs
diff --git a/src/Avalonia.Visuals/Rendering/UiThreadRenderTimer.cs b/src/Avalonia.Base/Rendering/UiThreadRenderTimer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/UiThreadRenderTimer.cs
rename to src/Avalonia.Base/Rendering/UiThreadRenderTimer.cs
diff --git a/src/Avalonia.Visuals/Rendering/Utilities/TileBrushCalculator.cs b/src/Avalonia.Base/Rendering/Utilities/TileBrushCalculator.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/Utilities/TileBrushCalculator.cs
rename to src/Avalonia.Base/Rendering/Utilities/TileBrushCalculator.cs
diff --git a/src/Avalonia.Visuals/Rendering/ZIndexComparer.cs b/src/Avalonia.Base/Rendering/ZIndexComparer.cs
similarity index 100%
rename from src/Avalonia.Visuals/Rendering/ZIndexComparer.cs
rename to src/Avalonia.Base/Rendering/ZIndexComparer.cs
diff --git a/src/Avalonia.Base/Rotate3DTransform.cs b/src/Avalonia.Base/Rotate3DTransform.cs
new file mode 100644
index 0000000000..2c4e515861
--- /dev/null
+++ b/src/Avalonia.Base/Rotate3DTransform.cs
@@ -0,0 +1,210 @@
+using System;
+using System.Numerics;
+using Avalonia.Animation.Animators;
+
+namespace Avalonia.Media;
+
+/// <summary>
+///  Non-Affine 3D transformation for rotating a visual around a definable axis
+/// </summary>
+public class Rotate3DTransform : Transform
+{
+    private readonly bool _isInitializing;
+    
+    /// <summary>
+    /// Defines the <see cref="AngleX"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> AngleXProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(AngleX));
+
+    /// <summary>
+    /// Defines the <see cref="AngleY"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> AngleYProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(AngleY));
+
+    /// <summary>
+    /// Defines the <see cref="AngleZ"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> AngleZProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(AngleZ));
+
+
+    /// <summary>
+    /// Defines the <see cref="CenterX"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> CenterXProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(CenterX));
+
+
+    /// <summary>
+    /// Defines the <see cref="CenterY"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> CenterYProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(CenterY));
+
+
+    /// <summary>
+    /// Defines the <see cref="CenterZ"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> CenterZProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(CenterZ));
+
+    /// <summary>
+    /// Defines the <see cref="Depth"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> DepthProperty =
+        AvaloniaProperty.Register<Rotate3DTransform, double>(nameof(Depth));
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Rotate3DTransform"/> class.
+    /// </summary>
+    public Rotate3DTransform() { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Rotate3DTransform"/> class.
+    /// </summary>
+    /// <param name="angleX">The rotation around the X-Axis</param>
+    /// <param name="angleY">The rotation around the Y-Axis</param>
+    /// <param name="angleZ">The rotation around the Z-Axis</param>
+    /// <param name="centerX">The origin of the X-Axis</param>
+    /// <param name="centerY">The origin of the Y-Axis</param>
+    /// <param name="centerZ">The origin of the Z-Axis</param>
+    /// <param name="depth">The depth of the 3D effect</param>
+    public Rotate3DTransform(
+        double angleX,
+        double angleY,
+        double angleZ,
+        double centerX,
+        double centerY,
+        double centerZ,
+        double depth) : this()
+    {
+        _isInitializing = true;
+        AngleX = angleX;
+        AngleY = angleY;
+        AngleZ = angleZ;
+        CenterX = centerX;
+        CenterY = centerY;
+        CenterZ = centerZ;
+        Depth = depth;
+        _isInitializing = false;
+    }
+
+    /// <summary>
+    /// Sets the rotation around the X-Axis
+    /// </summary>
+    public double AngleX
+    {
+        get => GetValue(AngleXProperty);
+        set => SetValue(AngleXProperty, value);
+    }
+
+    /// <summary>
+    /// Sets the rotation around the Y-Axis
+    /// </summary>
+    public double AngleY
+    {
+        get => GetValue(AngleYProperty);
+        set => SetValue(AngleYProperty, value);
+    }
+
+    /// <summary>
+    ///  Sets the rotation around the Z-Axis
+    /// </summary>
+    public double AngleZ
+    {
+        get => GetValue(AngleZProperty);
+        set => SetValue(AngleZProperty, value);
+    }
+
+    /// <summary>
+    ///  Moves the origin the X-Axis rotates around
+    /// </summary>
+    public double CenterX
+    {
+        get => GetValue(CenterXProperty);
+        set => SetValue(CenterXProperty, value);
+    }
+
+    /// <summary>
+    ///  Moves the origin the Y-Axis rotates around
+    /// </summary>
+    public double CenterY
+    {
+        get => GetValue(CenterYProperty);
+        set => SetValue(CenterYProperty, value);
+    }
+
+    /// <summary>
+    ///  Moves the origin the Z-Axis rotates around
+    /// </summary>
+    public double CenterZ
+    {
+        get => GetValue(CenterZProperty);
+        set => SetValue(CenterZProperty, value);
+    }
+
+    /// <summary>
+    ///  Affects the depth of the rotation effect
+    /// </summary>
+    public double Depth
+    {
+        get => GetValue(DepthProperty);
+        set => SetValue(DepthProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the transform's <see cref="Matrix"/>. 
+    /// </summary>
+    public override Matrix Value
+    {
+        get
+        {
+            var matrix44 = Matrix4x4.Identity;
+            //Copy values first, because it's not guaranteed, that values will not change during calculation
+            var (copyCenterX, 
+                 copyCenterY, 
+                 copyCenterZ, 
+                 copyAngleX, 
+                 copyAngleY, 
+                 copyAngleZ, 
+                 copyDepth) = (CenterX, CenterY, CenterZ, AngleX, AngleY, AngleZ, Depth);
+            
+            var centerSum = copyCenterX + copyCenterY + copyCenterZ;
+            
+            if (Math.Abs(centerSum) > double.Epsilon) matrix44 *= Matrix4x4.CreateTranslation(-(float)copyCenterX, -(float)copyCenterY, -(float)copyCenterZ);
+
+            if (copyAngleX != 0) matrix44 *= Matrix4x4.CreateRotationX((float)Matrix.ToRadians(copyAngleX));
+            if (copyAngleY != 0) matrix44 *= Matrix4x4.CreateRotationY((float)Matrix.ToRadians(copyAngleY));
+            if (copyAngleZ != 0) matrix44 *= Matrix4x4.CreateRotationZ((float)Matrix.ToRadians(copyAngleZ));
+
+            if (Math.Abs(centerSum) > double.Epsilon) matrix44 *= Matrix4x4.CreateTranslation((float)copyCenterX, (float)copyCenterY, (float)copyCenterZ);
+
+            if (copyDepth != 0)
+            {
+                var perspectiveMatrix = Matrix4x4.Identity;
+                perspectiveMatrix.M34 = -1 / (float)copyDepth;
+                matrix44 *= perspectiveMatrix;
+            }
+
+            var matrix = new Matrix(
+                matrix44.M11,
+                matrix44.M12,
+                matrix44.M14,
+                matrix44.M21,
+                matrix44.M22,
+                matrix44.M24,
+                matrix44.M41,
+                matrix44.M42,
+                matrix44.M44);
+
+            return matrix;
+        }
+    }
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        if (!_isInitializing) RaiseChanged();
+    } 
+}
diff --git a/src/Avalonia.Visuals/RoundedRect.cs b/src/Avalonia.Base/RoundedRect.cs
similarity index 100%
rename from src/Avalonia.Visuals/RoundedRect.cs
rename to src/Avalonia.Base/RoundedRect.cs
diff --git a/src/Avalonia.Base/Settings.StyleCop b/src/Avalonia.Base/Settings.StyleCop
deleted file mode 100644
index bb05f99bc1..0000000000
--- a/src/Avalonia.Base/Settings.StyleCop
+++ /dev/null
@@ -1 +0,0 @@
-<StyleCopSettings Version="105" />
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Size.cs b/src/Avalonia.Base/Size.cs
similarity index 100%
rename from src/Avalonia.Visuals/Size.cs
rename to src/Avalonia.Base/Size.cs
diff --git a/src/Avalonia.Base/StyledElement.cs b/src/Avalonia.Base/StyledElement.cs
new file mode 100644
index 0000000000..f98d2cdbcc
--- /dev/null
+++ b/src/Avalonia.Base/StyledElement.cs
@@ -0,0 +1,893 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using Avalonia.Animation;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Diagnostics;
+using Avalonia.Logging;
+using Avalonia.LogicalTree;
+using Avalonia.Styling;
+
+#nullable enable
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Extends an <see cref="Animatable"/> with the following features:
+    /// 
+    /// - An inherited <see cref="DataContext"/>.
+    /// - Implements <see cref="IStyleable"/> to allow styling to work on the styled element.
+    /// - Implements <see cref="ILogical"/> to form part of a logical tree.
+    /// - A collection of class strings for custom styling.
+    /// </summary>
+    public class StyledElement : Animatable, IDataContextProvider, IStyledElement, ISetLogicalParent, ISetInheritanceParent
+    {
+        /// <summary>
+        /// Defines the <see cref="DataContext"/> property.
+        /// </summary>
+        public static readonly StyledProperty<object?> DataContextProperty =
+            AvaloniaProperty.Register<StyledElement, object?>(
+                nameof(DataContext),
+                inherits: true,
+                notifying: DataContextNotifying);
+
+        /// <summary>
+        /// Defines the <see cref="Name"/> property.
+        /// </summary>
+        public static readonly DirectProperty<StyledElement, string?> NameProperty =
+            AvaloniaProperty.RegisterDirect<StyledElement, string?>(nameof(Name), o => o.Name, (o, v) => o.Name = v);
+        
+        /// <summary>
+        /// Defines the <see cref="Parent"/> property.
+        /// </summary>
+        public static readonly DirectProperty<StyledElement, IStyledElement?> ParentProperty =
+            AvaloniaProperty.RegisterDirect<StyledElement, IStyledElement?>(nameof(Parent), o => o.Parent);
+
+        /// <summary>
+        /// Defines the <see cref="TemplatedParent"/> property.
+        /// </summary>
+        public static readonly DirectProperty<StyledElement, ITemplatedControl?> TemplatedParentProperty =
+            AvaloniaProperty.RegisterDirect<StyledElement, ITemplatedControl?>(
+                nameof(TemplatedParent),
+                o => o.TemplatedParent,
+                (o ,v) => o.TemplatedParent = v);
+
+        private int _initCount;
+        private string? _name;
+        private readonly Classes _classes = new Classes();
+        private ILogicalRoot? _logicalRoot;
+        private IAvaloniaList<ILogical>? _logicalChildren;
+        private IResourceDictionary? _resources;
+        private Styles? _styles;
+        private bool _styled;
+        private List<IStyleInstance>? _appliedStyles;
+        private ITemplatedControl? _templatedParent;
+        private bool _dataContextUpdating;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="StyledElement"/> class.
+        /// </summary>
+        static StyledElement()
+        {
+            DataContextProperty.Changed.AddClassHandler<StyledElement>((x,e) => x.OnDataContextChangedCore(e));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StyledElement"/> class.
+        /// </summary>
+        public StyledElement()
+        {
+            _logicalRoot = this as ILogicalRoot;
+        }
+
+        /// <summary>
+        /// Raised when the styled element is attached to a rooted logical tree.
+        /// </summary>
+        public event EventHandler<LogicalTreeAttachmentEventArgs>? AttachedToLogicalTree;
+
+        /// <summary>
+        /// Raised when the styled element is detached from a rooted logical tree.
+        /// </summary>
+        public event EventHandler<LogicalTreeAttachmentEventArgs>? DetachedFromLogicalTree;
+
+        /// <summary>
+        /// Occurs when the <see cref="DataContext"/> property changes.
+        /// </summary>
+        /// <remarks>
+        /// This event will be raised when the <see cref="DataContext"/> property has changed and
+        /// all subscribers to that change have been notified.
+        /// </remarks>
+        public event EventHandler? DataContextChanged;
+
+        /// <summary>
+        /// Occurs when the styled element has finished initialization.
+        /// </summary>
+        /// <remarks>
+        /// The Initialized event indicates that all property values on the styled element have been set.
+        /// When loading the styled element from markup, it occurs when 
+        /// <see cref="ISupportInitialize.EndInit"/> is called *and* the styled element
+        /// is attached to a rooted logical tree. When the styled element is created by code and
+        /// <see cref="ISupportInitialize"/> is not used, it is called when the styled element is attached
+        /// to the visual tree.
+        /// </remarks>
+        public event EventHandler? Initialized;
+
+        /// <summary>
+        /// Occurs when a resource in this styled element or a parent styled element has changed.
+        /// </summary>
+        public event EventHandler<ResourcesChangedEventArgs>? ResourcesChanged;
+
+        /// <summary>
+        /// Gets or sets the name of the styled element.
+        /// </summary>
+        /// <remarks>
+        /// An element's name is used to uniquely identify an element within the element's name
+        /// scope. Once the element is added to a logical tree, its name cannot be changed.
+        /// </remarks>
+        public string? Name
+        {
+            get => _name;
+
+            set
+            {
+                if (_styled)
+                {
+                    throw new InvalidOperationException("Cannot set Name : styled element already styled.");
+                }
+
+                _name = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the styled element's classes.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Classes can be used to apply user-defined styling to styled elements, or to allow styled elements
+        /// that share a common purpose to be easily selected.
+        /// </para>
+        /// <para>
+        /// Even though this property can be set, the setter is only intended for use in object
+        /// initializers. Assigning to this property does not change the underlying collection,
+        /// it simply clears the existing collection and adds the contents of the assigned
+        /// collection.
+        /// </para>
+        /// </remarks>
+        public Classes Classes
+        {
+            get
+            {
+                return _classes;
+            }
+
+            set
+            {
+                if (_classes != value)
+                {
+                    _classes.Replace(value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the control's data context.
+        /// </summary>
+        /// <remarks>
+        /// The data context is an inherited property that specifies the default object that will
+        /// be used for data binding.
+        /// </remarks>
+        public object? DataContext
+        {
+            get { return GetValue(DataContextProperty); }
+            set { SetValue(DataContextProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets a value that indicates whether the element has finished initialization.
+        /// </summary>
+        /// <remarks>
+        /// For more information about when IsInitialized is set, see the <see cref="Initialized"/>
+        /// event.
+        /// </remarks>
+        public bool IsInitialized { get; private set; }
+
+        /// <summary>
+        /// Gets the styles for the styled element.
+        /// </summary>
+        /// <remarks>
+        /// Styles for the entire application are added to the Application.Styles collection, but
+        /// each styled element may in addition define its own styles which are applied to the styled element
+        /// itself and its children.
+        /// </remarks>
+        public Styles Styles => _styles ??= new Styles(this);
+
+        /// <summary>
+        /// Gets or sets the styled element's resource dictionary.
+        /// </summary>
+        public IResourceDictionary Resources
+        {
+            get => _resources ??= new ResourceDictionary(this);
+            set
+            {
+                value = value ?? throw new ArgumentNullException(nameof(value));
+                _resources?.RemoveOwner(this);
+                _resources = value;
+                _resources.AddOwner(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets the styled element whose lookless template this styled element is part of.
+        /// </summary>
+        public ITemplatedControl? TemplatedParent
+        {
+            get => _templatedParent;
+            internal set => SetAndRaise(TemplatedParentProperty, ref _templatedParent, value);
+        }
+
+        /// <summary>
+        /// Gets the styled element's logical children.
+        /// </summary>
+        protected IAvaloniaList<ILogical> LogicalChildren
+        {
+            get
+            {
+                if (_logicalChildren == null)
+                {
+                    var list = new AvaloniaList<ILogical>
+                    {
+                        ResetBehavior = ResetBehavior.Remove,
+                        Validate = logical => ValidateLogicalChild(logical)
+                    };
+                    list.CollectionChanged += LogicalChildrenCollectionChanged;
+                    _logicalChildren = list;
+                }
+
+                return _logicalChildren;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Classes"/> collection in a form that allows adding and removing
+        /// pseudoclasses.
+        /// </summary>
+        protected IPseudoClasses PseudoClasses => Classes;
+
+        /// <summary>
+        /// Gets a value indicating whether the element is attached to a rooted logical tree.
+        /// </summary>
+        bool ILogical.IsAttachedToLogicalTree => _logicalRoot != null;
+
+        /// <summary>
+        /// Gets the styled element's logical parent.
+        /// </summary>
+        public IStyledElement? Parent { get; private set; }
+
+        /// <summary>
+        /// Gets the styled element's logical parent.
+        /// </summary>
+        ILogical? ILogical.LogicalParent => Parent;
+
+        /// <summary>
+        /// Gets the styled element's logical children.
+        /// </summary>
+        IAvaloniaReadOnlyList<ILogical> ILogical.LogicalChildren => LogicalChildren;
+
+        /// <inheritdoc/>
+        bool IResourceNode.HasResources => (_resources?.HasResources ?? false) ||
+            (((IResourceNode?)_styles)?.HasResources ?? false);
+
+        /// <inheritdoc/>
+        IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
+
+        /// <summary>
+        /// Gets the type by which the styled element is styled.
+        /// </summary>
+        /// <remarks>
+        /// Usually controls are styled by their own type, but there are instances where you want
+        /// a styled element to be styled by its base type, e.g. creating SpecialButton that
+        /// derives from Button and adds extra functionality but is still styled as a regular
+        /// Button.
+        /// </remarks>
+        Type IStyleable.StyleKey => GetType();
+
+        /// <inheritdoc/>
+        bool IStyleHost.IsStylesInitialized => _styles != null;
+
+        /// <inheritdoc/>
+        IStyleHost? IStyleHost.StylingParent => (IStyleHost?)InheritanceParent;
+
+        /// <inheritdoc/>
+        public virtual void BeginInit()
+        {
+            ++_initCount;
+        }
+
+        /// <inheritdoc/>
+        public virtual void EndInit()
+        {
+            if (_initCount == 0)
+            {
+                throw new InvalidOperationException("BeginInit was not called.");
+            }
+
+            if (--_initCount == 0 && _logicalRoot != null)
+            {
+                ApplyStyling();
+                InitializeIfNeeded();
+            }
+        }
+
+        /// <summary>
+        /// Applies styling to the control if the control is initialized and styling is not
+        /// already applied.
+        /// </summary>
+        /// <returns>
+        /// A value indicating whether styling is now applied to the control.
+        /// </returns>
+        protected bool ApplyStyling()
+        {
+            if (_initCount == 0 && !_styled)
+            {
+                try
+                {
+                    BeginBatchUpdate();
+                    AvaloniaLocator.Current.GetService<IStyler>()?.ApplyStyles(this);
+                }
+                finally
+                {
+                    EndBatchUpdate();
+                }
+
+                _styled = true;
+            }
+
+            return _styled;
+        }
+
+        /// <summary>
+        /// Detaches all styles from the element and queues a restyle.
+        /// </summary>
+        protected virtual void InvalidateStyles() => DetachStyles();
+
+        protected void InitializeIfNeeded()
+        {
+            if (_initCount == 0 && !IsInitialized)
+            {
+                IsInitialized = true;
+                OnInitialized();
+                Initialized?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        internal StyleDiagnostics GetStyleDiagnosticsInternal()
+        {
+            IReadOnlyList<IStyleInstance>? appliedStyles = _appliedStyles;
+
+            if (appliedStyles is null)
+            {
+                appliedStyles = Array.Empty<IStyleInstance>();
+            }
+
+            return new StyleDiagnostics(appliedStyles);
+        }
+
+        /// <inheritdoc/>
+        void ILogical.NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+            OnAttachedToLogicalTreeCore(e);
+        }
+
+        /// <inheritdoc/>
+        void ILogical.NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+            OnDetachedFromLogicalTreeCore(e);
+        }
+
+        /// <inheritdoc/>
+        void ILogical.NotifyResourcesChanged(ResourcesChangedEventArgs e) => NotifyResourcesChanged(e);
+
+        /// <inheritdoc/>
+        void IResourceHost.NotifyHostedResourcesChanged(ResourcesChangedEventArgs e) => NotifyResourcesChanged(e);
+
+        /// <inheritdoc/>
+        bool IResourceNode.TryGetResource(object key, out object? value)
+        {
+            value = null;
+            return (_resources?.TryGetResource(key, out value) ?? false) ||
+                   (_styles?.TryGetResource(key, out value) ?? false);
+        }
+
+        /// <summary>
+        /// Sets the styled element's logical parent.
+        /// </summary>
+        /// <param name="parent">The parent.</param>
+        void ISetLogicalParent.SetParent(ILogical? parent)
+        {
+            var old = Parent;
+
+            if (parent != old)
+            {
+                if (old != null && parent != null)
+                {
+                    throw new InvalidOperationException("The Control already has a parent.");
+                }
+
+                if (InheritanceParent == null || parent == null)
+                {
+                    InheritanceParent = parent as AvaloniaObject;
+                }
+
+                Parent = (IStyledElement?)parent;
+
+                if (_logicalRoot != null)
+                {
+                    var e = new LogicalTreeAttachmentEventArgs(_logicalRoot, this, old!);
+                    OnDetachedFromLogicalTreeCore(e);
+                }
+
+                var newRoot = FindLogicalRoot(this);
+
+                if (newRoot is object)
+                {
+                    var e = new LogicalTreeAttachmentEventArgs(newRoot, this, parent!);
+                    OnAttachedToLogicalTreeCore(e);
+                }
+                else if (parent is null)
+                {
+                    // If we were attached to the logical tree, we piggyback on the tree traversal
+                    // there to raise resources changed notifications. If we're being removed from
+                    // the logical tree, then traverse the tree raising notifications now.
+                    //
+                    // We don't raise resources changed notifications if we're being attached to a 
+                    // non-rooted control beacuse it's unlikely that dynamic resources need to be 
+                    // correct until the control is added to the tree, and it causes a *lot* of
+                    // notifications.
+                    NotifyResourcesChanged();
+                }
+
+#nullable disable
+                RaisePropertyChanged(
+                    ParentProperty,
+                    new Optional<IStyledElement>(old),
+                    new BindingValue<IStyledElement>(Parent),
+                    BindingPriority.LocalValue);
+#nullable enable
+            }
+        }
+
+        /// <summary>
+        /// Sets the styled element's inheritance parent.
+        /// </summary>
+        /// <param name="parent">The parent.</param>
+        void ISetInheritanceParent.SetParent(IAvaloniaObject? parent)
+        {
+            InheritanceParent = parent switch
+            {
+                AvaloniaObject ao => ao,
+                null => null,
+                _ => throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.")
+            };
+        }
+
+        void IStyleable.StyleApplied(IStyleInstance instance)
+        {
+            instance = instance ?? throw new ArgumentNullException(nameof(instance));
+
+            _appliedStyles ??= new List<IStyleInstance>();
+            _appliedStyles.Add(instance);
+        }
+
+        void IStyleable.DetachStyles() => DetachStyles();
+
+        void IStyleable.DetachStyles(IReadOnlyList<IStyle> styles) => DetachStyles(styles);
+
+        void IStyleable.InvalidateStyles() => InvalidateStyles();
+
+        void IStyleHost.StylesAdded(IReadOnlyList<IStyle> styles)
+        {
+            InvalidateStylesOnThisAndDescendents();
+        }
+
+        void IStyleHost.StylesRemoved(IReadOnlyList<IStyle> styles)
+        {
+            var allStyles = RecurseStyles(styles);
+            DetachStylesFromThisAndDescendents(allStyles);
+        }
+
+        protected virtual void LogicalChildrenCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    SetLogicalParent(e.NewItems!);
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    ClearLogicalParent(e.OldItems!);
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    ClearLogicalParent(e.OldItems!);
+                    SetLogicalParent(e.NewItems!);
+                    break;
+
+                case NotifyCollectionChangedAction.Reset:
+                    throw new NotSupportedException("Reset should not be signaled on LogicalChildren collection");
+            }
+        }
+
+        /// <summary>
+        /// Notifies child controls that a change has been made to resources that apply to them.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void NotifyChildResourcesChanged(ResourcesChangedEventArgs e)
+        {
+            if (_logicalChildren is object)
+            {
+                var count = _logicalChildren.Count;
+
+                if (count > 0)
+                {
+                    e ??= ResourcesChangedEventArgs.Empty;
+
+                    for (var i = 0; i < count; ++i)
+                    {
+                        _logicalChildren[i].NotifyResourcesChanged(e);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the styled element is added to a rooted logical tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called when the styled element is removed from a rooted logical tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DataContext"/> property changes.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnDataContextChanged(EventArgs e)
+        {
+            DataContextChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DataContext"/> begins updating.
+        /// </summary>
+        protected virtual void OnDataContextBeginUpdate()
+        {
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DataContext"/> finishes updating.
+        /// </summary>
+        protected virtual void OnDataContextEndUpdate()
+        {
+        }
+
+        /// <summary>
+        /// Called when the control finishes initialization.
+        /// </summary>
+        protected virtual void OnInitialized()
+        {
+        }
+
+        private static void DataContextNotifying(IAvaloniaObject o, bool updateStarted)
+        {
+            if (o is StyledElement element)
+            {
+                DataContextNotifying(element, updateStarted);
+            }
+        }
+
+        private static void DataContextNotifying(StyledElement element, bool updateStarted)
+        {
+            if (updateStarted)
+            {
+                if (!element._dataContextUpdating)
+                {
+                    element._dataContextUpdating = true;
+                    element.OnDataContextBeginUpdate();
+
+                    var logicalChildren = element.LogicalChildren;
+                    var logicalChildrenCount = logicalChildren.Count;
+
+                    for (var i = 0; i < logicalChildrenCount; i++)
+                    {
+                        if (element.LogicalChildren[i] is StyledElement s &&
+                            s.InheritanceParent == element &&
+                            !s.IsSet(DataContextProperty))
+                        {
+                            DataContextNotifying(s, updateStarted);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                if (element._dataContextUpdating)
+                {
+                    element.OnDataContextEndUpdate();
+                    element._dataContextUpdating = false;
+                }
+            }
+        }
+
+        private static ILogicalRoot? FindLogicalRoot(IStyleHost? e)
+        {
+            while (e != null)
+            {
+                if (e is ILogicalRoot root)
+                {
+                    return root;
+                }
+
+                e = e.StylingParent;
+            }
+
+            return null;
+        }
+
+        private static void ValidateLogicalChild(ILogical c)
+        {
+            if (c == null)
+            {
+                throw new ArgumentException("Cannot add null to LogicalChildren.");
+            }
+        }
+
+        private void OnAttachedToLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
+        {
+            if (this.GetLogicalParent() == null && !(this is ILogicalRoot))
+            {
+                throw new InvalidOperationException(
+                    $"AttachedToLogicalTreeCore called for '{GetType().Name}' but control has no logical parent.");
+            }
+
+            // This method can be called when a control is already attached to the logical tree
+            // in the following scenario:
+            // - ListBox gets assigned Items containing ListBoxItem
+            // - ListBox makes ListBoxItem a logical child
+            // - ListBox template gets applied; making its Panel get attached to logical tree
+            // - That AttachedToLogicalTree signal travels down to the ListBoxItem
+            if (_logicalRoot == null)
+            {
+                _logicalRoot = e.Root;
+
+                ApplyStyling();
+                NotifyResourcesChanged(propagate: false);
+
+                OnAttachedToLogicalTree(e);
+                AttachedToLogicalTree?.Invoke(this, e);
+            }
+
+            var logicalChildren = LogicalChildren;
+            var logicalChildrenCount = logicalChildren.Count;
+
+            for (var i = 0; i < logicalChildrenCount; i++)
+            {
+                if (logicalChildren[i] is StyledElement child)
+                {
+                    child.OnAttachedToLogicalTreeCore(e);
+                }
+            }
+        }
+
+        private void OnDetachedFromLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
+        {
+            if (_logicalRoot != null)
+            {
+                _logicalRoot = null;
+                DetachStyles();
+                OnDetachedFromLogicalTree(e);
+                DetachedFromLogicalTree?.Invoke(this, e);
+
+                var logicalChildren = LogicalChildren;
+                var logicalChildrenCount = logicalChildren.Count;
+
+                for (var i = 0; i < logicalChildrenCount; i++)
+                {
+                    if (logicalChildren[i] is StyledElement child)
+                    {
+                        child.OnDetachedFromLogicalTreeCore(e);
+                    }
+                }
+
+#if DEBUG
+                if (((INotifyCollectionChangedDebug)Classes).GetCollectionChangedSubscribers()?.Length > 0)
+                {
+                    Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(
+                        this,
+                        "{Type} detached from logical tree but still has class listeners",
+                        GetType());
+                }
+#endif
+            }
+        }
+
+        private void OnDataContextChangedCore(AvaloniaPropertyChangedEventArgs e)
+        {
+            OnDataContextChanged(EventArgs.Empty);
+        }
+
+        private void SetLogicalParent(IList children)
+        {
+            var count = children.Count;
+
+            for (var i = 0; i < count; i++)
+            {
+                var logical = (ILogical) children[i]!;
+                
+                if (logical.LogicalParent is null)
+                {
+                    ((ISetLogicalParent)logical).SetParent(this);
+                }
+            }
+        }
+
+        private void ClearLogicalParent(IList children)
+        {
+            var count = children.Count;
+
+            for (var i = 0; i < count; i++)
+            {
+                var logical = (ILogical) children[i]!;
+                
+                if (logical.LogicalParent == this)
+                {
+                    ((ISetLogicalParent)logical).SetParent(null);
+                }
+            }
+        }
+
+        private void DetachStyles()
+        {
+            if (_appliedStyles is object)
+            {
+                BeginBatchUpdate();
+
+                try
+                {
+                    foreach (var i in _appliedStyles)
+                    {
+                        i.Dispose();
+                    }
+
+                    _appliedStyles.Clear();
+                }
+                finally
+                {
+                    EndBatchUpdate();
+                }
+            }
+
+            _styled = false;
+        }
+
+        private void DetachStyles(IReadOnlyList<IStyle> styles)
+        {
+            styles = styles ?? throw new ArgumentNullException(nameof(styles));
+
+            if (_appliedStyles is null)
+            {
+                return;
+            }
+
+            var count = styles.Count;
+
+            for (var i = 0; i < count; ++i)
+            {
+                for (var j = _appliedStyles.Count - 1; j >= 0; --j)
+                {
+                    var applied = _appliedStyles[j];
+
+                    if (applied.Source == styles[i])
+                    {
+                        applied.Dispose();
+                        _appliedStyles.RemoveAt(j);
+                    }
+                }
+            }
+        }
+
+        private void InvalidateStylesOnThisAndDescendents()
+        {
+            InvalidateStyles();
+
+            if (_logicalChildren is object)
+            {
+                var childCount = _logicalChildren.Count;
+
+                for (var i = 0; i < childCount; ++i)
+                {
+                    (_logicalChildren[i] as StyledElement)?.InvalidateStylesOnThisAndDescendents();
+                }
+            }
+        }
+
+        private void DetachStylesFromThisAndDescendents(IReadOnlyList<IStyle> styles)
+        {
+            DetachStyles(styles);
+
+            if (_logicalChildren is object)
+            {
+                var childCount = _logicalChildren.Count;
+
+                for (var i = 0; i < childCount; ++i)
+                {
+                    (_logicalChildren[i] as StyledElement)?.DetachStylesFromThisAndDescendents(styles);
+                }
+            }
+        }
+
+        private void NotifyResourcesChanged(
+            ResourcesChangedEventArgs? e = null,
+            bool propagate = true)
+        {
+            if (ResourcesChanged is object)
+            {
+                e ??= ResourcesChangedEventArgs.Empty;
+                ResourcesChanged(this, e);
+            }
+
+            if (propagate)
+            {
+                e ??= ResourcesChangedEventArgs.Empty;
+                NotifyChildResourcesChanged(e);
+            }
+        }
+
+        private static IReadOnlyList<IStyle> RecurseStyles(IReadOnlyList<IStyle> styles)
+        {
+            var count = styles.Count;
+            List<IStyle>? result = null;
+
+            for (var i = 0; i < count; ++i)
+            {
+                var style = styles[i];
+
+                if (style.Children.Count > 0)
+                {
+                    if (result is null)
+                    {
+                        result = new List<IStyle>(styles);
+                    }
+
+                    RecurseStyles(style.Children, result);
+                }
+            }
+
+            return result ?? styles;
+        }
+
+        private static void RecurseStyles(IReadOnlyList<IStyle> styles, List<IStyle> result)
+        {
+            var count = styles.Count;
+
+            for (var i = 0; i < count; ++i)
+            {
+                var style = styles[i];
+                result.Add(style);
+                RecurseStyles(style.Children, result);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/StyledElementExtensions.cs b/src/Avalonia.Base/StyledElementExtensions.cs
similarity index 100%
rename from src/Avalonia.Styling/StyledElementExtensions.cs
rename to src/Avalonia.Base/StyledElementExtensions.cs
diff --git a/src/Avalonia.Base/StyledPropertyBase.cs b/src/Avalonia.Base/StyledPropertyBase.cs
index 16ba571a5a..da607720ff 100644
--- a/src/Avalonia.Base/StyledPropertyBase.cs
+++ b/src/Avalonia.Base/StyledPropertyBase.cs
@@ -1,8 +1,7 @@
 using System;
-using System.Diagnostics;
 using Avalonia.Data;
 using Avalonia.Reactive;
-using Avalonia.Utilities;
+using Avalonia.Styling;
 
 namespace Avalonia
 {
@@ -11,7 +10,7 @@ namespace Avalonia
     /// </summary>
     public abstract class StyledPropertyBase<TValue> : AvaloniaProperty<TValue>, IStyledPropertyAccessor
     {
-        private bool _inherits;
+        private readonly bool _inherits;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="StyledPropertyBase{T}"/> class.
@@ -158,12 +157,6 @@ namespace Avalonia
             base.OverrideMetadata(type, metadata);
         }
 
-        /// <inheritdoc/>
-        public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> vistor, ref TData data)
-        {
-            vistor.Visit(this, ref data);
-        }
-
         /// <summary>
         /// Gets the string representation of the property.
         /// </summary>
@@ -177,19 +170,19 @@ namespace Avalonia
         object? IStyledPropertyAccessor.GetDefaultValue(Type type) => GetDefaultBoxedValue(type);
 
         /// <inheritdoc/>
-        internal override void RouteClearValue(IAvaloniaObject o)
+        internal override void RouteClearValue(AvaloniaObject o)
         {
             o.ClearValue<TValue>(this);
         }
 
         /// <inheritdoc/>
-        internal override object? RouteGetValue(IAvaloniaObject o)
+        internal override object? RouteGetValue(AvaloniaObject o)
         {
             return o.GetValue<TValue>(this);
         }
 
         /// <inheritdoc/>
-        internal override object? RouteGetBaseValue(IAvaloniaObject o, BindingPriority maxPriority)
+        internal override object? RouteGetBaseValue(AvaloniaObject o, BindingPriority maxPriority)
         {
             var value = o.GetBaseValue<TValue>(this, maxPriority);
             return value.HasValue ? value.Value : AvaloniaProperty.UnsetValue;
@@ -197,7 +190,7 @@ namespace Avalonia
 
         /// <inheritdoc/>
         internal override IDisposable? RouteSetValue(
-            IAvaloniaObject o,
+            AvaloniaObject o,
             object? value,
             BindingPriority priority)
         {
@@ -221,7 +214,7 @@ namespace Avalonia
 
         /// <inheritdoc/>
         internal override IDisposable RouteBind(
-            IAvaloniaObject o,
+            AvaloniaObject o,
             IObservable<BindingValue<object?>> source,
             BindingPriority priority)
         {
@@ -232,21 +225,40 @@ namespace Avalonia
         /// <inheritdoc/>
         internal override void RouteInheritanceParentChanged(
             AvaloniaObject o,
-            IAvaloniaObject? oldParent)
+            AvaloniaObject? oldParent)
         {
             o.InheritanceParentChanged(this, oldParent);
         }
 
-        private object? GetDefaultBoxedValue(Type type)
+        internal override ISetterInstance CreateSetterInstance(IStyleable target, object? value)
         {
-            _ = type ?? throw new ArgumentNullException(nameof(type));
-            return GetMetadata(type).DefaultValue;
+            if (value is IBinding binding)
+            {
+                return new PropertySetterBindingInstance<TValue>(
+                    target,
+                    this,
+                    binding);
+            }
+            else if (value is ITemplate template && !typeof(ITemplate).IsAssignableFrom(PropertyType))
+            {
+                return new PropertySetterTemplateInstance<TValue>(
+                    target,
+                    this,
+                    template);
+            }
+            else
+            {
+                return new PropertySetterInstance<TValue>(
+                    target,
+                    this,
+                    (TValue)value!);
+            }
         }
 
-        [DebuggerHidden]
-        private Func<IAvaloniaObject, TValue, TValue> Cast<THost>(Func<THost, TValue, TValue> validate)
+        private object? GetDefaultBoxedValue(Type type)
         {
-            return (o, v) => validate((THost)o, v);
+            _ = type ?? throw new ArgumentNullException(nameof(type));
+            return GetMetadata(type).DefaultValue;
         }
     }
 }
diff --git a/src/Avalonia.Styling/Styling/Activators/AndActivator.cs b/src/Avalonia.Base/Styling/Activators/AndActivator.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/AndActivator.cs
rename to src/Avalonia.Base/Styling/Activators/AndActivator.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/AndActivatorBuilder.cs b/src/Avalonia.Base/Styling/Activators/AndActivatorBuilder.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/AndActivatorBuilder.cs
rename to src/Avalonia.Base/Styling/Activators/AndActivatorBuilder.cs
diff --git a/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs b/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs
new file mode 100644
index 0000000000..ac7b8b3ef1
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs
@@ -0,0 +1,33 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling.Activators
+{
+    /// <summary>
+    /// Defines a style activator.
+    /// </summary>
+    /// <remarks>
+    /// A style activator is very similar to an `IObservable{bool}` but is optimized for the
+    /// particular use-case of activating a style according to a selector. It differs from
+    /// an observable in two major ways:
+    /// 
+    /// - Can only have a single subscription
+    /// - The subscription can have a tag associated with it, allowing a subscriber to index
+    ///   into a list of subscriptions without having to allocate additional objects.
+    /// </remarks>
+    [Unstable]
+    public interface IStyleActivator : IDisposable
+    {
+        /// <summary>
+        /// Subscribes to the activator.
+        /// </summary>
+        /// <param name="sink">The listener.</param>
+        /// <param name="tag">An optional tag.</param>
+        void Subscribe(IStyleActivatorSink sink, int tag = 0);
+
+        /// <summary>
+        /// Unsubscribes from the activator.
+        /// </summary>
+        void Unsubscribe(IStyleActivatorSink sink);
+    }
+}
diff --git a/src/Avalonia.Base/Styling/Activators/IStyleActivatorSink.cs b/src/Avalonia.Base/Styling/Activators/IStyleActivatorSink.cs
new file mode 100644
index 0000000000..fbb18dc304
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Activators/IStyleActivatorSink.cs
@@ -0,0 +1,18 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling.Activators
+{
+    /// <summary>
+    /// Receives notifications from an <see cref="IStyleActivator"/>.
+    /// </summary>
+    [Unstable]
+    public interface IStyleActivatorSink
+    {
+        /// <summary>
+        /// Called when the subscribed activator value changes.
+        /// </summary>
+        /// <param name="value">The new value.</param>
+        /// <param name="tag">The subscription tag.</param>
+        void OnNext(bool value, int tag);
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/Activators/NotActivator.cs b/src/Avalonia.Base/Styling/Activators/NotActivator.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/NotActivator.cs
rename to src/Avalonia.Base/Styling/Activators/NotActivator.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/NthChildActivator.cs b/src/Avalonia.Base/Styling/Activators/NthChildActivator.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/NthChildActivator.cs
rename to src/Avalonia.Base/Styling/Activators/NthChildActivator.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/OrActivator.cs b/src/Avalonia.Base/Styling/Activators/OrActivator.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/OrActivator.cs
rename to src/Avalonia.Base/Styling/Activators/OrActivator.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/OrActivatorBuilder.cs b/src/Avalonia.Base/Styling/Activators/OrActivatorBuilder.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/OrActivatorBuilder.cs
rename to src/Avalonia.Base/Styling/Activators/OrActivatorBuilder.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/PropertyEqualsActivator.cs b/src/Avalonia.Base/Styling/Activators/PropertyEqualsActivator.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/PropertyEqualsActivator.cs
rename to src/Avalonia.Base/Styling/Activators/PropertyEqualsActivator.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/StyleActivatorBase.cs b/src/Avalonia.Base/Styling/Activators/StyleActivatorBase.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/StyleActivatorBase.cs
rename to src/Avalonia.Base/Styling/Activators/StyleActivatorBase.cs
diff --git a/src/Avalonia.Styling/Styling/Activators/StyleClassActivator.cs b/src/Avalonia.Base/Styling/Activators/StyleClassActivator.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Activators/StyleClassActivator.cs
rename to src/Avalonia.Base/Styling/Activators/StyleClassActivator.cs
diff --git a/src/Avalonia.Base/Styling/ChildSelector.cs b/src/Avalonia.Base/Styling/ChildSelector.cs
new file mode 100644
index 0000000000..34f3a76b61
--- /dev/null
+++ b/src/Avalonia.Base/Styling/ChildSelector.cs
@@ -0,0 +1,70 @@
+using System;
+using Avalonia.LogicalTree;
+
+namespace Avalonia.Styling
+{
+    internal class ChildSelector : Selector
+    {
+        private readonly Selector _parent;
+        private string? _selectorString;
+
+        public ChildSelector(Selector parent)
+        {
+            if (parent == null)
+            {
+                throw new InvalidOperationException("Child selector must be preceeded by a selector.");
+            }
+
+            _parent = parent;
+        }
+
+        /// <inheritdoc/>
+        public override bool InTemplate => _parent.InTemplate;
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => true;
+
+        /// <inheritdoc/>
+        public override Type? TargetType => null;
+
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                _selectorString = _parent.ToString() + " > ";
+            }
+
+            return _selectorString;
+        }
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            var controlParent = ((ILogical)control).LogicalParent;
+
+            if (controlParent != null)
+            {
+                var parentMatch = _parent.Match((IStyleable)controlParent, parent, subscribe);
+
+                if (parentMatch.Result == SelectorMatchResult.Sometimes)
+                {
+                    return parentMatch;
+                }
+                else if (parentMatch.IsMatch)
+                {
+                    return SelectorMatch.AlwaysThisInstance;
+                }
+                else
+                {
+                    return SelectorMatch.NeverThisInstance;
+                }
+            }
+            else
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+        }
+
+        protected override Selector? MovePrevious() => null;
+        internal override bool HasValidNestingSelector() => _parent.HasValidNestingSelector();
+    }
+}
diff --git a/src/Avalonia.Base/Styling/DescendentSelector.cs b/src/Avalonia.Base/Styling/DescendentSelector.cs
new file mode 100644
index 0000000000..4ffaff6861
--- /dev/null
+++ b/src/Avalonia.Base/Styling/DescendentSelector.cs
@@ -0,0 +1,75 @@
+using System;
+using Avalonia.LogicalTree;
+using Avalonia.Styling.Activators;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    internal class DescendantSelector : Selector
+    {
+        private readonly Selector _parent;
+        private string? _selectorString;
+
+        public DescendantSelector(Selector? parent)
+        {
+            _parent = parent ?? throw new InvalidOperationException("Descendant selector must be preceeded by a selector.");
+        }
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => true;
+
+        /// <inheritdoc/>
+        public override bool InTemplate => _parent.InTemplate;
+
+        /// <inheritdoc/>
+        public override Type? TargetType => null;
+
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                _selectorString = _parent.ToString() + ' ';
+            }
+
+            return _selectorString;
+        }
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            var c = (ILogical)control;
+            var descendantMatches = new OrActivatorBuilder();
+
+            while (c != null)
+            {
+                c = c.LogicalParent;
+
+                if (c is IStyleable)
+                {
+                    var match = _parent.Match((IStyleable)c, parent, subscribe);
+
+                    if (match.Result == SelectorMatchResult.Sometimes)
+                    {
+                        descendantMatches.Add(match.Activator);
+                    }
+                    else if (match.IsMatch)
+                    {
+                        return SelectorMatch.AlwaysThisInstance;
+                    }
+                }
+            }
+
+            if (descendantMatches.Count > 0)
+            {
+                return new SelectorMatch(descendantMatches.Get());
+            }
+            else
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+        }
+
+        protected override Selector? MovePrevious() => null;
+        internal override bool HasValidNestingSelector() => _parent.HasValidNestingSelector();
+    }
+}
diff --git a/src/Avalonia.Base/Styling/IGlobalStyles.cs b/src/Avalonia.Base/Styling/IGlobalStyles.cs
new file mode 100644
index 0000000000..f9667a8895
--- /dev/null
+++ b/src/Avalonia.Base/Styling/IGlobalStyles.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Defines the style host that provides styles global to the application.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IGlobalStyles : IStyleHost
+    {
+        /// <summary>
+        /// Raised when styles are added to <see cref="Styles"/> or a nested styles collection.
+        /// </summary>
+        public event Action<IReadOnlyList<IStyle>>? GlobalStylesAdded;
+
+        /// <summary>
+        /// Raised when styles are removed from <see cref="Styles"/> or a nested styles collection.
+        /// </summary>
+        public event Action<IReadOnlyList<IStyle>>? GlobalStylesRemoved;
+    }
+}
diff --git a/src/Avalonia.Base/Styling/ISetter.cs b/src/Avalonia.Base/Styling/ISetter.cs
new file mode 100644
index 0000000000..71ae5d84c0
--- /dev/null
+++ b/src/Avalonia.Base/Styling/ISetter.cs
@@ -0,0 +1,24 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Represents a setter for a <see cref="Style"/>.
+    /// </summary>
+    [NotClientImplementable]
+    public interface ISetter
+    {
+        /// <summary>
+        /// Instances a setter on a control.
+        /// </summary>
+        /// <param name="target">The control.</param>
+        /// <returns>An <see cref="ISetterInstance"/>.</returns>
+        /// <remarks>
+        /// This method should return an <see cref="ISetterInstance"/> which can be used to apply
+        /// the setter to the specified control. Note that it should not apply the setter value 
+        /// until <see cref="ISetterInstance.Start(bool)"/> is called.
+        /// </remarks>
+        ISetterInstance Instance(IStyleable target);
+    }
+}
diff --git a/src/Avalonia.Base/Styling/ISetterInstance.cs b/src/Avalonia.Base/Styling/ISetterInstance.cs
new file mode 100644
index 0000000000..e0d3137619
--- /dev/null
+++ b/src/Avalonia.Base/Styling/ISetterInstance.cs
@@ -0,0 +1,40 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Represents a setter that has been instanced on a control.
+    /// </summary>
+    [Unstable]
+    public interface ISetterInstance : IDisposable
+    {
+        /// <summary>
+        /// Starts the setter instance.
+        /// </summary>
+        /// <param name="hasActivator">Whether the parent style has an activator.</param>
+        /// <remarks>
+        /// If <paramref name="hasActivator"/> is false then the setter should be immediately
+        /// applied and <see cref="Activate"/> and <see cref="Deactivate"/> should not be called.
+        /// If true, then bindings etc should be initiated but not produce a value until
+        /// <see cref="Activate"/> called.
+        /// </remarks>
+        public void Start(bool hasActivator);
+
+        /// <summary>
+        /// Activates the setter.
+        /// </summary>
+        /// <remarks>
+        /// Should only be called if hasActivator was true when <see cref="Start(bool)"/> was called.
+        /// </remarks>
+        public void Activate();
+
+        /// <summary>
+        /// Deactivates the setter.
+        /// </summary>
+        /// <remarks>
+        /// Should only be called if hasActivator was true when <see cref="Start(bool)"/> was called.
+        /// </remarks>
+        public void Deactivate();
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/ISetterValue.cs b/src/Avalonia.Base/Styling/ISetterValue.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/ISetterValue.cs
rename to src/Avalonia.Base/Styling/ISetterValue.cs
diff --git a/src/Avalonia.Base/Styling/IStyle.cs b/src/Avalonia.Base/Styling/IStyle.cs
new file mode 100644
index 0000000000..e9faf82c07
--- /dev/null
+++ b/src/Avalonia.Base/Styling/IStyle.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Defines the interface for styles.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IStyle : IResourceNode
+    {
+        /// <summary>
+        /// Gets a collection of child styles.
+        /// </summary>
+        IReadOnlyList<IStyle> Children { get; }
+
+        /// <summary>
+        /// Attaches the style and any child styles to a control if the style's selector matches.
+        /// </summary>
+        /// <param name="target">The control to attach to.</param>
+        /// <param name="host">The element that hosts the style.</param>
+        /// <returns>
+        /// A <see cref="SelectorMatchResult"/> describing how the style matches the control.
+        /// </returns>
+        SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host);
+    }
+}
diff --git a/src/Avalonia.Base/Styling/IStyleHost.cs b/src/Avalonia.Base/Styling/IStyleHost.cs
new file mode 100644
index 0000000000..2ae488825c
--- /dev/null
+++ b/src/Avalonia.Base/Styling/IStyleHost.cs
@@ -0,0 +1,46 @@
+
+using System.Collections.Generic;
+using Avalonia.Metadata;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Defines an element that has a <see cref="Styles"/> collection.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IStyleHost
+    {
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Styles"/> is initialized.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="Styles"/> property may be lazily initialized, if so this property
+        /// indicates whether it has been initialized.
+        /// </remarks>
+        bool IsStylesInitialized { get; }
+
+        /// <summary>
+        /// Gets the styles for the element.
+        /// </summary>
+        Styles Styles { get; }
+
+        /// <summary>
+        /// Gets the parent style host element.
+        /// </summary>
+        IStyleHost? StylingParent { get; }
+
+        /// <summary>
+        /// Called when styles are added to <see cref="Styles"/> or a nested styles collection.
+        /// </summary>
+        /// <param name="styles">The added styles.</param>
+        void StylesAdded(IReadOnlyList<IStyle> styles);
+
+        /// <summary>
+        /// Called when styles are removed from <see cref="Styles"/> or a nested styles collection.
+        /// </summary>
+        /// <param name="styles">The removed styles.</param>
+        void StylesRemoved(IReadOnlyList<IStyle> styles);
+    }
+}
diff --git a/src/Avalonia.Base/Styling/IStyleInstance.cs b/src/Avalonia.Base/Styling/IStyleInstance.cs
new file mode 100644
index 0000000000..262f336e05
--- /dev/null
+++ b/src/Avalonia.Base/Styling/IStyleInstance.cs
@@ -0,0 +1,32 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Represents a style that has been instanced on a control.
+    /// </summary>
+    [Unstable]
+    public interface IStyleInstance : IDisposable
+    {
+        /// <summary>
+        /// Gets the source style.
+        /// </summary>
+        IStyle Source { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this style has an activator.
+        /// </summary>
+        bool HasActivator { get; }
+        
+        /// <summary>
+        /// Gets a value indicating whether this style is active.
+        /// </summary>
+        bool IsActive { get; }
+
+        /// <summary>
+        /// Instructs the style to start acting upon the control.
+        /// </summary>
+        void Start();
+    }
+}
diff --git a/src/Avalonia.Base/Styling/IStyleable.cs b/src/Avalonia.Base/Styling/IStyleable.cs
new file mode 100644
index 0000000000..5bc972e7ab
--- /dev/null
+++ b/src/Avalonia.Base/Styling/IStyleable.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Collections;
+using Avalonia.Metadata;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Interface for styleable elements.
+    /// </summary>
+    [NotClientImplementable]
+    public interface IStyleable : IAvaloniaObject, INamed
+    {
+        /// <summary>
+        /// Gets the list of classes for the control.
+        /// </summary>
+        IAvaloniaReadOnlyList<string> Classes { get; }
+
+        /// <summary>
+        /// Gets the type by which the control is styled.
+        /// </summary>
+        Type StyleKey { get; }
+
+        /// <summary>
+        /// Gets the template parent of this element if the control comes from a template.
+        /// </summary>
+        ITemplatedControl? TemplatedParent { get; }
+
+        /// <summary>
+        /// Notifies the element that a style has been applied.
+        /// </summary>
+        /// <param name="instance">The style instance.</param>
+        void StyleApplied(IStyleInstance instance);
+
+        /// <summary>
+        /// Detaches all styles applied to the element.
+        /// </summary>
+        void DetachStyles();
+
+        /// <summary>
+        /// Detaches a collection of styles, if applied to the element.
+        /// </summary>
+        void DetachStyles(IReadOnlyList<IStyle> styles);
+
+        /// <summary>
+        /// Detaches all styles from the element and queues a restyle.
+        /// </summary>
+        void InvalidateStyles();
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/IStyler.cs b/src/Avalonia.Base/Styling/IStyler.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/IStyler.cs
rename to src/Avalonia.Base/Styling/IStyler.cs
diff --git a/src/Avalonia.Styling/Styling/ITemplate.cs b/src/Avalonia.Base/Styling/ITemplate.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/ITemplate.cs
rename to src/Avalonia.Base/Styling/ITemplate.cs
diff --git a/src/Avalonia.Base/Styling/ITemplatedControl.cs b/src/Avalonia.Base/Styling/ITemplatedControl.cs
new file mode 100644
index 0000000000..68989c8a5e
--- /dev/null
+++ b/src/Avalonia.Base/Styling/ITemplatedControl.cs
@@ -0,0 +1,9 @@
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    [NotClientImplementable]
+    public interface ITemplatedControl : IAvaloniaObject
+    {
+    }
+}
diff --git a/src/Avalonia.Base/Styling/NestingSelector.cs b/src/Avalonia.Base/Styling/NestingSelector.cs
new file mode 100644
index 0000000000..481a937867
--- /dev/null
+++ b/src/Avalonia.Base/Styling/NestingSelector.cs
@@ -0,0 +1,30 @@
+using System;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// The `^` nesting style selector.
+    /// </summary>
+    internal class NestingSelector : Selector
+    {
+        public override bool InTemplate => false;
+        public override bool IsCombinator => false;
+        public override Type? TargetType => null;
+
+        public override string ToString() => "^";
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            if (parent is Style s && s.Selector is Selector selector)
+            {
+                return selector.Match(control, (parent as Style)?.Parent, subscribe);
+            }
+
+            throw new InvalidOperationException(
+                "Nesting selector was specified but cannot determine parent selector.");
+        }
+
+        protected override Selector? MovePrevious() => null;
+        internal override bool HasValidNestingSelector() => true;
+    }
+}
diff --git a/src/Avalonia.Base/Styling/NotSelector.cs b/src/Avalonia.Base/Styling/NotSelector.cs
new file mode 100644
index 0000000000..cdc3254d38
--- /dev/null
+++ b/src/Avalonia.Base/Styling/NotSelector.cs
@@ -0,0 +1,72 @@
+using System;
+using Avalonia.Styling.Activators;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// The `:not()` style selector.
+    /// </summary>
+    internal class NotSelector : Selector
+    {
+        private readonly Selector? _previous;
+        private readonly Selector _argument;
+        private string? _selectorString;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NotSelector"/> class.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="argument">The selector to be not-ed.</param>
+        public NotSelector(Selector? previous, Selector argument)
+        {
+            _previous = previous;
+            _argument = argument ?? throw new InvalidOperationException("Not selector must have a selector argument.");
+        }
+
+        /// <inheritdoc/>
+        public override bool InTemplate => _argument.InTemplate;
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => false;
+
+        /// <inheritdoc/>
+        public override Type? TargetType => _previous?.TargetType;
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                _selectorString = $"{_previous?.ToString()}:not({_argument})";
+            }
+
+            return _selectorString;
+        }
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            var innerResult = _argument.Match(control, parent, subscribe);
+
+            switch (innerResult.Result)
+            {
+                case SelectorMatchResult.AlwaysThisInstance:
+                    return SelectorMatch.NeverThisInstance;
+                case SelectorMatchResult.AlwaysThisType:
+                    return SelectorMatch.NeverThisType;
+                case SelectorMatchResult.NeverThisInstance:
+                    return SelectorMatch.AlwaysThisInstance;
+                case SelectorMatchResult.NeverThisType:
+                    return SelectorMatch.AlwaysThisType;
+                case SelectorMatchResult.Sometimes:
+                    return new SelectorMatch(new NotActivator(innerResult.Activator!));
+                default:
+                    throw new InvalidOperationException("Invalid SelectorMatchResult.");
+            }
+        }
+
+        protected override Selector? MovePrevious() => _previous;
+        internal override bool HasValidNestingSelector() => _argument.HasValidNestingSelector();
+    }
+}
diff --git a/src/Avalonia.Base/Styling/NthChildSelector.cs b/src/Avalonia.Base/Styling/NthChildSelector.cs
new file mode 100644
index 0000000000..047bf434da
--- /dev/null
+++ b/src/Avalonia.Base/Styling/NthChildSelector.cs
@@ -0,0 +1,146 @@
+#nullable enable
+using System;
+using System.Text;
+using Avalonia.LogicalTree;
+using Avalonia.Styling.Activators;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// The :nth-child() pseudo-class matches elements based on their position in a group of siblings.
+    /// </summary>
+    /// <remarks>
+    /// Element indices are 1-based.
+    /// </remarks>
+    public class NthChildSelector : Selector
+    {
+        private const string NthChildSelectorName = "nth-child";
+        private const string NthLastChildSelectorName = "nth-last-child";
+        private readonly Selector? _previous;
+        private readonly bool _reversed;
+
+        internal protected NthChildSelector(Selector? previous, int step, int offset, bool reversed)
+        {
+            _previous = previous;
+            Step = step;
+            Offset = offset;
+            _reversed = reversed;
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="NthChildSelector"/>
+        /// </summary>
+        /// <param name="previous">Previous selector.</param>
+        /// <param name="step">Position step.</param>
+        /// <param name="offset">Initial index offset.</param>
+        public NthChildSelector(Selector? previous, int step, int offset)
+            : this(previous, step, offset, false)
+        {
+
+        }
+
+        public override bool InTemplate => _previous?.InTemplate ?? false;
+
+        public override bool IsCombinator => false;
+
+        public override Type? TargetType => _previous?.TargetType;
+
+        public int Step { get; }
+        public int Offset { get; }
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            if (!(control is ILogical logical))
+            {
+                return SelectorMatch.NeverThisType;
+            }
+
+            var controlParent = logical.LogicalParent;
+
+            if (controlParent is IChildIndexProvider childIndexProvider)
+            {
+                return subscribe
+                    ? new SelectorMatch(new NthChildActivator(logical, childIndexProvider, Step, Offset, _reversed))
+                    : Evaluate(logical, childIndexProvider, Step, Offset, _reversed);
+            }
+            else
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+        }
+
+        internal static SelectorMatch Evaluate(
+            ILogical logical, IChildIndexProvider childIndexProvider,
+            int step, int offset, bool reversed)
+        {
+            var index = childIndexProvider.GetChildIndex(logical);
+            if (index < 0)
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+
+            if (reversed)
+            {
+                if (childIndexProvider.TryGetTotalCount(out var totalCountValue))
+                {
+                    index = totalCountValue - index;
+                }
+                else
+                {
+                    return SelectorMatch.NeverThisInstance;
+                }
+            }
+            else
+            {
+                // nth child index is 1-based
+                index += 1;
+            }
+
+            var n = Math.Sign(step);
+
+            var diff = index - offset;
+            var match = diff == 0 || (Math.Sign(diff) == n && diff % step == 0);
+
+            return match ? SelectorMatch.AlwaysThisInstance : SelectorMatch.NeverThisInstance;
+        }
+
+        protected override Selector? MovePrevious() => _previous;
+        internal override bool HasValidNestingSelector() => _previous?.HasValidNestingSelector() ?? false;
+
+        public override string ToString()
+        {
+            var expectedCapacity = NthLastChildSelectorName.Length + 8;
+            var stringBuilder = new StringBuilder(_previous?.ToString(), expectedCapacity);
+            
+            stringBuilder.Append(':');
+            stringBuilder.Append(_reversed ? NthLastChildSelectorName : NthChildSelectorName);
+            stringBuilder.Append('(');
+
+            var hasStep = false;
+            if (Step != 0)
+            {
+                hasStep = true;
+                stringBuilder.Append(Step);
+                stringBuilder.Append('n');
+            }
+
+            if (Offset > 0)
+            {
+                if (hasStep)
+                {
+                    stringBuilder.Append('+');
+                }
+                stringBuilder.Append(Offset);
+            }
+            else if (Offset < 0)
+            {
+                stringBuilder.Append('-');
+                stringBuilder.Append(-Offset);
+            }
+
+            stringBuilder.Append(')');
+
+            return stringBuilder.ToString();
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/NthLastChildSelector.cs b/src/Avalonia.Base/Styling/NthLastChildSelector.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/NthLastChildSelector.cs
rename to src/Avalonia.Base/Styling/NthLastChildSelector.cs
diff --git a/src/Avalonia.Base/Styling/OrSelector.cs b/src/Avalonia.Base/Styling/OrSelector.cs
new file mode 100644
index 0000000000..913c27bf0c
--- /dev/null
+++ b/src/Avalonia.Base/Styling/OrSelector.cs
@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Styling.Activators;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// The OR style selector.
+    /// </summary>
+    internal class OrSelector : Selector
+    {
+        private readonly IReadOnlyList<Selector> _selectors;
+        private string? _selectorString;
+        private Type? _targetType;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrSelector"/> class.
+        /// </summary>
+        /// <param name="selectors">The selectors to OR.</param>
+        public OrSelector(IReadOnlyList<Selector> selectors)
+        {
+            if (selectors is null)
+            {
+                throw new ArgumentNullException(nameof(selectors));
+            }
+
+            if (selectors.Count <= 1)
+            {
+                throw new ArgumentException("Need more than one selector to OR.");
+            }
+
+            _selectors = selectors;
+        }
+
+        /// <inheritdoc/>
+        public override bool InTemplate => false;
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => false;
+
+        /// <inheritdoc/>
+        public override Type? TargetType
+        {
+            get
+            {
+                if (_targetType == null)
+                {
+                    _targetType = EvaluateTargetType();
+                }
+
+                return _targetType;
+            }
+        }
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                _selectorString = string.Join(", ", _selectors);
+            }
+
+            return _selectorString;
+        }
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            var activators = new OrActivatorBuilder();
+            var neverThisInstance = false;
+
+            foreach (var selector in _selectors)
+            {
+                var match = selector.Match(control, parent, subscribe);
+
+                switch (match.Result)
+                {
+                    case SelectorMatchResult.AlwaysThisType:
+                    case SelectorMatchResult.AlwaysThisInstance:
+                        return match;
+                    case SelectorMatchResult.NeverThisInstance:
+                        neverThisInstance = true;
+                        break;
+                    case SelectorMatchResult.Sometimes:
+                        activators.Add(match.Activator!);
+                        break;
+                }
+            }
+
+            if (activators.Count > 0)
+            {
+                return new SelectorMatch(activators.Get());
+            }
+            else if (neverThisInstance)
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+            else
+            {
+                return SelectorMatch.NeverThisType;
+            }
+        }
+
+        protected override Selector? MovePrevious() => null;
+
+        internal override bool HasValidNestingSelector()
+        {
+            foreach (var selector in _selectors)
+            {
+                if (!selector.HasValidNestingSelector())
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private Type? EvaluateTargetType()
+        {
+            Type? result = null;
+
+            foreach (var selector in _selectors)
+            {
+                if (selector.TargetType == null)
+                {
+                    return null;
+                }
+                else if (result == null)
+                {
+                    result = selector.TargetType;
+                }
+                else
+                {
+                    while (result is not null && !result.IsAssignableFrom(selector.TargetType))
+                    {
+                        result = result.BaseType;
+                    }
+                }
+            }
+
+            return result;
+        }
+    }
+}
+
diff --git a/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
new file mode 100644
index 0000000000..7a37daf087
--- /dev/null
+++ b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
@@ -0,0 +1,119 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using Avalonia.Styling.Activators;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A selector that matches the common case of a type and/or name followed by a collection of
+    /// style classes and pseudoclasses.
+    /// </summary>
+    internal class PropertyEqualsSelector : Selector
+    {
+        private readonly Selector? _previous;
+        private readonly AvaloniaProperty _property;
+        private readonly object? _value;
+        private string? _selectorString;
+
+        public PropertyEqualsSelector(Selector? previous, AvaloniaProperty property, object? value)
+        {
+            property = property ?? throw new ArgumentNullException(nameof(property));
+
+            _previous = previous;
+            _property = property;
+            _value = value;
+        }
+
+        /// <inheritdoc/>
+        public override bool InTemplate => _previous?.InTemplate ?? false;
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => false;
+
+        /// <inheritdoc/>
+        public override Type? TargetType => _previous?.TargetType;
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                var builder = new StringBuilder();
+
+                if (_previous != null)
+                {
+                    builder.Append(_previous.ToString());
+                }
+
+                builder.Append('[');
+
+                if (_property.IsAttached)
+                {
+                    builder.Append('(');
+                    builder.Append(_property.OwnerType.Name);
+                    builder.Append('.');
+                }
+
+                builder.Append(_property.Name);
+                if (_property.IsAttached)
+                {
+                    builder.Append(')');
+                }
+                builder.Append('=');
+                builder.Append(_value ?? string.Empty);
+                builder.Append(']');
+
+                _selectorString = builder.ToString();
+            }
+
+            return _selectorString;
+        }
+
+        /// <inheritdoc/>
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            if (subscribe)
+            {
+                return new SelectorMatch(new PropertyEqualsActivator(control, _property, _value));
+            }
+            else
+            {
+                return Compare(_property.PropertyType, control.GetValue(_property), _value)
+                    ? SelectorMatch.AlwaysThisInstance
+                    : SelectorMatch.NeverThisInstance;
+            }
+            
+        }
+
+        protected override Selector? MovePrevious() => _previous;
+        internal override bool HasValidNestingSelector() => _previous?.HasValidNestingSelector() ?? false;
+
+        internal static bool Compare(Type propertyType, object? propertyValue, object? value)
+        {
+            if (propertyType == typeof(object) &&
+                propertyValue?.GetType() is Type inferredType)
+            {
+                propertyType = inferredType;
+            }
+
+            var valueType = value?.GetType();
+
+            if (valueType is null || propertyType.IsAssignableFrom(valueType))
+            {
+                return Equals(propertyValue, value);
+            }
+
+            var converter = TypeDescriptor.GetConverter(propertyType);
+            if (converter?.CanConvertFrom(valueType) == true)
+            {
+                return Equals(propertyValue, converter.ConvertFrom(null, CultureInfo.InvariantCulture, value!));
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/PropertySetterBindingInstance.cs b/src/Avalonia.Base/Styling/PropertySetterBindingInstance.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/PropertySetterBindingInstance.cs
rename to src/Avalonia.Base/Styling/PropertySetterBindingInstance.cs
diff --git a/src/Avalonia.Base/Styling/PropertySetterInstance.cs b/src/Avalonia.Base/Styling/PropertySetterInstance.cs
new file mode 100644
index 0000000000..c4e8f47e67
--- /dev/null
+++ b/src/Avalonia.Base/Styling/PropertySetterInstance.cs
@@ -0,0 +1,120 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Reactive;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A <see cref="Setter"/> which has been instanced on a control.
+    /// </summary>
+    /// <typeparam name="T">The target property type.</typeparam>
+    internal class PropertySetterInstance<T> : SingleSubscriberObservableBase<BindingValue<T>>,
+        ISetterInstance
+    {
+        private readonly IStyleable _target;
+        private readonly StyledPropertyBase<T>? _styledProperty;
+        private readonly DirectPropertyBase<T>? _directProperty;
+        private readonly T _value;
+        private IDisposable? _subscription;
+        private bool _isActive;
+
+        public PropertySetterInstance(
+            IStyleable target,
+            StyledPropertyBase<T> property,
+            T value)
+        {
+            _target = target;
+            _styledProperty = property;
+            _value = value;
+        }
+
+        public PropertySetterInstance(
+            IStyleable target,
+            DirectPropertyBase<T> property,
+            T value)
+        {
+            _target = target;
+            _directProperty = property;
+            _value = value;
+        }
+
+        public void Start(bool hasActivator)
+        {
+            if (hasActivator)
+            {
+                if (_styledProperty is not null)
+                {
+                    _subscription = _target.Bind(_styledProperty, this, BindingPriority.StyleTrigger);
+                }
+                else
+                {
+                    _subscription = _target.Bind(_directProperty!, this);
+                }
+            }
+            else
+            {
+                var target = (AvaloniaObject) _target;
+                
+                if (_styledProperty is not null)
+                {
+                    _subscription = target.SetValue(_styledProperty!, _value, BindingPriority.Style);
+                }
+                else
+                {
+                    target.SetValue(_directProperty!, _value);
+                }
+            }
+        }
+
+        public void Activate()
+        {
+            if (!_isActive)
+            {
+                _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.Base/Styling/PropertySetterTemplateInstance.cs b/src/Avalonia.Base/Styling/PropertySetterTemplateInstance.cs
new file mode 100644
index 0000000000..0f6efef1be
--- /dev/null
+++ b/src/Avalonia.Base/Styling/PropertySetterTemplateInstance.cs
@@ -0,0 +1,127 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Reactive;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A <see cref="Setter"/> which has been instanced on a control and whose value is lazily
+    /// evaluated.
+    /// </summary>
+    /// <typeparam name="T">The target property type.</typeparam>
+    internal class PropertySetterTemplateInstance<T> : SingleSubscriberObservableBase<BindingValue<T>>,
+        ISetterInstance
+    {
+        private readonly IStyleable _target;
+        private readonly StyledPropertyBase<T>? _styledProperty;
+        private readonly DirectPropertyBase<T>? _directProperty;
+        private readonly ITemplate _template;
+        private BindingValue<T> _value;
+        private IDisposable? _subscription;
+        private bool _isActive;
+
+        public PropertySetterTemplateInstance(
+            IStyleable target,
+            StyledPropertyBase<T> property,
+            ITemplate template)
+        {
+            _target = target;
+            _styledProperty = property;
+            _template = template;
+        }
+
+        public PropertySetterTemplateInstance(
+            IStyleable target,
+            DirectPropertyBase<T> property,
+            ITemplate template)
+        {
+            _target = target;
+            _directProperty = property;
+            _template = template;
+        }
+
+        public void Start(bool hasActivator)
+        {
+            _isActive = !hasActivator;
+
+            if (_styledProperty is not null)
+            {
+                var priority = hasActivator ? BindingPriority.StyleTrigger : BindingPriority.Style;
+                _subscription = _target.Bind(_styledProperty, this, priority);
+            }
+            else
+            {
+                _subscription = _target.Bind(_directProperty!, this);
+            }
+        }
+
+        public void Activate()
+        {
+            if (!_isActive)
+            {
+                _isActive = true;
+                PublishNext();
+            }
+        }
+
+        public void Deactivate()
+        {
+            if (_isActive)
+            {
+                _isActive = false;
+                PublishNext();
+            }
+        }
+
+        public override void Dispose()
+        {
+            if (_subscription is not null)
+            {
+                var sub = _subscription;
+                _subscription = null;
+                sub.Dispose();
+            }
+            else if (_isActive)
+            {
+                if (_styledProperty is not null)
+                {
+                    _target.ClearValue(_styledProperty);
+                }
+                else
+                {
+                    _target.ClearValue(_directProperty!);
+                }
+            }
+
+            base.Dispose();
+        }
+
+        protected override void Subscribed() => PublishNext();
+        protected override void Unsubscribed() { }
+
+        private void EnsureTemplate()
+        {
+            if (_value.HasValue)
+            {
+                return;
+            }
+
+            _value = (T) _template.Build();
+        }
+
+        private void PublishNext()
+        {
+            if (_isActive)
+            {
+                EnsureTemplate();
+                PublishNext(_value);
+            }
+            else
+            {
+                PublishNext(default);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/Selector.cs b/src/Avalonia.Base/Styling/Selector.cs
new file mode 100644
index 0000000000..1e06f3d375
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Selector.cs
@@ -0,0 +1,152 @@
+using System;
+using Avalonia.Styling.Activators;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A selector in a <see cref="Style"/>.
+    /// </summary>
+    public abstract class Selector
+    {
+        /// <summary>
+        /// Gets a value indicating whether either this selector or a previous selector has moved
+        /// into a template.
+        /// </summary>
+        public abstract bool InTemplate { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this selector is a combinator.
+        /// </summary>
+        /// <remarks>
+        /// A combinator is a selector such as Child or Descendent which links simple selectors.
+        /// </remarks>
+        public abstract bool IsCombinator { get; }
+
+        /// <summary>
+        /// Gets the target type of the selector, if available.
+        /// </summary>
+        public abstract Type? TargetType { get; }
+
+        /// <summary>
+        /// Tries to match the selector with a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="parent">
+        /// The parent style, if the style containing the selector is a nested style.
+        /// </param>
+        /// <param name="subscribe">
+        /// Whether the match should subscribe to changes in order to track the match over time,
+        /// or simply return an immediate result.
+        /// </param>
+        /// <returns>A <see cref="SelectorMatch"/>.</returns>
+        public SelectorMatch Match(IStyleable control, IStyle? parent = null, bool subscribe = true)
+        {
+            // First match the selector until a combinator is found. Selectors are stored from 
+            // right-to-left, so MatchUntilCombinator reverses this order because the type selector
+            // will be on the left.
+            var match = MatchUntilCombinator(control, this, parent, subscribe, out var combinator);
+            
+            // If the pre-combinator selector matches, we can now match the combinator, if any.
+            if (match.IsMatch && combinator is object)
+            {
+                match = match.And(combinator.Match(control, parent, subscribe));
+
+                // If we have a combinator then we can never say that we always match a control of
+                // this type, because by definition the combinator matches on things outside of the
+                // control.
+                match = match.Result switch
+                {
+                    SelectorMatchResult.AlwaysThisType => SelectorMatch.AlwaysThisInstance,
+                    SelectorMatchResult.NeverThisType => SelectorMatch.NeverThisInstance,
+                    _ => match
+                };
+            }
+
+            return match;
+        }
+
+        /// <summary>
+        /// Evaluates the selector for a match.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="parent">
+        /// The parent style, if the style containing the selector is a nested style.
+        /// </param>
+        /// <param name="subscribe">
+        /// Whether the match should subscribe to changes in order to track the match over time,
+        /// or simply return an immediate result.
+        /// </param>
+        /// <returns>A <see cref="SelectorMatch"/>.</returns>
+        protected abstract SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe);
+
+        /// <summary>
+        /// Moves to the previous selector.
+        /// </summary>
+        protected abstract Selector? MovePrevious();
+
+        internal abstract bool HasValidNestingSelector();
+
+        private static SelectorMatch MatchUntilCombinator(
+            IStyleable control,
+            Selector start,
+            IStyle? parent,
+            bool subscribe,
+            out Selector? combinator)
+        {
+            combinator = null;
+
+            var activators = new AndActivatorBuilder();
+            var result = Match(control, start, parent, subscribe, ref activators, ref combinator);
+
+            return result == SelectorMatchResult.Sometimes ?
+                new SelectorMatch(activators.Get()) :
+                new SelectorMatch(result);
+        }
+
+        private static SelectorMatchResult Match(
+            IStyleable control,
+            Selector selector,
+            IStyle? parent,
+            bool subscribe,
+            ref AndActivatorBuilder activators,
+            ref Selector? combinator)
+        {
+            var previous = selector.MovePrevious();
+
+            // Selectors are stored from right-to-left, so we recurse into the selector in order to
+            // reverse this order, because the type selector will be on the left and is our best
+            // opportunity to exit early.
+            if (previous != null && !previous.IsCombinator)
+            {
+                var previousMatch = Match(control, previous, parent, subscribe, ref activators, ref combinator);
+
+                if (previousMatch < SelectorMatchResult.Sometimes)
+                {
+                    return previousMatch;
+                }
+            }
+
+            // Match this selector.
+            var match = selector.Evaluate(control, parent, subscribe);
+
+            if (!match.IsMatch)
+            {
+                combinator = null;
+                return match.Result;
+            }
+            else if (match.Activator is object)
+            {
+                activators.Add(match.Activator!);
+            }
+
+            if (previous?.IsCombinator == true)
+            {
+                combinator = previous;
+            }
+
+            return match.Result;
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/SelectorMatch.cs b/src/Avalonia.Base/Styling/SelectorMatch.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/SelectorMatch.cs
rename to src/Avalonia.Base/Styling/SelectorMatch.cs
diff --git a/src/Avalonia.Base/Styling/Selectors.cs b/src/Avalonia.Base/Styling/Selectors.cs
new file mode 100644
index 0000000000..476d86cd11
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Selectors.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Extension methods for <see cref="Selector"/>.
+    /// </summary>
+    public static class Selectors
+    {
+        /// <summary>
+        /// Returns a selector which matches a previous selector's child.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Child(this Selector previous)
+        {
+            return new ChildSelector(previous);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a control's style class.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="name">The name of the style class.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Class(this Selector? previous, string name)
+        {
+            _ = name ?? throw new ArgumentNullException(nameof(name));
+
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                throw new ArgumentException("Name may not be empty", nameof(name));
+            }
+
+            var tac = previous as TypeNameAndClassSelector;
+
+            if (tac != null)
+            {
+                tac.Classes.Add(name);
+                return tac;
+            }
+            else
+            {
+                return TypeNameAndClassSelector.ForClass(previous, name);
+            }
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a descendant of a previous selector.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Descendant(this Selector? previous)
+        {
+            return new DescendantSelector(previous);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a type or a derived type.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="type">The type.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Is(this Selector? previous, Type type)
+        {
+            _ = type ?? throw new ArgumentNullException(nameof(type));
+
+            return TypeNameAndClassSelector.Is(previous, type);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a type or a derived type.
+        /// </summary>
+        /// <typeparam name="T">The type.</typeparam>
+        /// <param name="previous">The previous selector.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Is<T>(this Selector? previous) where T : IStyleable
+        {
+            return previous.Is(typeof(T));
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a control's Name.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="name">The name.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Name(this Selector? previous, string name)
+        {
+            _ = name ?? throw new ArgumentNullException(nameof(name));
+
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                throw new ArgumentException("Name may not be empty", nameof(name));
+            }
+
+            var tac = previous as TypeNameAndClassSelector;
+
+            if (tac != null)
+            {
+                tac.Name = name;
+                return tac;
+            }
+            else
+            {
+                return TypeNameAndClassSelector.ForName(previous, name);
+            }
+        }
+
+        public static Selector Nesting(this Selector? previous)
+        {
+            return new NestingSelector();
+        }
+
+        /// <summary>
+        /// Returns a selector which inverts the results of selector argument.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="argument">The selector to be not-ed.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Not(this Selector? previous, Func<Selector?, Selector> argument)
+        {
+            return new NotSelector(previous, argument(null));
+        }
+        
+        /// <summary>
+        /// Returns a selector which inverts the results of selector argument.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="argument">The selector to be not-ed.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Not(this Selector? previous, Selector argument)
+        {
+            return new NotSelector(previous, argument);
+        }
+
+        /// <inheritdoc cref="NthChildSelector"/>
+        /// <inheritdoc cref="NthChildSelector(Selector?, int, int)"/>
+        /// <returns>The selector.</returns>
+        public static Selector NthChild(this Selector? previous, int step, int offset)
+        {
+            return new NthChildSelector(previous, step, offset);
+        }
+
+        /// <inheritdoc cref="NthLastChildSelector"/>
+        /// <inheritdoc cref="NthLastChildSelector(Selector?, int, int)"/>
+        /// <returns>The selector.</returns>
+        public static Selector NthLastChild(this Selector? previous, int step, int offset)
+        {
+            return new NthLastChildSelector(previous, step, offset);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a type.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="type">The type.</param>
+        /// <returns>The selector.</returns>
+        public static Selector OfType(this Selector? previous, Type type)
+        {
+            _ = type ?? throw new ArgumentNullException(nameof(type));
+
+            return TypeNameAndClassSelector.OfType(previous, type);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a type.
+        /// </summary>
+        /// <typeparam name="T">The type.</typeparam>
+        /// <param name="previous">The previous selector.</param>
+        /// <returns>The selector.</returns>
+        public static Selector OfType<T>(this Selector? previous) where T : IStyleable
+        {
+            return previous.OfType(typeof(T));
+        }
+
+        /// <summary>
+        /// Returns a selector which ORs selectors.
+        /// </summary>
+        /// <param name="selectors">The selectors to be OR'd.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Or(params Selector[] selectors)
+        {
+            return new OrSelector(selectors);
+        }
+
+        /// <summary>
+        /// Returns a selector which ORs selectors.
+        /// </summary>
+        /// <param name="selectors">The selectors to be OR'd.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Or(IReadOnlyList<Selector> selectors)
+        {
+            return new OrSelector(selectors);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a control with the specified property value.
+        /// </summary>
+        /// <typeparam name="T">The property type.</typeparam>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="property">The property.</param>
+        /// <param name="value">The property value.</param>
+        /// <returns>The selector.</returns>
+        public static Selector PropertyEquals<T>(this Selector? previous, AvaloniaProperty<T> property, object? value)
+        {
+            _ = property ?? throw new ArgumentNullException(nameof(property));
+
+            return new PropertyEqualsSelector(previous, property, value);
+        }
+
+        /// <summary>
+        /// Returns a selector which matches a control with the specified property value.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <param name="property">The property.</param>
+        /// <param name="value">The property value.</param>
+        /// <returns>The selector.</returns>
+        public static Selector PropertyEquals(this Selector? previous, AvaloniaProperty property, object? value)
+        {
+            _ = property ?? throw new ArgumentNullException(nameof(property));
+
+            return new PropertyEqualsSelector(previous, property, value);
+        }
+
+        /// <summary>
+        /// Returns a selector which enters a lookless control's template.
+        /// </summary>
+        /// <param name="previous">The previous selector.</param>
+        /// <returns>The selector.</returns>
+        public static Selector Template(this Selector previous)
+        {
+            return new TemplateSelector(previous);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/Setter.cs b/src/Avalonia.Base/Styling/Setter.cs
new file mode 100644
index 0000000000..d989bb0706
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Setter.cs
@@ -0,0 +1,72 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Data;
+using Avalonia.Metadata;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A setter for a <see cref="Style"/>.
+    /// </summary>
+    /// <remarks>
+    /// A <see cref="Setter"/> is used to set a <see cref="AvaloniaProperty"/> value on a
+    /// <see cref="AvaloniaObject"/> depending on a condition.
+    /// </remarks>
+    public class Setter : ISetter, IAnimationSetter
+    {
+        private object? _value;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Setter"/> class.
+        /// </summary>
+        public Setter()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Setter"/> class.
+        /// </summary>
+        /// <param name="property">The property to set.</param>
+        /// <param name="value">The property value.</param>
+        public Setter(AvaloniaProperty property, object value)
+        {
+            Property = property;
+            Value = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the property to set.
+        /// </summary>
+        public AvaloniaProperty? Property { get; set; }
+
+        /// <summary>
+        /// Gets or sets the property value.
+        /// </summary>
+        [Content]
+        [AssignBinding]
+        [DependsOn(nameof(Property))]
+        public object? Value
+        {
+            get => _value;
+            set
+            {
+                (value as ISetterValue)?.Initialize(this);
+                _value = value;
+            }
+        }
+
+        public ISetterInstance Instance(IStyleable target)
+        {
+            target = target ?? throw new ArgumentNullException(nameof(target));
+
+            if (Property is null)
+            {
+                throw new InvalidOperationException("Setter.Property must be set.");
+            }
+
+            return Property.CreateSetterInstance(target, Value);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/Style.cs b/src/Avalonia.Base/Styling/Style.cs
new file mode 100644
index 0000000000..000e588bad
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Style.cs
@@ -0,0 +1,198 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Defines a style.
+    /// </summary>
+    public class Style : AvaloniaObject, IStyle, IResourceProvider
+    {
+        private IResourceHost? _owner;
+        private StyleChildren? _children;
+        private IResourceDictionary? _resources;
+        private List<ISetter>? _setters;
+        private List<IAnimation>? _animations;
+        private StyleCache? _childCache;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Style"/> class.
+        /// </summary>
+        public Style()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Style"/> class.
+        /// </summary>
+        /// <param name="selector">The style selector.</param>
+        public Style(Func<Selector?, Selector> selector)
+        {
+            Selector = selector(null);
+        }
+
+        /// <summary>
+        /// Gets the children of the style.
+        /// </summary>
+        public IList<IStyle> Children => _children ??= new(this);
+
+        /// <summary>
+        /// Gets the <see cref="StyledElement"/> or Application that hosts the style.
+        /// </summary>
+        public IResourceHost? Owner
+        {
+            get => _owner;
+            private set
+            {
+                if (_owner != value)
+                {
+                    _owner = value;
+                    OwnerChanged?.Invoke(this, EventArgs.Empty);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the parent style if this style is hosted in a <see cref="Style.Children"/> collection.
+        /// </summary>
+        public Style? Parent { get; private set; }
+
+        /// <summary>
+        /// Gets or sets a dictionary of style resources.
+        /// </summary>
+        public IResourceDictionary Resources
+        {
+            get => _resources ?? (Resources = new ResourceDictionary());
+            set
+            {
+                value = value ?? throw new ArgumentNullException(nameof(value));
+
+                var hadResources = _resources?.HasResources ?? false;
+
+                _resources = value;
+
+                if (Owner is object)
+                {
+                    _resources.AddOwner(Owner);
+
+                    if (hadResources || _resources.HasResources)
+                    {
+                        Owner.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the style's selector.
+        /// </summary>
+        public Selector? Selector { get; set; }
+
+        /// <summary>
+        /// Gets the style's setters.
+        /// </summary>
+        public IList<ISetter> Setters => _setters ??= new List<ISetter>();
+
+        /// <summary>
+        /// Gets the style's animations.
+        /// </summary>
+        public IList<IAnimation> Animations => _animations ??= new List<IAnimation>();
+
+        bool IResourceNode.HasResources => _resources?.Count > 0;
+        IReadOnlyList<IStyle> IStyle.Children => (IReadOnlyList<IStyle>?)_children ?? Array.Empty<IStyle>();
+
+        public event EventHandler? OwnerChanged;
+
+        public void Add(ISetter setter) => Setters.Add(setter);
+        public void Add(IStyle style) => Children.Add(style);
+
+        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
+        {
+            target = target ?? throw new ArgumentNullException(nameof(target));
+
+            var match = Selector is object ? Selector.Match(target, Parent) :
+                target == host ? SelectorMatch.AlwaysThisInstance : SelectorMatch.NeverThisInstance;
+
+            if (match.IsMatch && (_setters is object || _animations is object))
+            {
+                var instance = new StyleInstance(this, target, _setters, _animations, match.Activator);
+                target.StyleApplied(instance);
+                instance.Start();
+            }
+
+            var result = match.Result;
+
+            if (_children is not null)
+            {
+                _childCache ??= new StyleCache();
+                var childResult = _childCache.TryAttach(_children, target, host);
+                if (childResult > result)
+                    result = childResult;
+            }
+
+            return result;
+        }
+
+        public bool TryGetResource(object key, out object? result)
+        {
+            result = null;
+            return _resources?.TryGetResource(key, out result) ?? false;
+        }
+
+        /// <summary>
+        /// Returns a string representation of the style.
+        /// </summary>
+        /// <returns>A string representation of the style.</returns>
+        public override string ToString()
+        {
+            if (Selector != null)
+            {
+                return "Style: " + Selector.ToString();
+            }
+            else
+            {
+                return "Style";
+            }
+        }
+
+        void IResourceProvider.AddOwner(IResourceHost owner)
+        {
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner != null)
+            {
+                throw new InvalidOperationException("The Style already has a parent.");
+            }
+
+            Owner = owner;
+            _resources?.AddOwner(owner);
+        }
+
+        void IResourceProvider.RemoveOwner(IResourceHost owner)
+        {
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner == owner)
+            {
+                Owner = null;
+                _resources?.RemoveOwner(owner);
+            }
+        }
+
+        internal void SetParent(Style? parent)
+        {
+            if (parent?.Selector is not null)
+            {
+                if (Selector is null)
+                    throw new InvalidOperationException("Child styles must have a selector.");
+                if (!Selector.HasValidNestingSelector())
+                    throw new InvalidOperationException("Child styles must have a nesting selector.");
+            }
+
+            Parent = parent;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/StyleCache.cs b/src/Avalonia.Base/Styling/StyleCache.cs
new file mode 100644
index 0000000000..3285476880
--- /dev/null
+++ b/src/Avalonia.Base/Styling/StyleCache.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Simple cache for improving performance of applying styles.
+    /// </summary>
+    /// <remarks>
+    /// Maps <see cref="IStyleable.StyleKey"/> to a list of styles that are known be be possible
+    /// matches.
+    /// </remarks>
+    internal class StyleCache : Dictionary<Type, List<IStyle>?>
+    {
+        public SelectorMatchResult TryAttach(IList<IStyle> styles, IStyleable target, IStyleHost? host)
+        {
+            if (TryGetValue(target.StyleKey, out var cached))
+            {
+                if (cached is object)
+                {
+                    var result = SelectorMatchResult.NeverThisType;
+
+                    foreach (var style in cached)
+                    {
+                        var childResult = style.TryAttach(target, host);
+                        if (childResult > result)
+                            result = childResult;
+                    }
+
+                    return result;
+                }
+                else
+                {
+                    return SelectorMatchResult.NeverThisType;
+                }
+            }
+            else
+            {
+                List<IStyle>? matches = null;
+
+                foreach (var child in styles)
+                {
+                    if (child.TryAttach(target, host) != SelectorMatchResult.NeverThisType)
+                    {
+                        matches ??= new List<IStyle>();
+                        matches.Add(child);
+                    }
+                }
+
+                Add(target.StyleKey, matches);
+
+                return matches is null ?
+                    SelectorMatchResult.NeverThisType :
+                    SelectorMatchResult.AlwaysThisType;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/StyleChildren.cs b/src/Avalonia.Base/Styling/StyleChildren.cs
new file mode 100644
index 0000000000..5f8635f155
--- /dev/null
+++ b/src/Avalonia.Base/Styling/StyleChildren.cs
@@ -0,0 +1,35 @@
+using System.Collections.ObjectModel;
+using Avalonia.Controls;
+
+namespace Avalonia.Styling
+{
+    internal class StyleChildren : Collection<IStyle>
+    {
+        private readonly Style _owner;
+
+        public StyleChildren(Style owner) => _owner = owner;
+
+        protected override void InsertItem(int index, IStyle item)
+        {
+            (item as Style)?.SetParent(_owner);
+            base.InsertItem(index, item);
+        }
+
+        protected override void RemoveItem(int index)
+        {
+            var item = Items[index];
+            (item as Style)?.SetParent(null);
+            if (_owner.Owner is IResourceHost host)
+                (item as IResourceProvider)?.RemoveOwner(host);
+            base.RemoveItem(index);
+        }
+
+        protected override void SetItem(int index, IStyle item)
+        {
+            (item as Style)?.SetParent(_owner);
+            base.SetItem(index, item);
+            if (_owner.Owner is IResourceHost host)
+                (item as IResourceProvider)?.AddOwner(host);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/StyleInstance.cs b/src/Avalonia.Base/Styling/StyleInstance.cs
new file mode 100644
index 0000000000..db96da6821
--- /dev/null
+++ b/src/Avalonia.Base/Styling/StyleInstance.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Reactive.Subjects;
+using Avalonia.Animation;
+using Avalonia.Styling.Activators;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A <see cref="Style"/> which has been instanced on a control.
+    /// </summary>
+    internal sealed class StyleInstance : IStyleInstance, IStyleActivatorSink
+    {
+        private readonly ISetterInstance[]? _setters;
+        private readonly IDisposable[]? _animations;
+        private readonly IStyleActivator? _activator;
+        private readonly Subject<bool>? _animationTrigger;
+
+        public StyleInstance(
+            IStyle source,
+            IStyleable target,
+            IReadOnlyList<ISetter>? setters,
+            IReadOnlyList<IAnimation>? animations,
+            IStyleActivator? activator = null)
+        {
+            Source = source ?? throw new ArgumentNullException(nameof(source));
+            Target = target ?? throw new ArgumentNullException(nameof(target));
+            _activator = activator;
+            IsActive = _activator is null;
+
+            if (setters is not null)
+            {
+                var setterCount = setters.Count;
+
+                _setters = new ISetterInstance[setterCount];
+
+                for (var i = 0; i < setterCount; ++i)
+                {
+                    _setters[i] = setters[i].Instance(Target);
+                }
+            }
+
+            if (animations is not null && target is Animatable animatable)
+            {
+                var animationsCount = animations.Count;
+
+                _animations = new IDisposable[animationsCount];
+                _animationTrigger = new Subject<bool>();
+
+                for (var i = 0; i < animationsCount; ++i)
+                {
+                    _animations[i] = animations[i].Apply(animatable, null, _animationTrigger);
+                }
+            }
+        }
+
+        public bool HasActivator => _activator is not null;
+        public bool IsActive { get; private set; }
+        public IStyle Source { get; }
+        public IStyleable Target { get; }
+
+        public void Start()
+        {
+            var hasActivator = HasActivator;
+
+            if (_setters is not null)
+            {
+                foreach (var setter in _setters)
+                {
+                    setter.Start(hasActivator);
+                }
+            }
+
+            if (hasActivator)
+            {
+                _activator!.Subscribe(this, 0);
+            }
+            else if (_animationTrigger is not null)
+            {
+                _animationTrigger.OnNext(true);
+            }
+        }
+
+        public void Dispose()
+        {
+            if (_setters is not null)
+            {
+                foreach (var setter in _setters)
+                {
+                    setter.Dispose();
+                }
+            }
+
+            if (_animations is not null)
+            {
+                foreach (var subscription in _animations)
+                {
+                    subscription.Dispose();
+                }
+            }
+
+            _activator?.Dispose();
+        }
+
+        private void ActivatorChanged(bool value)
+        {
+            if (IsActive != value)
+            {
+                IsActive = value;
+
+                _animationTrigger?.OnNext(value);
+
+                if (_setters is not null)
+                {
+                    if (IsActive)
+                    {
+                        foreach (var setter in _setters)
+                        {
+                            setter.Activate();
+                        }
+                    }
+                    else
+                    {
+                        foreach (var setter in _setters)
+                        {
+                            setter.Deactivate();
+                        }
+                    }
+                }
+            }
+        }
+
+        void IStyleActivatorSink.OnNext(bool value, int tag) => ActivatorChanged(value);
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/Styler.cs b/src/Avalonia.Base/Styling/Styler.cs
similarity index 100%
rename from src/Avalonia.Styling/Styling/Styler.cs
rename to src/Avalonia.Base/Styling/Styler.cs
diff --git a/src/Avalonia.Base/Styling/Styles.cs b/src/Avalonia.Base/Styling/Styles.cs
new file mode 100644
index 0000000000..7c0bc4ad7f
--- /dev/null
+++ b/src/Avalonia.Base/Styling/Styles.cs
@@ -0,0 +1,299 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using Avalonia.Collections;
+using Avalonia.Controls;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A style that consists of a number of child styles.
+    /// </summary>
+    public class Styles : AvaloniaObject,
+        IAvaloniaList<IStyle>,
+        IStyle,
+        IResourceProvider
+    {
+        private readonly AvaloniaList<IStyle> _styles = new AvaloniaList<IStyle>();
+        private IResourceHost? _owner;
+        private IResourceDictionary? _resources;
+        private StyleCache? _cache;
+
+        public Styles()
+        {
+            _styles.ResetBehavior = ResetBehavior.Remove;
+            _styles.CollectionChanged += OnCollectionChanged;
+        }
+
+        public Styles(IResourceHost owner)
+            : this()
+        {
+            Owner = owner;
+        }
+
+        public event NotifyCollectionChangedEventHandler? CollectionChanged;
+        public event EventHandler? OwnerChanged;
+
+        public int Count => _styles.Count;
+
+        public IResourceHost? Owner
+        {
+            get => _owner;
+            private set
+            {
+                if (_owner != value)
+                {
+                    _owner = value;
+                    OwnerChanged?.Invoke(this, EventArgs.Empty);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a dictionary of style resources.
+        /// </summary>
+        public IResourceDictionary Resources
+        {
+            get => _resources ?? (Resources = new ResourceDictionary());
+            set
+            {
+                value = value ?? throw new ArgumentNullException(nameof(Resources));
+
+                if (Owner is object)
+                {
+                    _resources?.RemoveOwner(Owner);
+                }
+
+                _resources = value;
+
+                if (Owner is object)
+                {
+                    _resources.AddOwner(Owner);
+                }
+            }
+        }
+
+        bool ICollection<IStyle>.IsReadOnly => false;
+
+        bool IResourceNode.HasResources
+        {
+            get
+            {
+                if (_resources?.Count > 0)
+                {
+                    return true;
+                }
+
+                foreach (var i in this)
+                {
+                    if (i is IResourceProvider p && p.HasResources)
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        IStyle IReadOnlyList<IStyle>.this[int index] => _styles[index];
+
+        IReadOnlyList<IStyle> IStyle.Children => this;
+
+        public IStyle this[int index]
+        {
+            get => _styles[index];
+            set => _styles[index] = value;
+        }
+
+        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
+        {
+            _cache ??= new StyleCache();
+            return _cache.TryAttach(this, target, host);
+        }
+
+        /// <inheritdoc/>
+        public bool TryGetResource(object key, out object? value)
+        {
+            if (_resources != null && _resources.TryGetResource(key, out value))
+            {
+                return true;
+            }
+
+            for (var i = Count - 1; i >= 0; --i)
+            {
+                if (this[i].TryGetResource(key, out value))
+                {
+                    return true;
+                }
+            }
+
+            value = null;
+            return false;
+        }
+
+        /// <inheritdoc/>
+        public void AddRange(IEnumerable<IStyle> items) => _styles.AddRange(items);
+
+        /// <inheritdoc/>
+        public void InsertRange(int index, IEnumerable<IStyle> items) => _styles.InsertRange(index, items);
+
+        /// <inheritdoc/>
+        public void Move(int oldIndex, int newIndex) => _styles.Move(oldIndex, newIndex);
+
+        /// <inheritdoc/>
+        public void MoveRange(int oldIndex, int count, int newIndex) => _styles.MoveRange(oldIndex, count, newIndex);
+
+        /// <inheritdoc/>
+        public void RemoveAll(IEnumerable<IStyle> items) => _styles.RemoveAll(items);
+
+        /// <inheritdoc/>
+        public void RemoveRange(int index, int count) => _styles.RemoveRange(index, count);
+
+        /// <inheritdoc/>
+        public int IndexOf(IStyle item) => _styles.IndexOf(item);
+
+        /// <inheritdoc/>
+        public void Insert(int index, IStyle item) => _styles.Insert(index, item);
+
+        /// <inheritdoc/>
+        public void RemoveAt(int index) => _styles.RemoveAt(index);
+
+        /// <inheritdoc/>
+        public void Add(IStyle item) => _styles.Add(item);
+
+        /// <inheritdoc/>
+        public void Clear() => _styles.Clear();
+
+        /// <inheritdoc/>
+        public bool Contains(IStyle item) => _styles.Contains(item);
+
+        /// <inheritdoc/>
+        public void CopyTo(IStyle[] array, int arrayIndex) => _styles.CopyTo(array, arrayIndex);
+
+        /// <inheritdoc/>
+        public bool Remove(IStyle item) => _styles.Remove(item);
+
+        public AvaloniaList<IStyle>.Enumerator GetEnumerator() => _styles.GetEnumerator();
+
+        /// <inheritdoc/>
+        IEnumerator<IStyle> IEnumerable<IStyle>.GetEnumerator() => _styles.GetEnumerator();
+
+        /// <inheritdoc/>
+        IEnumerator IEnumerable.GetEnumerator() => _styles.GetEnumerator();
+
+        /// <inheritdoc/>
+        void IResourceProvider.AddOwner(IResourceHost owner)
+        {
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner != null)
+            {
+                throw new InvalidOperationException("The Styles already has a owner.");
+            }
+
+            Owner = owner;
+            _resources?.AddOwner(owner);
+
+            foreach (var child in this)
+            {
+                if (child is IResourceProvider r)
+                {
+                    r.AddOwner(owner);
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        void IResourceProvider.RemoveOwner(IResourceHost owner)
+        {
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner == owner)
+            {
+                Owner = null;
+                _resources?.RemoveOwner(owner);
+
+                foreach (var child in this)
+                {
+                    if (child is IResourceProvider r)
+                    {
+                        r.RemoveOwner(owner);
+                    }
+                }
+            }
+        }
+
+        private void OnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            static IReadOnlyList<T> ToReadOnlyList<T>(IList list)
+            {
+                if (list is IReadOnlyList<T>)
+                {
+                    return (IReadOnlyList<T>)list;
+                }
+                else
+                {
+                    var result = new T[list.Count];
+                    list.CopyTo(result, 0);
+                    return result;
+                }
+            }
+
+            void Add(IList items)
+            {
+                for (var i = 0; i < items.Count; ++i)
+                {
+                    var style = (IStyle)items[i]!;
+
+                    if (Owner is object && style is IResourceProvider resourceProvider)
+                    {
+                        resourceProvider.AddOwner(Owner);
+                    }
+
+                    _cache = null;
+                }
+
+                (Owner as IStyleHost)?.StylesAdded(ToReadOnlyList<IStyle>(items));
+            }
+
+            void Remove(IList items)
+            {
+                for (var i = 0; i < items.Count; ++i)
+                {
+                    var style = (IStyle)items[i]!;
+
+                    if (Owner is object && style is IResourceProvider resourceProvider)
+                    {
+                        resourceProvider.RemoveOwner(Owner);
+                    }
+
+                    _cache = null;
+                }
+
+                (Owner as IStyleHost)?.StylesRemoved(ToReadOnlyList<IStyle>(items));
+            }
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    Add(e.NewItems!);
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    Remove(e.OldItems!);
+                    break;
+                case NotifyCollectionChangedAction.Replace:
+                    Remove(e.OldItems!);
+                    Add(e.NewItems!);
+                    break;
+                case NotifyCollectionChangedAction.Reset:
+                    throw new InvalidOperationException("Reset should not be called on Styles.");
+            }
+
+            CollectionChanged?.Invoke(this, e);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/TemplateSelector.cs b/src/Avalonia.Base/Styling/TemplateSelector.cs
new file mode 100644
index 0000000000..b0a2dae8d6
--- /dev/null
+++ b/src/Avalonia.Base/Styling/TemplateSelector.cs
@@ -0,0 +1,54 @@
+using System;
+
+namespace Avalonia.Styling
+{
+    internal class TemplateSelector : Selector
+    {
+        private readonly Selector _parent;
+        private string? _selectorString;
+
+        public TemplateSelector(Selector parent)
+        {
+            if (parent == null)
+            {
+                throw new InvalidOperationException("Template selector must be preceeded by a selector.");
+            }
+
+            _parent = parent;
+        }
+
+        /// <inheritdoc/>
+        public override bool InTemplate => true;
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => true;
+
+        /// <inheritdoc/>
+        public override Type? TargetType => null;
+
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                _selectorString = _parent.ToString() + " /template/ ";
+            }
+
+            return _selectorString;
+        }
+
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            var templatedParent = control.TemplatedParent as IStyleable;
+
+            if (templatedParent == null)
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+
+            return _parent.Match(templatedParent, parent, subscribe);
+        }
+
+        protected override Selector? MovePrevious() => null;
+        internal override bool HasValidNestingSelector() => _parent?.HasValidNestingSelector() ?? false;
+    }
+}
diff --git a/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
new file mode 100644
index 0000000000..24d5d6bbbf
--- /dev/null
+++ b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
@@ -0,0 +1,190 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Styling.Activators;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A selector that matches the common case of a type and/or name followed by a collection of
+    /// style classes and pseudoclasses.
+    /// </summary>
+    internal class TypeNameAndClassSelector : Selector
+    {
+        private readonly Selector? _previous;
+        private readonly Lazy<List<string>> _classes = new Lazy<List<string>>(() => new List<string>());
+        private Type? _targetType;
+        private string? _selectorString;
+
+        public static TypeNameAndClassSelector OfType(Selector? previous, Type targetType)
+        {
+            var result = new TypeNameAndClassSelector(previous);
+            result._targetType = targetType;
+            result.IsConcreteType = true;
+
+            return result;
+        }
+
+        public static TypeNameAndClassSelector Is(Selector? previous, Type targetType)
+        {
+            var result = new TypeNameAndClassSelector(previous);
+            result._targetType = targetType;
+            result.IsConcreteType = false;
+
+            return result;
+        }
+
+        public static TypeNameAndClassSelector ForName(Selector? previous, string name)
+        {
+            var result = new TypeNameAndClassSelector(previous);
+            result.Name = name;
+
+            return result;
+        }
+
+        public static TypeNameAndClassSelector ForClass(Selector? previous, string className)
+        {
+            var result = new TypeNameAndClassSelector(previous);
+            result.Classes.Add(className);
+
+            return result;
+        }
+
+        protected TypeNameAndClassSelector(Selector? previous)
+        {
+            _previous = previous;
+        }
+
+        /// <inheritdoc/>
+        public override bool InTemplate => _previous?.InTemplate ?? false;
+
+        /// <summary>
+        /// Gets the name of the control to match.
+        /// </summary>
+        public string? Name { get; set; }
+
+        /// <inheritdoc/>
+        public override Type? TargetType => _targetType ?? _previous?.TargetType;
+
+        /// <inheritdoc/>
+        public override bool IsCombinator => false;
+
+        /// <summary>
+        /// Whether the selector matches the concrete <see cref="TargetType"/> or any object which
+        /// implements <see cref="TargetType"/>.
+        /// </summary>
+        public bool IsConcreteType { get; private set; }
+
+        /// <summary>
+        /// The style classes which the selector matches.
+        /// </summary>
+        public IList<string> Classes => _classes.Value;
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            if (_selectorString == null)
+            {
+                _selectorString = BuildSelectorString();
+            }
+
+            return _selectorString;
+        }
+
+        /// <inheritdoc/>
+        protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
+        {
+            if (TargetType != null)
+            {
+                var controlType = control.StyleKey ?? control.GetType();
+
+                if (IsConcreteType)
+                {
+                    if (controlType != TargetType)
+                    {
+                        return SelectorMatch.NeverThisType;
+                    }
+                }
+                else
+                {
+                    if (!TargetType.IsAssignableFrom(controlType))
+                    {
+                        return SelectorMatch.NeverThisType;
+                    }
+                }
+            }
+
+            if (Name != null && control.Name != Name)
+            {
+                return SelectorMatch.NeverThisInstance;
+            }
+
+            if (_classes.IsValueCreated && _classes.Value.Count > 0)
+            {
+                if (subscribe)
+                {
+                    var observable = new StyleClassActivator(control.Classes, _classes.Value);
+
+                    return new SelectorMatch(observable);
+                }
+
+                if (!StyleClassActivator.AreClassesMatching(control.Classes, Classes))
+                {
+                    return SelectorMatch.NeverThisInstance;
+                }
+            }
+
+            return Name == null ? SelectorMatch.AlwaysThisType : SelectorMatch.AlwaysThisInstance;
+        }
+
+        protected override Selector? MovePrevious() => _previous;
+        internal override bool HasValidNestingSelector() => _previous?.HasValidNestingSelector() ?? false;
+
+        private string BuildSelectorString()
+        {
+            var builder = new StringBuilder();
+
+            if (_previous != null)
+            {
+                builder.Append(_previous.ToString());
+            }
+
+            if (TargetType != null)
+            {
+                if (IsConcreteType)
+                {
+                    builder.Append(TargetType.Name);
+                }
+                else
+                {
+                    builder.Append(":is(");
+                    builder.Append(TargetType.Name);
+                    builder.Append(")");
+                }
+            }
+
+            if (Name != null)
+            {
+                builder.Append('#');
+                builder.Append(Name);
+            }
+
+            if (_classes.IsValueCreated && _classes.Value.Count > 0)
+            {
+                foreach (var c in Classes)
+                {
+                    if (!c.StartsWith(":"))
+                    {
+                        builder.Append('.');
+                    }
+
+                    builder.Append(c);
+                }
+            }
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Thickness.cs b/src/Avalonia.Base/Thickness.cs
similarity index 100%
rename from src/Avalonia.Visuals/Thickness.cs
rename to src/Avalonia.Base/Thickness.cs
diff --git a/src/Avalonia.Base/Threading/AvaloniaScheduler.cs b/src/Avalonia.Base/Threading/AvaloniaScheduler.cs
index 397826df53..6423d86e7c 100644
--- a/src/Avalonia.Base/Threading/AvaloniaScheduler.cs
+++ b/src/Avalonia.Base/Threading/AvaloniaScheduler.cs
@@ -46,7 +46,7 @@ namespace Avalonia.Threading
                     {
                         composite.Add(action(this, state));
                     }
-                }, DispatcherPriority.DataBind);
+                }, DispatcherPriority.Background);
 
                 composite.Add(cancellation);
 
diff --git a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
index 21649306cb..2cade55f32 100644
--- a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
+++ b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Threading
         /// <inheritdoc/>
         public override void Post(SendOrPostCallback d, object? state)
         {
-           Dispatcher.UIThread.Post(() => d(state), DispatcherPriority.Background);
+           Dispatcher.UIThread.Post(d, state, DispatcherPriority.Background);
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Base/Threading/Dispatcher.cs b/src/Avalonia.Base/Threading/Dispatcher.cs
index 49cee441d0..571f782813 100644
--- a/src/Avalonia.Base/Threading/Dispatcher.cs
+++ b/src/Avalonia.Base/Threading/Dispatcher.cs
@@ -83,42 +83,42 @@ namespace Avalonia.Threading
             _jobRunner.HasJobsWithPriority(minimumPriority);
 
         /// <inheritdoc/>
-        public Task InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task InvokeAsync(Action action, DispatcherPriority priority = default)
         {
             _ = action ?? throw new ArgumentNullException(nameof(action));
             return _jobRunner.InvokeAsync(action, priority);
         }
 
         /// <inheritdoc/>
-        public Task<TResult> InvokeAsync<TResult>(Func<TResult> function, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task<TResult> InvokeAsync<TResult>(Func<TResult> function, DispatcherPriority priority = default)
         {
             _ = function ?? throw new ArgumentNullException(nameof(function));
             return _jobRunner.InvokeAsync(function, priority);
         }
 
         /// <inheritdoc/>
-        public Task InvokeAsync(Func<Task> function, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task InvokeAsync(Func<Task> function, DispatcherPriority priority = default)
         {
             _ = function ?? throw new ArgumentNullException(nameof(function));
             return _jobRunner.InvokeAsync(function, priority).Unwrap();
         }
 
         /// <inheritdoc/>
-        public Task<TResult> InvokeAsync<TResult>(Func<Task<TResult>> function, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task<TResult> InvokeAsync<TResult>(Func<Task<TResult>> function, DispatcherPriority priority = default)
         {
             _ = function ?? throw new ArgumentNullException(nameof(function));
             return _jobRunner.InvokeAsync(function, priority).Unwrap();
         }
 
         /// <inheritdoc/>
-        public void Post(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
+        public void Post(Action action, DispatcherPriority priority = default)
         {
             _ = action ?? throw new ArgumentNullException(nameof(action));
             _jobRunner.Post(action, priority);
         }
 
         /// <inheritdoc/>
-        public void Post<T>(Action<T> action, T arg, DispatcherPriority priority = DispatcherPriority.Normal)
+        public void Post(SendOrPostCallback action, object? arg, DispatcherPriority priority = default)
         {
             _ = action ?? throw new ArgumentNullException(nameof(action));
             _jobRunner.Post(action, arg, priority);
diff --git a/src/Avalonia.Base/Threading/DispatcherPriority.cs b/src/Avalonia.Base/Threading/DispatcherPriority.cs
index a2b4b86bac..a93e4f406d 100644
--- a/src/Avalonia.Base/Threading/DispatcherPriority.cs
+++ b/src/Avalonia.Base/Threading/DispatcherPriority.cs
@@ -1,74 +1,121 @@
+using System;
+
 namespace Avalonia.Threading
 {
     /// <summary>
     /// Defines the priorities with which jobs can be invoked on a <see cref="Dispatcher"/>.
     /// </summary>
-    // TODO: These are copied from WPF - many won't apply to Avalonia.
-    public enum DispatcherPriority
+    public readonly struct DispatcherPriority : IEquatable<DispatcherPriority>, IComparable<DispatcherPriority>
     {
+        /// <summary>
+        /// The integer value of the priority
+        /// </summary>
+        public int Value { get; }
+
+        private DispatcherPriority(int value)
+        {
+            Value = value;
+        }
+
         /// <summary>
         /// Minimum possible priority
         /// </summary>
-        MinValue = 1,
-        
+        public static readonly DispatcherPriority MinValue = new(0);
+
         /// <summary>
         /// The job will be processed when the system is idle.
         /// </summary>
-        SystemIdle = 1,
+        [Obsolete("WPF compatibility")] public static readonly DispatcherPriority SystemIdle = MinValue;
 
         /// <summary>
         /// The job will be processed when the application is idle.
         /// </summary>
-        ApplicationIdle = 2,
+        [Obsolete("WPF compatibility")] public static readonly DispatcherPriority ApplicationIdle = MinValue;
 
         /// <summary>
         /// The job will be processed after background operations have completed.
         /// </summary>
-        ContextIdle = 3,
+        [Obsolete("WPF compatibility")] public static readonly DispatcherPriority ContextIdle = MinValue;
 
         /// <summary>
-        /// The job will be processed after other non-idle operations have completed.
+        /// The job will be processed with normal priority.
         /// </summary>
-        Background = 4,
+        public static readonly DispatcherPriority Normal = MinValue;
 
         /// <summary>
-        /// The job will be processed with the same priority as input.
+        /// The job will be processed after other non-idle operations have completed.
         /// </summary>
-        Input = 5,
+        public static readonly DispatcherPriority Background = new(1);
 
         /// <summary>
-        /// The job will be processed after layout and render but before input.
+        /// The job will be processed with the same priority as input.
         /// </summary>
-        Loaded = 6,
+        public static readonly DispatcherPriority Input = new(2);
 
         /// <summary>
-        /// The job will be processed with the same priority as render.
+        /// The job will be processed after layout and render but before input.
         /// </summary>
-        Render = 7,
+        public static readonly DispatcherPriority Loaded = new(3);
         
         /// <summary>
         /// The job will be processed with the same priority as render.
         /// </summary>
-        Layout = 8,
-        
+        public static readonly DispatcherPriority Render = new(5);
+
         /// <summary>
-        /// The job will be processed with the same priority as data binding.
+        /// The job will be processed with the same priority as render.
         /// </summary>
-        DataBind = 9,
+        public static readonly DispatcherPriority Layout = new(6);
 
         /// <summary>
-        /// The job will be processed with normal priority.
+        /// The job will be processed with the same priority as data binding.
         /// </summary>
-        Normal = 10,
+        [Obsolete("WPF compatibility")] public static readonly DispatcherPriority DataBind = MinValue;
 
         /// <summary>
         /// The job will be processed before other asynchronous operations.
         /// </summary>
-        Send = 11,
-        
+        public static readonly DispatcherPriority Send = new(7);
+
         /// <summary>
         /// Maximum possible priority
         /// </summary>
-        MaxValue = 11
+        public static readonly DispatcherPriority MaxValue = Send;
+
+        // Note: unlike ctor this one is validating
+        public static DispatcherPriority FromValue(int value)
+        {
+            if (value < MinValue.Value || value > MaxValue.Value)
+                throw new ArgumentOutOfRangeException(nameof(value));
+            return new DispatcherPriority(value);
+        }
+
+        public static implicit operator int(DispatcherPriority priority) => priority.Value;
+
+        public static implicit operator DispatcherPriority(int value) => FromValue(value);
+
+        /// <inheritdoc />
+        public bool Equals(DispatcherPriority other) => Value == other.Value;
+
+        /// <inheritdoc />
+        public override bool Equals(object? obj) => obj is DispatcherPriority other && Equals(other);
+
+        /// <inheritdoc />
+        public override int GetHashCode() => Value.GetHashCode();
+
+        public static bool operator ==(DispatcherPriority left, DispatcherPriority right) => left.Value == right.Value;
+
+        public static bool operator !=(DispatcherPriority left, DispatcherPriority right) => left.Value != right.Value;
+
+        public static bool operator <(DispatcherPriority left, DispatcherPriority right) => left.Value < right.Value;
+
+        public static bool operator >(DispatcherPriority left, DispatcherPriority right) => left.Value > right.Value;
+
+        public static bool operator <=(DispatcherPriority left, DispatcherPriority right) => left.Value <= right.Value;
+
+        public static bool operator >=(DispatcherPriority left, DispatcherPriority right) => left.Value >= right.Value;
+
+        /// <inheritdoc />
+        public int CompareTo(DispatcherPriority other) => Value.CompareTo(other.Value);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Threading/DispatcherTimer.cs b/src/Avalonia.Base/Threading/DispatcherTimer.cs
index 93023b90a5..0c25d89722 100644
--- a/src/Avalonia.Base/Threading/DispatcherTimer.cs
+++ b/src/Avalonia.Base/Threading/DispatcherTimer.cs
@@ -123,7 +123,7 @@ namespace Avalonia.Threading
         /// <param name="interval">The interval at which to tick.</param>
         /// <param name="priority">The priority to use.</param>
         /// <returns>An <see cref="IDisposable"/> used to cancel the timer.</returns>
-        public static IDisposable Run(Func<bool> action, TimeSpan interval, DispatcherPriority priority = DispatcherPriority.Normal)
+        public static IDisposable Run(Func<bool> action, TimeSpan interval, DispatcherPriority priority = default)
         {
             var timer = new DispatcherTimer(priority) { Interval = interval };
 
@@ -152,7 +152,7 @@ namespace Avalonia.Threading
         public static IDisposable RunOnce(
             Action action,
             TimeSpan interval,
-            DispatcherPriority priority = DispatcherPriority.Normal)
+            DispatcherPriority priority = default)
         {
             interval = (interval != TimeSpan.Zero) ? interval : TimeSpan.FromTicks(1);
             
diff --git a/src/Avalonia.Base/Threading/IDispatcher.cs b/src/Avalonia.Base/Threading/IDispatcher.cs
index cd5add70d4..1c700132b7 100644
--- a/src/Avalonia.Base/Threading/IDispatcher.cs
+++ b/src/Avalonia.Base/Threading/IDispatcher.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Avalonia.Threading
@@ -24,16 +25,15 @@ namespace Avalonia.Threading
         /// </summary>
         /// <param name="action">The method.</param>
         /// <param name="priority">The priority with which to invoke the method.</param>
-        void Post(Action action, DispatcherPriority priority = DispatcherPriority.Normal);
+        void Post(Action action, DispatcherPriority priority = default);
 
         /// <summary>
         /// Posts an action that will be invoked on the dispatcher thread.
         /// </summary>
-        /// <typeparam name="T">type of argument</typeparam>
-        /// <param name="action">The method to call.</param>
+        /// <param name="action">The method.</param>
         /// <param name="arg">The argument of method to call.</param>
         /// <param name="priority">The priority with which to invoke the method.</param>
-        void Post<T>(Action<T> action, T arg, DispatcherPriority priority = DispatcherPriority.Normal);
+        void Post(SendOrPostCallback action, object? arg, DispatcherPriority priority = default);
 
         /// <summary>
         /// Invokes a action on the dispatcher thread.
@@ -41,24 +41,7 @@ namespace Avalonia.Threading
         /// <param name="action">The method.</param>
         /// <param name="priority">The priority with which to invoke the method.</param>
         /// <returns>A task that can be used to track the method's execution.</returns>
-        Task InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal);
-
-        /// <summary>
-        /// Invokes a method on the dispatcher thread.
-        /// </summary>
-        /// <param name="function">The method.</param>
-        /// <param name="priority">The priority with which to invoke the method.</param>
-        /// <returns>A task that can be used to track the method's execution.</returns>
-        Task<TResult> InvokeAsync<TResult>(Func<TResult> function, DispatcherPriority priority = DispatcherPriority.Normal);
-
-        /// <summary>
-        /// Queues the specified work to run on the dispatcher thread and returns a proxy for the
-        /// task returned by <paramref name="function"/>.
-        /// </summary>
-        /// <param name="function">The work to execute asynchronously.</param>
-        /// <param name="priority">The priority with which to invoke the method.</param>
-        /// <returns>A task that represents a proxy for the task returned by <paramref name="function"/>.</returns>
-        Task InvokeAsync(Func<Task> function, DispatcherPriority priority = DispatcherPriority.Normal);
+        Task InvokeAsync(Action action, DispatcherPriority priority = default);
 
         /// <summary>
         /// Queues the specified work to run on the dispatcher thread and returns a proxy for the
@@ -67,6 +50,6 @@ namespace Avalonia.Threading
         /// <param name="function">The work to execute asynchronously.</param>
         /// <param name="priority">The priority with which to invoke the method.</param>
         /// <returns>A task that represents a proxy for the task returned by <paramref name="function"/>.</returns>
-        Task<TResult> InvokeAsync<TResult>(Func<Task<TResult>> function, DispatcherPriority priority = DispatcherPriority.Normal);
+        Task InvokeAsync(Func<Task> function, DispatcherPriority priority = default);
     }
 }
diff --git a/src/Avalonia.Base/Threading/JobRunner.cs b/src/Avalonia.Base/Threading/JobRunner.cs
index 4b304d44f6..ced3423c27 100644
--- a/src/Avalonia.Base/Threading/JobRunner.cs
+++ b/src/Avalonia.Base/Threading/JobRunner.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Platform;
 
@@ -81,9 +82,9 @@ namespace Avalonia.Threading
         /// <param name="action">The method to call.</param>
         /// <param name="parameter">The parameter of method to call.</param>
         /// <param name="priority">The priority with which to invoke the method.</param>
-        internal void Post<T>(Action<T> action, T parameter, DispatcherPriority priority)
+        internal void Post(SendOrPostCallback action, object? parameter, DispatcherPriority priority)
         {
-            AddJob(new Job<T>(action, parameter, priority, true));
+            AddJob(new JobWithArg(action, parameter, priority, true));
         }
 
         /// <summary>
@@ -207,11 +208,10 @@ namespace Avalonia.Threading
         /// <summary>
         /// A typed job to run.
         /// </summary>
-        /// <typeparam name="T">Type of job parameter</typeparam>
-        private sealed class Job<T> : IJob
+        private sealed class JobWithArg : IJob
         {
-            private readonly Action<T> _action;
-            private readonly T _parameter;
+            private readonly SendOrPostCallback _action;
+            private readonly object? _parameter;
             private readonly TaskCompletionSource<bool>? _taskCompletionSource;
 
             /// <summary>
@@ -222,7 +222,7 @@ namespace Avalonia.Threading
             /// <param name="priority">The job priority.</param>
             /// <param name="throwOnUiThread">Do not wrap exception in TaskCompletionSource</param>
 
-            public Job(Action<T> action, T parameter, DispatcherPriority priority, bool throwOnUiThread)
+            public JobWithArg(SendOrPostCallback action, object? parameter, DispatcherPriority priority, bool throwOnUiThread)
             {
                 _action = action;
                 _parameter = parameter;
diff --git a/src/Avalonia.Base/Threading/ThreadSafeObjectPool.cs b/src/Avalonia.Base/Threading/ThreadSafeObjectPool.cs
index c6845485dc..827a02334a 100644
--- a/src/Avalonia.Base/Threading/ThreadSafeObjectPool.cs
+++ b/src/Avalonia.Base/Threading/ThreadSafeObjectPool.cs
@@ -5,12 +5,11 @@ namespace Avalonia.Threading
     public class ThreadSafeObjectPool<T> where T : class, new()
     {
         private Stack<T> _stack = new Stack<T>();
-        private object _lock = new object();
         public static ThreadSafeObjectPool<T> Default { get; } = new ThreadSafeObjectPool<T>();
 
         public T Get()
         {
-            lock (_lock)
+            lock (_stack)
             {
                 if(_stack.Count == 0)
                     return new T();
diff --git a/src/Avalonia.Visuals/Utilities/ArrayBuilder.cs b/src/Avalonia.Base/Utilities/ArrayBuilder.cs
similarity index 100%
rename from src/Avalonia.Visuals/Utilities/ArrayBuilder.cs
rename to src/Avalonia.Base/Utilities/ArrayBuilder.cs
diff --git a/src/Avalonia.Visuals/Utilities/ArraySlice.cs b/src/Avalonia.Base/Utilities/ArraySlice.cs
similarity index 100%
rename from src/Avalonia.Visuals/Utilities/ArraySlice.cs
rename to src/Avalonia.Base/Utilities/ArraySlice.cs
diff --git a/src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs b/src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs
index 09e408cb42..bd3b86f06d 100644
--- a/src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs
+++ b/src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Utilities
 
             var assetDoc = XDocument.Load(stream);
             XNamespace assetNs = assetDoc.Root!.Attribute("xmlns")!.Value;
-            List<AvaloniaResourcesIndexEntry> entries=         
+            List<AvaloniaResourcesIndexEntry> entries =         
                 (from entry in assetDoc.Root.Element(assetNs + "Entries")!.Elements(assetNs + "AvaloniaResourcesIndexEntry")
                     select new AvaloniaResourcesIndexEntry
                     {
diff --git a/src/Avalonia.Visuals/Utilities/BinarySearchExtension.cs b/src/Avalonia.Base/Utilities/BinarySearchExtension.cs
similarity index 100%
rename from src/Avalonia.Visuals/Utilities/BinarySearchExtension.cs
rename to src/Avalonia.Base/Utilities/BinarySearchExtension.cs
diff --git a/src/Avalonia.Base/Utilities/EnumHelper.cs b/src/Avalonia.Base/Utilities/EnumHelper.cs
new file mode 100644
index 0000000000..c857033ef1
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/EnumHelper.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace Avalonia.Utilities
+{
+    internal class EnumHelper
+    {
+#if NET6_0_OR_GREATER
+        public static T Parse<T>(ReadOnlySpan<char> key, bool ignoreCase) where T : struct
+        {
+            return Enum.Parse<T>(key, ignoreCase);
+        }
+#else
+        public static T Parse<T>(string key, bool ignoreCase) where T : struct
+        {
+            return (T)Enum.Parse(typeof(T), key, ignoreCase);
+        }
+#endif
+    }
+}
diff --git a/src/Avalonia.Visuals/Utilities/FrugalList.cs b/src/Avalonia.Base/Utilities/FrugalList.cs
similarity index 100%
rename from src/Avalonia.Visuals/Utilities/FrugalList.cs
rename to src/Avalonia.Base/Utilities/FrugalList.cs
diff --git a/src/Avalonia.Base/Utilities/IAvaloniaPropertyVisitor.cs b/src/Avalonia.Base/Utilities/IAvaloniaPropertyVisitor.cs
deleted file mode 100644
index 6a8df91b81..0000000000
--- a/src/Avalonia.Base/Utilities/IAvaloniaPropertyVisitor.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace Avalonia.Utilities
-{
-    /// <summary>
-    /// A visitor to resolve an untyped <see cref="AvaloniaProperty"/> to a typed property.
-    /// </summary>
-    /// <typeparam name="TData">The type of user data passed.</typeparam>
-    /// <remarks>
-    /// Pass an instance that implements this interface to
-    /// <see cref="AvaloniaProperty.Accept{TData}(IAvaloniaPropertyVisitor{TData}, ref TData)"/>
-    /// in order to resolve un untyped <see cref="AvaloniaProperty"/> to a typed
-    /// <see cref="StyledPropertyBase{TValue}"/> or <see cref="DirectPropertyBase{TValue}"/>.
-    /// </remarks>
-    public interface IAvaloniaPropertyVisitor<TData>
-        where TData : struct
-    {
-        /// <summary>
-        /// Called when the property is a styled property.
-        /// </summary>
-        /// <typeparam name="T">The property value type.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="data">The user data.</param>
-        void Visit<T>(StyledPropertyBase<T> property, ref TData data);
-
-        /// <summary>
-        /// Called when the property is a direct property.
-        /// </summary>
-        /// <typeparam name="T">The property value type.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="data">The user data.</param>
-        void Visit<T>(DirectPropertyBase<T> property, ref TData data);
-    }
-}
diff --git a/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs b/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs
index e48c0cb111..6cf8c605a7 100644
--- a/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs
+++ b/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs
@@ -9,4 +9,31 @@ namespace Avalonia.Utilities;
 public interface IWeakEventSubscriber<in TEventArgs> where TEventArgs : EventArgs
 {
     void OnEvent(object? sender, WeakEvent ev, TEventArgs e);
-}
\ No newline at end of file
+}
+
+public sealed class WeakEventSubscriber<TEventArgs> : IWeakEventSubscriber<TEventArgs> where TEventArgs : EventArgs 
+{
+    public event Action<object?, WeakEvent, TEventArgs>? Event;
+
+    void IWeakEventSubscriber<TEventArgs>.OnEvent(object? sender, WeakEvent ev, TEventArgs e)
+    {
+        Event?.Invoke(sender, ev, e);
+    }
+}
+
+public sealed class TargetWeakEventSubscriber<TTarget, TEventArgs> : IWeakEventSubscriber<TEventArgs> where TEventArgs : EventArgs
+{
+    private readonly TTarget _target;
+    private readonly Action<TTarget, object?, WeakEvent, TEventArgs> _dispatchFunc;
+
+    public TargetWeakEventSubscriber(TTarget target, Action<TTarget, object?, WeakEvent, TEventArgs> dispatchFunc)
+    {
+        _target = target;
+        _dispatchFunc = dispatchFunc;
+    }
+
+    void IWeakEventSubscriber<TEventArgs>.OnEvent(object? sender, WeakEvent ev, TEventArgs e)
+    {
+        _dispatchFunc(_target, sender, ev, e);
+    }
+}
diff --git a/src/Avalonia.Visuals/Utilities/MappedArraySlice.cs b/src/Avalonia.Base/Utilities/MappedArraySlice.cs
similarity index 100%
rename from src/Avalonia.Visuals/Utilities/MappedArraySlice.cs
rename to src/Avalonia.Base/Utilities/MappedArraySlice.cs
diff --git a/src/Avalonia.Visuals/Utilities/ReadOnlySlice.cs b/src/Avalonia.Base/Utilities/ReadOnlySlice.cs
similarity index 100%
rename from src/Avalonia.Visuals/Utilities/ReadOnlySlice.cs
rename to src/Avalonia.Base/Utilities/ReadOnlySlice.cs
diff --git a/src/Avalonia.Visuals/Utilities/Span.cs b/src/Avalonia.Base/Utilities/Span.cs
similarity index 100%
rename from src/Avalonia.Visuals/Utilities/Span.cs
rename to src/Avalonia.Base/Utilities/Span.cs
diff --git a/src/Avalonia.Base/Utilities/UriExtensions.cs b/src/Avalonia.Base/Utilities/UriExtensions.cs
new file mode 100644
index 0000000000..c706f72a63
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/UriExtensions.cs
@@ -0,0 +1,70 @@
+using System;
+
+namespace Avalonia.Utilities;
+
+internal static class UriExtensions
+{
+    public static bool IsAbsoluteResm(this Uri uri) =>
+        uri.IsAbsoluteUri && uri.IsResm();
+
+    public static bool IsResm(this Uri uri) => uri.Scheme == "resm";
+    
+    public static bool IsAvares(this Uri uri) => uri.Scheme == "avares";
+    
+    public static Uri EnsureAbsolute(this Uri uri, Uri? baseUri)
+    {
+        if (uri.IsAbsoluteUri)
+            return uri;
+        if(baseUri == null)
+            throw new ArgumentException($"Relative uri {uri} without base url");
+        if (!baseUri.IsAbsoluteUri)
+            throw new ArgumentException($"Base uri {baseUri} is relative");
+        if (baseUri.IsResm())
+            throw new ArgumentException(
+                $"Relative uris for 'resm' scheme aren't supported; {baseUri} uses resm");
+        return new Uri(baseUri, uri);
+    }
+
+    public static string GetUnescapeAbsolutePath(this Uri uri) =>
+        Uri.UnescapeDataString(uri.AbsolutePath);
+
+    public static string GetUnescapeAbsoluteUri(this Uri uri) =>
+        Uri.UnescapeDataString(uri.AbsoluteUri);
+    
+    public static string GetAssemblyNameFromQuery(this Uri uri)
+    {
+        const string assembly = "assembly";
+
+        var query = Uri.UnescapeDataString(uri.Query);
+        
+        // Skip the '?'
+        var currentIndex = 1;
+        while (currentIndex < query.Length)
+        {
+            var isFind = false;
+            for (var i = 0; i < assembly.Length; ++currentIndex, ++i)
+                if (query[currentIndex] == assembly[i])
+                {
+                    isFind = i == assembly.Length - 1;
+                }
+                else
+                {
+                    break;
+                }
+
+            // Skip the '='
+            ++currentIndex;
+
+            var beginIndex = currentIndex;
+            while (currentIndex < query.Length && query[currentIndex] != '&')
+                ++currentIndex;
+
+            if (isFind)
+                return query.Substring(beginIndex, currentIndex - beginIndex);
+
+            ++currentIndex;
+        }
+
+        return "";
+    }
+}
diff --git a/src/Avalonia.Visuals/Utilities/ValueSpan.cs b/src/Avalonia.Base/Utilities/ValueSpan.cs
similarity index 100%
rename from src/Avalonia.Visuals/Utilities/ValueSpan.cs
rename to src/Avalonia.Base/Utilities/ValueSpan.cs
diff --git a/src/Avalonia.Base/Utilities/WeakEvent.cs b/src/Avalonia.Base/Utilities/WeakEvent.cs
index 0b32015a8a..e72606bf70 100644
--- a/src/Avalonia.Base/Utilities/WeakEvent.cs
+++ b/src/Avalonia.Base/Utilities/WeakEvent.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -36,7 +37,7 @@ public class WeakEvent<TSender, TEventArgs> : WeakEvent where TEventArgs : Event
     {
         if (!_subscriptions.TryGetValue(target, out var subscription))
             _subscriptions.Add(target, subscription = new Subscription(this, target));
-        subscription.Add(new WeakReference<IWeakEventSubscriber<TEventArgs>>(subscriber));
+        subscription.Add(subscriber);
     }
 
     public void Unsubscribe(TSender target, IWeakEventSubscriber<TEventArgs> subscriber)
@@ -51,11 +52,59 @@ public class WeakEvent<TSender, TEventArgs> : WeakEvent where TEventArgs : Event
         private readonly TSender _target;
         private readonly Action _compact;
 
-        private WeakReference<IWeakEventSubscriber<TEventArgs>>?[] _data =
-            new WeakReference<IWeakEventSubscriber<TEventArgs>>[16];
-        private int _count;
+        struct Entry
+        {
+            WeakReference<IWeakEventSubscriber<TEventArgs>>? _reference;
+            int _hashCode;
+
+            public Entry(IWeakEventSubscriber<TEventArgs> r)
+            {
+                if (r == null)
+                {
+                    _reference = null;
+                    _hashCode = 0;
+                    return;
+                }
+
+                _hashCode = r.GetHashCode();
+                _reference = new WeakReference<IWeakEventSubscriber<TEventArgs>>(r);
+            }
+
+            public bool IsEmpty
+            {
+                get
+                {
+                    if (_reference == null)
+                        return true;
+                    if (_reference.TryGetTarget(out _))
+                        return false;
+                    _reference = null;
+                    return true;
+                }
+            }
+
+            public bool TryGetTarget([MaybeNullWhen(false)]out IWeakEventSubscriber<TEventArgs> target)
+            {
+                if (_reference == null)
+                {
+                    target = null!;
+                    return false;
+                }
+                return _reference.TryGetTarget(out target);
+            }
+
+            public bool Equals(IWeakEventSubscriber<TEventArgs> r)
+            {
+                if (_reference == null || r.GetHashCode() != _hashCode)
+                    return false;
+                return _reference.TryGetTarget(out var target) && target == r;
+            }
+        }
+
         private readonly Action _unsubscribe;
+        private readonly WeakHashList<IWeakEventSubscriber<TEventArgs>> _list = new();
         private bool _compactScheduled;
+        private bool _destroyed;
 
         public Subscription(WeakEvent<TSender, TEventArgs> ev, TSender target)
         {
@@ -67,48 +116,27 @@ public class WeakEvent<TSender, TEventArgs> : WeakEvent where TEventArgs : Event
 
         void Destroy()
         {
+            if(_destroyed)
+                return;
+            _destroyed = true;
             _unsubscribe();
             _ev._subscriptions.Remove(_target);
         }
 
-        public void Add(WeakReference<IWeakEventSubscriber<TEventArgs>> s)
-        {
-            if (_count == _data.Length)
-            {
-                //Extend capacity
-                var extendedData = new WeakReference<IWeakEventSubscriber<TEventArgs>>?[_data.Length * 2];
-                Array.Copy(_data, extendedData, _data.Length);
-                _data = extendedData;
-            }
-
-            _data[_count] = s;
-            _count++;
-        }
+        public void Add(IWeakEventSubscriber<TEventArgs> s) => _list.Add(s);
 
         public void Remove(IWeakEventSubscriber<TEventArgs> s)
         {
-            var removed = false;
-
-            for (int c = 0; c < _count; ++c)
-            {
-                var reference = _data[c];
-
-                if (reference != null && reference.TryGetTarget(out var instance) && instance == s)
-                {
-                    _data[c] = null;
-                    removed = true;
-                }
-            }
-
-            if (removed)
-            {
+            _list.Remove(s);
+            if(_list.IsEmpty)
+                Destroy();
+            else if(_list.NeedCompact && _compactScheduled)
                 ScheduleCompact();
-            }
         }
 
         void ScheduleCompact()
         {
-            if(_compactScheduled)
+            if(_compactScheduled || _destroyed)
                 return;
             _compactScheduled = true;
             Dispatcher.UIThread.Post(_compact, DispatcherPriority.Background);
@@ -116,43 +144,27 @@ public class WeakEvent<TSender, TEventArgs> : WeakEvent where TEventArgs : Event
         
         void Compact()
         {
+            if(!_compactScheduled)
+                return;
             _compactScheduled = false;
-            int empty = -1;
-            for (var c = 0; c < _count; c++)
-            {
-                var r = _data[c];
-                //Mark current index as first empty
-                if (r == null && empty == -1)
-                    empty = c;
-                //If current element isn't null and we have an empty one
-                if (r != null && empty != -1)
-                {
-                    _data[c] = null;
-                    _data[empty] = r;
-                    empty++;
-                }
-            }
-
-            if (empty != -1)
-                _count = empty;
-            if (_count == 0)
+            _list.Compact();
+            if (_list.IsEmpty)
                 Destroy();
         }
 
         void OnEvent(object? sender, TEventArgs eventArgs)
         {
-            var needCompact = false;
-            for (var c = 0; c < _count; c++)
+            var alive = _list.GetAlive();
+            if(alive == null)
+                Destroy();
+            else
             {
-                var r = _data[c];
-                if (r?.TryGetTarget(out var sub) == true)
-                    sub!.OnEvent(_target, _ev, eventArgs);
-                else
-                    needCompact = true;
+                foreach(var item in alive.Span)
+                    item.OnEvent(_target, _ev, eventArgs);
+                WeakHashList<IWeakEventSubscriber<TEventArgs>>.ReturnToSharedPool(alive);
+                if(_list.NeedCompact && !_compactScheduled)
+                    ScheduleCompact();
             }
-
-            if (needCompact)
-                ScheduleCompact();
         }
     }
 
diff --git a/src/Avalonia.Base/Utilities/WeakEvents.cs b/src/Avalonia.Base/Utilities/WeakEvents.cs
index d1b5e7f12d..6da899bab2 100644
--- a/src/Avalonia.Base/Utilities/WeakEvents.cs
+++ b/src/Avalonia.Base/Utilities/WeakEvents.cs
@@ -31,10 +31,23 @@ public class WeakEvents
                 return () => s.PropertyChanged -= handler;
             });
 
+
+    /// <summary>
+    /// Represents PropertyChanged event from <see cref="AvaloniaObject"/>
+    /// </summary>
+    public static readonly WeakEvent<AvaloniaObject, AvaloniaPropertyChangedEventArgs>
+        AvaloniaPropertyChanged = WeakEvent.Register<AvaloniaObject, AvaloniaPropertyChangedEventArgs>(
+            (s, h) =>
+            {
+                EventHandler<AvaloniaPropertyChangedEventArgs> handler = (_, e) => h(s, e);
+                s.PropertyChanged += handler;
+                return () => s.PropertyChanged -= handler;
+            });
+
     /// <summary>
     /// Represents CanExecuteChanged event from <see cref="ICommand"/>
     /// </summary>
     public static readonly WeakEvent<ICommand, EventArgs> CommandCanExecuteChanged =
         WeakEvent.Register<ICommand>((s, h) => s.CanExecuteChanged += h,
             (s, h) => s.CanExecuteChanged -= h);
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Utilities/WeakHashList.cs b/src/Avalonia.Base/Utilities/WeakHashList.cs
new file mode 100644
index 0000000000..fe582e8a78
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/WeakHashList.cs
@@ -0,0 +1,241 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Collections.Pooled;
+
+namespace Avalonia.Utilities;
+
+internal class WeakHashList<T> where T : class
+{
+    public const int DefaultArraySize = 8;
+    
+    private struct Key
+    {
+        public WeakReference<T>? Weak;
+        public T? Strong;
+        public int HashCode;
+
+        public static Key MakeStrong(T r) => new()
+        {
+            HashCode = r.GetHashCode(),
+            Strong = r
+        };
+
+        public static Key MakeWeak(T r) => new()
+        {
+            HashCode = r.GetHashCode(),
+            Weak = new WeakReference<T>(r)
+        };
+
+        public override int GetHashCode() => HashCode;
+    }
+
+    class KeyComparer : IEqualityComparer<Key>
+    {
+        public bool Equals(Key x, Key y)
+        {
+            if (x.HashCode != y.HashCode)
+                return false;
+            if (x.Strong != null)
+            {
+                if (y.Strong != null)
+                    return x.Strong == y.Strong;
+                if (y.Weak == null)
+                    return false;
+                return y.Weak.TryGetTarget(out var weakTarget) && weakTarget == x.Strong;
+            }
+            else if (y.Strong != null)
+            {
+                if (x.Weak == null)
+                    return false;
+                return x.Weak.TryGetTarget(out var weakTarget) && weakTarget == y.Strong;
+            }
+            else
+            {
+                if (x.Weak == null || x.Weak.TryGetTarget(out var xTarget) == false)
+                    return y.Weak?.TryGetTarget(out _) != true;
+                return y.Weak?.TryGetTarget(out var yTarget) == true && xTarget == yTarget;
+            }
+        }
+
+        public int GetHashCode(Key obj) => obj.HashCode;
+        public static KeyComparer Instance = new();
+    }
+
+    Dictionary<Key, int>? _dic;
+    WeakReference<T>?[]? _arr;
+    int _arrCount;
+    
+    public bool IsEmpty => _dic is not null ? _dic.Count == 0 : _arrCount == 0;
+
+    public bool NeedCompact { get; private set; }
+    
+    public void Add(T item)
+    {
+        if (_dic != null)
+        {
+            var strongKey = Key.MakeStrong(item);
+            if (_dic.TryGetValue(strongKey, out var cnt))
+                _dic[strongKey] = cnt + 1;
+            else
+                _dic[Key.MakeWeak(item)] = 1;
+            return;
+        }
+
+        if (_arr == null)
+            _arr = new WeakReference<T>[DefaultArraySize];
+
+        if (_arrCount < _arr.Length)
+        {
+            _arr[_arrCount] = new WeakReference<T>(item);
+            _arrCount++;
+            return;
+        }
+
+        // Check if something is dead
+        for (var c = 0; c < _arrCount; c++)
+        {
+            if (_arr[c]!.TryGetTarget(out _) == false)
+            {
+                _arr[c] = new WeakReference<T>(item);
+                return;
+            }
+        }
+
+        _dic = new Dictionary<Key, int>(KeyComparer.Instance);
+        foreach (var existing in _arr)
+        {
+            if (existing!.TryGetTarget(out var target))
+                Add(target);
+        }
+        
+        Add(item);
+
+        _arr = null;
+        _arrCount = 0;
+    }
+
+    public void Remove(T item)
+    {
+        if (_arr != null)
+        {
+            for (var c = 0; c < _arrCount; c++)
+            {
+                if (_arr[c]?.TryGetTarget(out var target) == true && target == item)
+                {
+                    _arr[c] = null;
+                    ArrCompact();
+                    return;
+                }
+            }
+        }
+        else if (_dic != null)
+        {
+            var strongKey = Key.MakeStrong(item);
+            
+            if (_dic.TryGetValue(strongKey, out var cnt))
+            {
+                if (cnt > 1)
+                {
+                    _dic[strongKey] = cnt - 1;
+                    return;
+                }
+            }
+
+            _dic.Remove(strongKey);
+        }
+    }
+
+    private void ArrCompact()
+    {
+        if (_arr != null)
+        {
+            int empty = -1;
+            for (var c = 0; c < _arrCount; c++)
+            {
+                var r = _arr[c];
+                //Mark current index as first empty
+                if (r == null && empty == -1)
+                    empty = c;
+                //If current element isn't null and we have an empty one
+                if (r != null && empty != -1)
+                {
+                    _arr[c] = null;
+                    _arr[empty] = r;
+                    empty++;
+                }
+            }
+
+            if (empty != -1)
+                _arrCount = empty;
+        }
+    }
+    
+    public void Compact()
+    {
+        if (_dic != null)
+        {
+            PooledList<Key>? toRemove = null;
+            foreach (var kvp in _dic)
+            {
+                if (kvp.Key.Weak?.TryGetTarget(out _) != true)
+                    (toRemove ??= new PooledList<Key>()).Add(kvp.Key);
+            }
+
+            if (toRemove != null)
+            {
+                foreach (var k in toRemove)
+                    _dic.Remove(k);
+                toRemove.Dispose();
+            }
+        }
+    }
+
+    private static readonly Stack<PooledList<T>> s_listPool = new();
+
+    public static void ReturnToSharedPool(PooledList<T> list)
+    {
+        list.Clear();
+        s_listPool.Push(list);
+    }
+    
+    public PooledList<T>? GetAlive(Func<PooledList<T>>? factory = null)
+    {
+        PooledList<T>? pooled = null;
+        if (_arr != null)
+        {
+            bool needCompact = false;
+            for (var c = 0; c < _arrCount; c++)
+            {
+                if (_arr[c]?.TryGetTarget(out var target) == true)
+                    (pooled ??= factory?.Invoke()
+                                ?? (s_listPool.Count > 0
+                                    ? s_listPool.Pop()
+                                    : new PooledList<T>())).Add(target!);
+                else
+                {
+                    _arr[c] = null;
+                    needCompact = true;
+                }
+            }
+            if(needCompact)
+                ArrCompact();
+            return pooled;
+        }
+        if (_dic != null)
+        {
+            foreach (var kvp in _dic)
+            {
+                if (kvp.Key.Weak?.TryGetTarget(out var target) == true)
+                    (pooled ??= factory?.Invoke()
+                                ?? (s_listPool.Count > 0
+                                    ? s_listPool.Pop()
+                                    : new PooledList<T>()))
+                        .Add(target!);
+                else
+                    NeedCompact = true;
+            }
+        }
+
+        return pooled;
+    }
+}
diff --git a/src/Avalonia.Base/ValueStore.cs b/src/Avalonia.Base/ValueStore.cs
index 6b7b598086..69c644dff9 100644
--- a/src/Avalonia.Base/ValueStore.cs
+++ b/src/Avalonia.Base/ValueStore.cs
@@ -21,16 +21,15 @@ namespace Avalonia
     /// - For a single binding it will be an instance of <see cref="BindingEntry{T}"/>
     /// - For all other cases it will be an instance of <see cref="PriorityValue{T}"/>
     /// </remarks>
-    internal class ValueStore : IValueSink
+    internal class ValueStore
     {
         private readonly AvaloniaObject _owner;
-        private readonly IValueSink _sink;
         private readonly AvaloniaPropertyValueStore<IValue> _values;
         private BatchUpdate? _batchUpdate;
 
         public ValueStore(AvaloniaObject owner)
         {
-            _sink = _owner = owner;
+            _owner = owner;
             _values = new AvaloniaPropertyValueStore<IValue>();
         }
 
@@ -122,7 +121,7 @@ namespace Avalonia
                 }
                 else
                 {
-                    var entry = new ConstantValueEntry<T>(property, value, priority, this);
+                    var entry = new ConstantValueEntry<T>(property, value, priority, new(this));
                     AddValue(property, entry);
                     NotifyValueChanged<T>(property, default, value, priority);
                     result = entry;
@@ -151,7 +150,7 @@ namespace Avalonia
             }
             else
             {
-                var entry = new BindingEntry<T>(_owner, property, source, priority, this);
+                var entry = new BindingEntry<T>(_owner, property, source, priority, new(this));
                 AddValue(property, entry);
                 return entry;
             }
@@ -187,7 +186,7 @@ namespace Avalonia
                         // so there's no way to mark them for removal at the end of a batch update. Instead convert
                         // them to a constant value entry with Unset priority in the event of a local value being
                         // cleared during a batch update.
-                        var sentinel = new ConstantValueEntry<T>(property, Optional<T>.Empty, BindingPriority.Unset, _sink);
+                        var sentinel = new ConstantValueEntry<T>(property, Optional<T>.Empty, BindingPriority.Unset, new(this));
                         _values.SetValue(property, sentinel);
                     }
 
@@ -196,11 +195,11 @@ namespace Avalonia
             }
         }
 
-        public void CoerceValue<T>(StyledPropertyBase<T> property)
+        public void CoerceValue(AvaloniaProperty property)
         {
             if (TryGetValue(property, out var slot))
             {
-                if (slot is PriorityValue<T> p)
+                if (slot is IPriorityValue p)
                 {
                     p.UpdateEffectiveValue();
                 }
@@ -222,7 +221,7 @@ namespace Avalonia
             return null;
         }
 
-        void IValueSink.ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        public void ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
             if (_batchUpdate is object)
             {
@@ -233,11 +232,11 @@ namespace Avalonia
             }
             else
             {
-                _sink.ValueChanged(change);
+                _owner.ValueChanged(change);
             }
         }
 
-        void IValueSink.Completed<T>(
+        public void Completed<T>(
             StyledPropertyBase<T> property,
             IPriorityValueEntry entry,
             Optional<T> oldValue)
@@ -248,7 +247,7 @@ namespace Avalonia
                 if (_batchUpdate is null)
                 {
                     _values.Remove(property);
-                    _sink.Completed(property, entry, oldValue);
+                    _owner.Completed(property, entry, oldValue);
                 }
                 else
                 {
@@ -352,7 +351,7 @@ namespace Avalonia
         {
             if (_batchUpdate is null)
             {
-                _sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+                _owner.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
                     _owner,
                     property,
                     oldValue,
@@ -451,7 +450,7 @@ namespace Avalonia
                             };
 
                             // Call _sink.ValueChanged with an appropriately typed AvaloniaPropertyChangedEventArgs<T>.
-                            slot.RaiseValueChanged(_owner._sink, _owner._owner, entry.property, oldValue, newValue);
+                            slot.RaiseValueChanged(_owner._owner, entry.property, oldValue, newValue);
 
                             // During batch update values can't be removed immediately because they're needed to raise
                             // the _sink.ValueChanged notification. They instead mark themselves for removal by setting
diff --git a/src/Avalonia.Visuals/Vector.cs b/src/Avalonia.Base/Vector.cs
similarity index 100%
rename from src/Avalonia.Visuals/Vector.cs
rename to src/Avalonia.Base/Vector.cs
diff --git a/src/Avalonia.Base/Visual.cs b/src/Avalonia.Base/Visual.cs
new file mode 100644
index 0000000000..4fd21f02f9
--- /dev/null
+++ b/src/Avalonia.Base/Visual.cs
@@ -0,0 +1,679 @@
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using Avalonia.Collections;
+using Avalonia.Data;
+using Avalonia.Logging;
+using Avalonia.LogicalTree;
+using Avalonia.Media;
+using Avalonia.Metadata;
+using Avalonia.Rendering;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+
+#nullable enable
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Base class for controls that provides rendering and related visual properties.
+    /// </summary>
+    /// <remarks>
+    /// The <see cref="Visual"/> class represents elements that have a visual on-screen
+    /// representation and stores all the information needed for an 
+    /// <see cref="IRenderer"/> to render the control. To traverse the visual tree, use the
+    /// extension methods defined in <see cref="VisualExtensions"/>.
+    /// </remarks>
+    [UsableDuringInitialization]
+    public class Visual : StyledElement, IVisual
+    {
+        /// <summary>
+        /// Defines the <see cref="Bounds"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Visual, Rect> BoundsProperty =
+            AvaloniaProperty.RegisterDirect<Visual, Rect>(nameof(Bounds), o => o.Bounds);
+
+        public static readonly DirectProperty<Visual, TransformedBounds?> TransformedBoundsProperty =
+            AvaloniaProperty.RegisterDirect<Visual, TransformedBounds?>(
+                nameof(TransformedBounds),
+                o => o.TransformedBounds);
+
+        /// <summary>
+        /// Defines the <see cref="ClipToBounds"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> ClipToBoundsProperty =
+            AvaloniaProperty.Register<Visual, bool>(nameof(ClipToBounds));
+
+        /// <summary>
+        /// Defines the <see cref="Clip"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Geometry?> ClipProperty =
+            AvaloniaProperty.Register<Visual, Geometry?>(nameof(Clip));
+
+        /// <summary>
+        /// Defines the <see cref="IsVisibleProperty"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsVisibleProperty =
+            AvaloniaProperty.Register<Visual, bool>(nameof(IsVisible), true);
+
+        /// <summary>
+        /// Defines the <see cref="Opacity"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> OpacityProperty =
+            AvaloniaProperty.Register<Visual, double>(nameof(Opacity), 1);
+
+        /// <summary>
+        /// Defines the <see cref="OpacityMask"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> OpacityMaskProperty =
+            AvaloniaProperty.Register<Visual, IBrush?>(nameof(OpacityMask));
+
+        /// <summary>
+        /// Defines the <see cref="HasMirrorTransform"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Visual, bool> HasMirrorTransformProperty =
+            AvaloniaProperty.RegisterDirect<Visual, bool>(nameof(HasMirrorTransform), o => o.HasMirrorTransform);
+
+        /// <summary>
+        /// Defines the <see cref="RenderTransform"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ITransform?> RenderTransformProperty =
+            AvaloniaProperty.Register<Visual, ITransform?>(nameof(RenderTransform));
+
+        /// <summary>
+        /// Defines the <see cref="RenderTransformOrigin"/> property.
+        /// </summary>
+        public static readonly StyledProperty<RelativePoint> RenderTransformOriginProperty =
+            AvaloniaProperty.Register<Visual, RelativePoint>(nameof(RenderTransformOrigin), defaultValue: RelativePoint.Center);
+
+        /// <summary>
+        /// Defines the <see cref="IVisual.VisualParent"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Visual, IVisual?> VisualParentProperty =
+            AvaloniaProperty.RegisterDirect<Visual, IVisual?>(nameof(IVisual.VisualParent), o => o._visualParent);
+
+        /// <summary>
+        /// Defines the <see cref="ZIndex"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> ZIndexProperty =
+            AvaloniaProperty.Register<Visual, int>(nameof(ZIndex));
+        
+        private static readonly WeakEvent<IAffectsRender, EventArgs> InvalidatedWeakEvent =
+            WeakEvent.Register<IAffectsRender>(
+                (s, h) => s.Invalidated += h,
+                (s, h) => s.Invalidated -= h);
+
+        private Rect _bounds;
+        private TransformedBounds? _transformedBounds;
+        private IRenderRoot? _visualRoot;
+        private IVisual? _visualParent;
+        private bool _hasMirrorTransform;
+        private TargetWeakEventSubscriber<Visual, EventArgs>? _affectsRenderWeakSubscriber;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="Visual"/> class.
+        /// </summary>
+        static Visual()
+        {
+            AffectsRender<Visual>(
+                BoundsProperty,
+                ClipProperty,
+                ClipToBoundsProperty,
+                IsVisibleProperty,
+                OpacityProperty,
+                HasMirrorTransformProperty);
+            RenderTransformProperty.Changed.Subscribe(RenderTransformChanged);
+            ZIndexProperty.Changed.Subscribe(ZIndexChanged);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Visual"/> class.
+        /// </summary>
+        public Visual()
+        {
+            // Disable transitions until we're added to the visual tree.
+            DisableTransitions();
+
+            var visualChildren = new AvaloniaList<IVisual>();
+            visualChildren.ResetBehavior = ResetBehavior.Remove;
+            visualChildren.Validate = visual => ValidateVisualChild(visual);
+            visualChildren.CollectionChanged += VisualChildrenChanged;
+            VisualChildren = visualChildren;
+        }
+
+        /// <summary>
+        /// Raised when the control is attached to a rooted visual tree.
+        /// </summary>
+        public event EventHandler<VisualTreeAttachmentEventArgs>? AttachedToVisualTree;
+
+        /// <summary>
+        /// Raised when the control is detached from a rooted visual tree.
+        /// </summary>
+        public event EventHandler<VisualTreeAttachmentEventArgs>? DetachedFromVisualTree;
+
+        /// <summary>
+        /// Gets the bounds of the control relative to its parent.
+        /// </summary>
+        public Rect Bounds
+        {
+            get { return _bounds; }
+            protected set { SetAndRaise(BoundsProperty, ref _bounds, value); }
+        }
+
+        /// <summary>
+        /// Gets the bounds of the control relative to the window, accounting for rendering transforms.
+        /// </summary>
+        public TransformedBounds? TransformedBounds => _transformedBounds;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control should be clipped to its bounds.
+        /// </summary>
+        public bool ClipToBounds
+        {
+            get { return GetValue(ClipToBoundsProperty); }
+            set { SetValue(ClipToBoundsProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the geometry clip for this visual.
+        /// </summary>
+        public Geometry? Clip
+        {
+            get { return GetValue(ClipProperty); }
+            set { SetValue(ClipProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this control and all its parents are visible.
+        /// </summary>
+        public bool IsEffectivelyVisible
+        {
+            get
+            {
+                IVisual? node = this;
+
+                while (node != null)
+                {
+                    if (!node.IsVisible)
+                    {
+                        return false;
+                    }
+
+                    node = node.VisualParent;
+                }
+
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this control is visible.
+        /// </summary>
+        public bool IsVisible
+        {
+            get { return GetValue(IsVisibleProperty); }
+            set { SetValue(IsVisibleProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the opacity of the control.
+        /// </summary>
+        public double Opacity
+        {
+            get { return GetValue(OpacityProperty); }
+            set { SetValue(OpacityProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the opacity mask of the control.
+        /// </summary>
+        public IBrush? OpacityMask
+        {
+            get { return GetValue(OpacityMaskProperty); }
+            set { SetValue(OpacityMaskProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to apply mirror transform on this control.
+        /// </summary>
+        public bool HasMirrorTransform 
+        { 
+            get { return _hasMirrorTransform; }
+            protected set { SetAndRaise(HasMirrorTransformProperty, ref _hasMirrorTransform, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the render transform of the control.
+        /// </summary>
+        public ITransform? RenderTransform
+        {
+            get { return GetValue(RenderTransformProperty); }
+            set { SetValue(RenderTransformProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the transform origin of the control.
+        /// </summary>
+        public RelativePoint RenderTransformOrigin
+        {
+            get { return GetValue(RenderTransformOriginProperty); }
+            set { SetValue(RenderTransformOriginProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z index of the control.
+        /// </summary>
+        /// <remarks>
+        /// Controls with a higher <see cref="ZIndex"/> will appear in front of controls with
+        /// a lower ZIndex. If two controls have the same ZIndex then the control that appears
+        /// later in the containing element's children collection will appear on top.
+        /// </remarks>
+        public int ZIndex
+        {
+            get { return GetValue(ZIndexProperty); }
+            set { SetValue(ZIndexProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the control's child visuals.
+        /// </summary>
+        protected IAvaloniaList<IVisual> VisualChildren
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets the root of the visual tree, if the control is attached to a visual tree.
+        /// </summary>
+        protected IRenderRoot? VisualRoot => _visualRoot ?? (this as IRenderRoot);
+
+        /// <summary>
+        /// Gets a value indicating whether this control is attached to a visual root.
+        /// </summary>
+        bool IVisual.IsAttachedToVisualTree => VisualRoot != null;
+
+        /// <summary>
+        /// Gets the control's child controls.
+        /// </summary>
+        IAvaloniaReadOnlyList<IVisual> IVisual.VisualChildren => VisualChildren;
+
+        /// <summary>
+        /// Gets the control's parent visual.
+        /// </summary>
+        IVisual? IVisual.VisualParent => _visualParent;
+
+        /// <summary>
+        /// Gets the root of the visual tree, if the control is attached to a visual tree.
+        /// </summary>
+        IRenderRoot? IVisual.VisualRoot => VisualRoot;
+        
+        TransformedBounds? IVisual.TransformedBounds
+        {
+            get { return _transformedBounds; }
+            set { SetAndRaise(TransformedBoundsProperty, ref _transformedBounds, value); }
+        }
+
+        /// <summary>
+        /// Invalidates the visual and queues a repaint.
+        /// </summary>
+        public void InvalidateVisual()
+        {
+            VisualRoot?.Renderer?.AddDirty(this);
+        }
+
+        /// <summary>
+        /// Renders the visual to a <see cref="DrawingContext"/>.
+        /// </summary>
+        /// <param name="context">The drawing context.</param>
+        public virtual void Render(DrawingContext context)
+        {
+            Contract.Requires<ArgumentNullException>(context != null);
+        }
+
+        /// <summary>
+        /// Indicates that a property change should cause <see cref="InvalidateVisual"/> to be
+        /// called.
+        /// </summary>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// This method should be called in a control's static constructor with each property
+        /// on the control which when changed should cause a redraw. This is similar to WPF's
+        /// FrameworkPropertyMetadata.AffectsRender flag.
+        /// </remarks>
+        [Obsolete("Use AffectsRender<T> and specify the control type.")]
+        protected static void AffectsRender(params AvaloniaProperty[] properties)
+        {
+            AffectsRender<Visual>(properties);
+        }
+
+        /// <summary>
+        /// Indicates that a property change should cause <see cref="InvalidateVisual"/> to be
+        /// called.
+        /// </summary>
+        /// <typeparam name="T">The control which the property affects.</typeparam>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// This method should be called in a control's static constructor with each property
+        /// on the control which when changed should cause a redraw. This is similar to WPF's
+        /// FrameworkPropertyMetadata.AffectsRender flag.
+        /// </remarks>
+        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
+            where T : Visual
+        {
+            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                if (e.Sender is T sender)
+                {
+                    sender.InvalidateVisual();
+                }
+            }
+
+            static void InvalidateAndSubscribe(AvaloniaPropertyChangedEventArgs e)
+            {
+                if (e.Sender is T sender)
+                {
+                    if (e.OldValue is IAffectsRender oldValue)
+                    {
+                        if (sender._affectsRenderWeakSubscriber != null)
+                            InvalidatedWeakEvent.Unsubscribe(oldValue, sender._affectsRenderWeakSubscriber);
+                    }
+
+                    if (e.NewValue is IAffectsRender newValue)
+                    {
+                        if (sender._affectsRenderWeakSubscriber == null)
+                        {
+                            sender._affectsRenderWeakSubscriber = new TargetWeakEventSubscriber<Visual, EventArgs>(
+                                sender, static (target, _, _, _) =>
+                                {
+                                    target.InvalidateVisual();
+                                });
+                        }
+                        InvalidatedWeakEvent.Subscribe(newValue, sender._affectsRenderWeakSubscriber);
+                    }
+
+                    sender.InvalidateVisual();
+                }
+            }
+
+            foreach (var property in properties)
+            {
+                if (property.CanValueAffectRender())
+                {
+                    property.Changed.Subscribe(e => InvalidateAndSubscribe(e));
+                }
+                else
+                {
+                    property.Changed.Subscribe(e => Invalidate(e));
+                }
+            }
+        }
+
+        protected override void LogicalChildrenCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            base.LogicalChildrenCollectionChanged(sender, e);
+            VisualRoot?.Renderer?.RecalculateChildren(this);
+        }
+
+        /// <summary>
+        /// Calls the <see cref="OnAttachedToVisualTree(VisualTreeAttachmentEventArgs)"/> method 
+        /// for this control and all of its visual descendants.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            Logger.TryGet(LogEventLevel.Verbose, LogArea.Visual)?.Log(this, "Attached to visual tree");
+
+            _visualRoot = e.Root;
+
+            if (RenderTransform is IMutableTransform mutableTransform)
+            {
+                mutableTransform.Changed += RenderTransformChanged;
+            }
+
+            EnableTransitions();
+            OnAttachedToVisualTree(e);
+            AttachedToVisualTree?.Invoke(this, e);
+            InvalidateVisual();
+
+            var visualChildren = VisualChildren;
+
+            if (visualChildren != null)
+            {
+                var visualChildrenCount = visualChildren.Count;
+
+                for (var i = 0; i < visualChildrenCount; i++)
+                {
+                    if (visualChildren[i] is Visual child)
+                    {
+                        child.OnAttachedToVisualTreeCore(e);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Calls the <see cref="OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs)"/> method 
+        /// for this control and all of its visual descendants.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            Logger.TryGet(LogEventLevel.Verbose, LogArea.Visual)?.Log(this, "Detached from visual tree");
+
+            _visualRoot = null;
+
+            if (RenderTransform is IMutableTransform mutableTransform)
+            {
+                mutableTransform.Changed -= RenderTransformChanged;
+            }
+
+            DisableTransitions();
+            OnDetachedFromVisualTree(e);
+            DetachedFromVisualTree?.Invoke(this, e);
+            e.Root?.Renderer?.AddDirty(this);
+
+            var visualChildren = VisualChildren;
+
+            if (visualChildren != null)
+            {
+                var visualChildrenCount = visualChildren.Count;
+
+                for (var i = 0; i < visualChildrenCount; i++)
+                {
+                    if (visualChildren[i] is Visual child)
+                    {
+                        child.OnDetachedFromVisualTreeCore(e);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the control is added to a rooted visual tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called when the control is removed from a rooted visual tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called when the control's visual parent changes.
+        /// </summary>
+        /// <param name="oldParent">The old visual parent.</param>
+        /// <param name="newParent">The new visual parent.</param>
+        protected virtual void OnVisualParentChanged(IVisual? oldParent, IVisual? newParent)
+        {
+            RaisePropertyChanged(
+                VisualParentProperty,
+                new Optional<IVisual?>(oldParent),
+                new BindingValue<IVisual?>(newParent),
+                BindingPriority.LocalValue);
+        }
+
+        protected internal sealed override void LogBindingError(AvaloniaProperty property, Exception e)
+        {
+            // Don't log a binding error unless the control is attached to a logical tree.
+            if (((ILogical)this).IsAttachedToLogicalTree)
+            {
+                if (e is BindingChainException b &&
+                    string.IsNullOrEmpty(b.ExpressionErrorPoint) &&
+                    DataContext == null)
+                {
+                    // The error occurred at the root of the binding chain and DataContext is null;
+                    // don't log this - the DataContext probably hasn't been set up yet.
+                    return;
+                }
+
+                Logger.TryGet(LogEventLevel.Warning, LogArea.Binding)?.Log(
+                    this,
+                    "Error in binding to {Target}.{Property}: {Message}",
+                    this,
+                    property,
+                    e.Message);
+            }
+        }
+
+        /// <summary>
+        /// Called when a visual's <see cref="RenderTransform"/> changes.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void RenderTransformChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var sender = e.Sender as Visual;
+
+            if (sender?.VisualRoot != null)
+            {
+                var oldValue = e.OldValue as Transform;
+                var newValue = e.NewValue as Transform;
+
+                if (oldValue != null)
+                {
+                    oldValue.Changed -= sender.RenderTransformChanged;
+                }
+
+                if (newValue != null)
+                {
+                    newValue.Changed += sender.RenderTransformChanged;
+                }
+
+                sender.InvalidateVisual();
+            }
+        }
+
+        /// <summary>
+        /// Ensures a visual child is not null and not already parented.
+        /// </summary>
+        /// <param name="c">The visual child.</param>
+        private static void ValidateVisualChild(IVisual c)
+        {
+            if (c == null)
+            {
+                throw new ArgumentNullException(nameof(c), "Cannot add null to VisualChildren.");
+            }
+
+            if (c.VisualParent != null)
+            {
+                throw new InvalidOperationException("The control already has a visual parent.");
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="ZIndex"/> property changes on any control.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void ZIndexChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var sender = e.Sender as IVisual;
+            var parent = sender?.VisualParent;
+            sender?.InvalidateVisual();
+            parent?.VisualRoot?.Renderer?.RecalculateChildren(parent);
+        }
+
+        /// <summary>
+        /// Called when the <see cref="RenderTransform"/>'s <see cref="Transform.Changed"/> event
+        /// is fired.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private void RenderTransformChanged(object? sender, EventArgs e)
+        {
+            InvalidateVisual();
+        }
+
+        /// <summary>
+        /// Sets the visual parent of the Visual.
+        /// </summary>
+        /// <param name="value">The visual parent.</param>
+        private void SetVisualParent(Visual? value)
+        {
+            if (_visualParent == value)
+            {
+                return;
+            }
+
+            var old = _visualParent;
+            _visualParent = value;
+
+            if (_visualRoot != null)
+            {
+                var e = new VisualTreeAttachmentEventArgs(old!, _visualRoot);
+                OnDetachedFromVisualTreeCore(e);
+            }
+
+            if (_visualParent is IRenderRoot || _visualParent?.IsAttachedToVisualTree == true)
+            {
+                var root = this.FindAncestorOfType<IRenderRoot>() ??
+                    throw new AvaloniaInternalException("Visual is atached to visual tree but root could not be found.");
+                var e = new VisualTreeAttachmentEventArgs(_visualParent, root);
+                OnAttachedToVisualTreeCore(e);
+            }
+
+            OnVisualParentChanged(old, value);
+        }
+
+        /// <summary>
+        /// Called when the <see cref="VisualChildren"/> collection changes.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private void VisualChildrenChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    SetVisualParent(e.NewItems!, this);
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    SetVisualParent(e.OldItems!, null);
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    SetVisualParent(e.OldItems!, null);
+                    SetVisualParent(e.NewItems!, this);
+                    break;
+            }
+        }
+        
+        private static void SetVisualParent(IList children, Visual? parent)
+        {
+            var count = children.Count;
+
+            for (var i = 0; i < count; i++)
+            {
+                var visual = (Visual) children[i]!;
+                
+                visual.SetVisualParent(parent);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/VisualExtensions.cs b/src/Avalonia.Base/VisualExtensions.cs
new file mode 100644
index 0000000000..7a5bbb105c
--- /dev/null
+++ b/src/Avalonia.Base/VisualExtensions.cs
@@ -0,0 +1,138 @@
+using System;
+using Avalonia.VisualTree;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Extension methods for <see cref="IVisual"/>.
+    /// </summary>
+    public static class VisualExtensions
+    {
+        /// <summary>
+        /// Converts a point from screen to client coordinates.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <param name="point">The point in screen coordinates.</param>
+        /// <returns>The point in client coordinates.</returns>
+        public static Point PointToClient(this IVisual visual, PixelPoint point)
+        {
+            var root = visual.VisualRoot ??
+                throw new ArgumentException("Control does not belong to a visual tree.", nameof(visual));
+            var rootPoint = root.PointToClient(point);
+            return root.TranslatePoint(rootPoint, visual)!.Value;
+        }
+
+        /// <summary>
+        /// Converts a point from client to screen coordinates.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <param name="point">The point in client coordinates.</param>
+        /// <returns>The point in screen coordinates.</returns>
+        public static PixelPoint PointToScreen(this IVisual visual, Point point)
+        {
+            var root = visual.VisualRoot ??
+                throw new ArgumentException("Control does not belong to a visual tree.", nameof(visual));
+            var p = visual.TranslatePoint(point, root);
+            return visual.VisualRoot.PointToScreen(p!.Value);
+        }
+
+        /// <summary>
+        /// Returns a transform that transforms the visual's coordinates into the coordinates
+        /// of the specified <paramref name="to"/>.
+        /// </summary>
+        /// <param name="from">The visual whose coordinates are to be transformed.</param>
+        /// <param name="to">The visual to translate the coordinates to.</param>
+        /// <returns>
+        /// A <see cref="Matrix"/> containing the transform or null if the visuals don't share a
+        /// common ancestor.
+        /// </returns>
+        public static Matrix? TransformToVisual(this IVisual from, IVisual to)
+        {
+            var common = from.FindCommonVisualAncestor(to);
+
+            if (common != null)
+            {
+                var thisOffset = GetOffsetFrom(common, from);
+                var thatOffset = GetOffsetFrom(common, to);
+
+                if (!thatOffset.TryInvert(out var thatOffsetInverted))
+                {
+                    return null;
+                }
+
+                return thatOffsetInverted * thisOffset;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Translates a point relative to this visual to coordinates that are relative to the specified visual.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <param name="point">The point value, as relative to this visual.</param>
+        /// <param name="relativeTo">The visual to translate the given point into.</param>
+        /// <returns>
+        /// A point value, now relative to the target visual rather than this source element, or null if the
+        /// two elements have no common ancestor.
+        /// </returns>
+        public static Point? TranslatePoint(this IVisual visual, Point point, IVisual relativeTo)
+        {
+            var transform = visual.TransformToVisual(relativeTo);
+
+            if (transform.HasValue)
+            {
+                return point.Transform(transform.Value);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets a transform from an ancestor to a descendent.
+        /// </summary>
+        /// <param name="ancestor">The ancestor visual.</param>
+        /// <param name="visual">The visual.</param>
+        /// <returns>The transform.</returns>
+        private static Matrix GetOffsetFrom(IVisual ancestor, IVisual visual)
+        {
+            var result = Matrix.Identity;
+            IVisual? v = visual;
+
+            while (v != ancestor)
+            {
+                // this should be calculated BEFORE renderTransform
+                if (v.HasMirrorTransform)
+                {
+                    var mirrorMatrix = new Matrix(-1.0, 0.0, 0.0, 1.0, v.Bounds.Width, 0);
+                    result *= mirrorMatrix;
+                }
+
+                if (v.RenderTransform?.Value != null)
+                {
+                    var origin = v.RenderTransformOrigin.ToPixels(v.Bounds.Size);
+                    var offset = Matrix.CreateTranslation(origin);
+                    var renderTransform = (-offset) * v.RenderTransform.Value * (offset);
+
+                    result *= renderTransform;
+                }
+
+                var topLeft = v.Bounds.TopLeft;
+
+                if (topLeft != default)
+                {
+                    result *= Matrix.CreateTranslation(topLeft);
+                }
+
+                v = v.VisualParent;
+
+                if (v == null)
+                {
+                    throw new ArgumentException("'visual' is not a descendant of 'ancestor'.");
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/VisualTree/IHostedVisualTreeRoot.cs b/src/Avalonia.Base/VisualTree/IHostedVisualTreeRoot.cs
similarity index 100%
rename from src/Avalonia.Visuals/VisualTree/IHostedVisualTreeRoot.cs
rename to src/Avalonia.Base/VisualTree/IHostedVisualTreeRoot.cs
diff --git a/src/Avalonia.Base/VisualTree/IVisual.cs b/src/Avalonia.Base/VisualTree/IVisual.cs
new file mode 100644
index 0000000000..3b053fab38
--- /dev/null
+++ b/src/Avalonia.Base/VisualTree/IVisual.cs
@@ -0,0 +1,124 @@
+using System;
+using Avalonia.Collections;
+using Avalonia.Media;
+using Avalonia.Metadata;
+using Avalonia.Rendering;
+
+namespace Avalonia.VisualTree
+{
+    /// <summary>
+    /// Represents control that has a visual on-screen representation.
+    /// </summary>
+    /// <remarks>
+    /// The <see cref="IVisual"/> interface defines the interface required for a renderer to
+    /// render a control. You should not usually need to reference this interface unless
+    /// you are writing a renderer; instead use the extension methods defined in
+    /// <see cref="VisualExtensions"/> to traverse the visual tree. This interface is
+    /// implemented by <see cref="Visual"/>. It should not be necessary to implement it
+    /// anywhere else.
+    /// </remarks>
+    [NotClientImplementable]
+    public interface IVisual
+    {
+        /// <summary>
+        /// Raised when the control is attached to a rooted visual tree.
+        /// </summary>
+        event EventHandler<VisualTreeAttachmentEventArgs>? AttachedToVisualTree;
+
+        /// <summary>
+        /// Raised when the control is detached from a rooted visual tree.
+        /// </summary>
+        event EventHandler<VisualTreeAttachmentEventArgs>? DetachedFromVisualTree;
+
+        /// <summary>
+        /// Gets the bounds of the control relative to its parent.
+        /// </summary>
+        Rect Bounds { get; }
+
+        /// <summary>
+        /// Gets the bounds of the control relative to the window, accounting for rendering transforms.
+        /// </summary>
+        TransformedBounds? TransformedBounds { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether the control should be clipped to its bounds.
+        /// </summary>
+        bool ClipToBounds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the geometry clip for this visual.
+        /// </summary>
+        Geometry? Clip { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether this control is attached to a visual root.
+        /// </summary>
+        bool IsAttachedToVisualTree { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this control and all its parents are visible.
+        /// </summary>
+        bool IsEffectivelyVisible { get; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this control is visible.
+        /// </summary>
+        bool IsVisible { get; set; }
+
+        /// <summary>
+        /// Gets or sets the opacity of the control.
+        /// </summary>
+        double Opacity { get; set; }
+
+        /// <summary>
+        /// Gets or sets the opacity mask for the control.
+        /// </summary>
+        IBrush? OpacityMask { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether to apply mirror transform on this control.
+        /// </summary>
+        bool HasMirrorTransform { get; }
+
+        /// <summary>
+        /// Gets or sets the render transform of the control.
+        /// </summary>
+        ITransform? RenderTransform { get; set; }
+
+        /// <summary>
+        /// Gets or sets the render transform origin of the control.
+        /// </summary>
+        RelativePoint RenderTransformOrigin { get; set; }
+
+        /// <summary>
+        /// Gets the control's child visuals.
+        /// </summary>
+        IAvaloniaReadOnlyList<IVisual> VisualChildren { get; }
+
+        /// <summary>
+        /// Gets the control's parent visual.
+        /// </summary>
+        IVisual? VisualParent { get; }
+
+        /// <summary>
+        /// Gets the root of the visual tree, if the control is attached to a visual tree.
+        /// </summary>
+        IRenderRoot? VisualRoot { get; }
+
+        /// <summary>
+        /// Gets or sets the Z index of the node.
+        /// </summary>
+        int ZIndex { get; set; }
+
+        /// <summary>
+        /// Invalidates the visual and queues a repaint.
+        /// </summary>
+        void InvalidateVisual();
+
+        /// <summary>
+        /// Renders the control to a <see cref="DrawingContext"/>.
+        /// </summary>
+        /// <param name="context">The context.</param>
+        void Render(DrawingContext context);
+    }
+}
diff --git a/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs b/src/Avalonia.Base/VisualTree/IVisualTreeHost.cs
similarity index 100%
rename from src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs
rename to src/Avalonia.Base/VisualTree/IVisualTreeHost.cs
diff --git a/src/Avalonia.Visuals/VisualTree/IVisualWithRoundRectClip.cs b/src/Avalonia.Base/VisualTree/IVisualWithRoundRectClip.cs
similarity index 100%
rename from src/Avalonia.Visuals/VisualTree/IVisualWithRoundRectClip.cs
rename to src/Avalonia.Base/VisualTree/IVisualWithRoundRectClip.cs
diff --git a/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs b/src/Avalonia.Base/VisualTree/TransformedBounds.cs
similarity index 100%
rename from src/Avalonia.Visuals/VisualTree/TransformedBounds.cs
rename to src/Avalonia.Base/VisualTree/TransformedBounds.cs
diff --git a/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs b/src/Avalonia.Base/VisualTree/VisualExtensions.cs
similarity index 100%
rename from src/Avalonia.Visuals/VisualTree/VisualExtensions.cs
rename to src/Avalonia.Base/VisualTree/VisualExtensions.cs
diff --git a/src/Avalonia.Visuals/VisualTree/VisualLocator.cs b/src/Avalonia.Base/VisualTree/VisualLocator.cs
similarity index 100%
rename from src/Avalonia.Visuals/VisualTree/VisualLocator.cs
rename to src/Avalonia.Base/VisualTree/VisualLocator.cs
diff --git a/src/Avalonia.Visuals/VisualTreeAttachmentEventArgs.cs b/src/Avalonia.Base/VisualTreeAttachmentEventArgs.cs
similarity index 100%
rename from src/Avalonia.Visuals/VisualTreeAttachmentEventArgs.cs
rename to src/Avalonia.Base/VisualTreeAttachmentEventArgs.cs
diff --git a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
index e864ea2007..a801d338c3 100644
--- a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
+++ b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
@@ -62,37 +62,47 @@
       <Compile Include="../Avalonia.Base/Utilities/StyleClassParser.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Thickness.cs">
+      <Compile Include="../Avalonia.Base/Thickness.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Size.cs">
+      <Compile Include="../Avalonia.Base/Size.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Vector.cs">
+      <Compile Include="../Avalonia.Base/Vector.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Point.cs">
+      <Compile Include="../Avalonia.Base/Point.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Matrix.cs">
+      <Compile Include="../Avalonia.Base/Matrix.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/CornerRadius.cs">
+      <Compile Include="../Avalonia.Base/CornerRadius.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Media/Color.cs">
+      <Compile Include="../Avalonia.Base/Media/Color.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Visuals/Media/KnownColors.cs">
+      <Compile Include="../Avalonia.Base/Media/HslColor.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Base/Media/HsvColor.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Base/Media/KnownColors.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
       <Compile Include="../Avalonia.Controls/GridLength.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
+      <Compile Include="../Avalonia.Base/RelativePoint.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
       <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
       <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\**\obj\**\*.cs" />
       <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\src\XamlX\IL\SreTypeSystem.cs" />
       <PackageReference Include="Mono.Cecil" Version="0.11.2" />
       <PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" PrivateAssets="All" />
+      <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs b/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs
index ae2bf99d1e..c20b2f656e 100644
--- a/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs
+++ b/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs
@@ -105,7 +105,7 @@ namespace Avalonia.Build.Tasks
         {
             var typeToXamlIndex = new Dictionary<string, string>(); 
             
-            foreach (var s in sources.ToList())
+            foreach (var s in sources.ToArray())
             {
                 if (s.Path.ToLowerInvariant().EndsWith(".xaml") || s.Path.ToLowerInvariant().EndsWith(".paml") || s.Path.ToLowerInvariant().EndsWith(".axaml"))
                 {
diff --git a/src/Avalonia.Build.Tasks/Properties/launchSettings.json b/src/Avalonia.Build.Tasks/Properties/launchSettings.json
new file mode 100644
index 0000000000..e9f5af46d6
--- /dev/null
+++ b/src/Avalonia.Build.Tasks/Properties/launchSettings.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "Compile Sandbox": {
+      "commandName": "Project",
+      "executablePath": "$(SolutionDir)\\src\\Avalonia.Build.Tasks\\bin\\Debug\\net6.0\\Avalonia.Build.Tasks.exe",
+      "commandLineArgs": "$(SolutionDir)\\samples\\Sandbox\\obj\\Debug\\net6.0\\Avalonia\\original.dll $(SolutionDir)\\samples\\Sandbox\\bin\\Debug\\net6.0\\Sandbox.dll.refs $(SolutionDir)\\out.dll"
+    }
+  }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj b/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj
new file mode 100644
index 0000000000..e0790795c5
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <PackageId>Avalonia.Controls.ColorPicker</PackageId>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj" />
+    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
+    <ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />    
+    <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <!-- Compatibility with old apps -->
+    <EmbeddedResource Include="Themes\**\*.xaml" />
+  </ItemGroup>
+  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\EmbedXaml.props" />
+  <Import Project="..\..\build\JetBrains.Annotations.props" />
+  <Import Project="..\..\build\BuildTargets.targets" />
+  <!--<Import Project="..\..\build\ApiDiff.props" />-->
+  <Import Project="..\..\build\NullableEnable.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.DesignerSupport, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Avalonia.Controls.ColorPicker/ColorChangedEventArgs.cs b/src/Avalonia.Controls.ColorPicker/ColorChangedEventArgs.cs
new file mode 100644
index 0000000000..b1d15d6b17
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorChangedEventArgs.cs
@@ -0,0 +1,41 @@
+// Portions of this source file are adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using System;
+using Avalonia.Media;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Holds the details of a ColorChanged event.
+    /// </summary>
+    /// <remarks>
+    /// HSV color information is intentionally not provided.
+    /// Use <see cref="Color.ToHsv()"/> to obtain it.
+    /// </remarks>
+    public class ColorChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorChangedEventArgs"/> class.
+        /// </summary>
+        /// <param name="oldColor">The old/original color from before the change event.</param>
+        /// <param name="newColor">The new/updated color that triggered the change event.</param>
+        public ColorChangedEventArgs(Color oldColor, Color newColor)
+        {
+            OldColor = oldColor;
+            NewColor = newColor;
+        }
+
+        /// <summary>
+        /// Gets the old/original color from before the change event.
+        /// </summary>
+        public Color OldColor { get; private set; }
+
+        /// <summary>
+        /// Gets the new/updated color that triggered the change event.
+        /// </summary>
+        public Color NewColor { get; private set; }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorComponent.cs b/src/Avalonia.Controls.ColorPicker/ColorComponent.cs
new file mode 100644
index 0000000000..71725056cf
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorComponent.cs
@@ -0,0 +1,28 @@
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines a specific component within a color model.
+    /// </summary>
+    public enum ColorComponent
+    {
+        /// <summary>
+        /// Represents the alpha component.
+        /// </summary>
+        Alpha = 0,
+
+        /// <summary>
+        /// Represents the first color component which is Red when RGB or Hue when HSV.
+        /// </summary>
+        Component1 = 1,
+
+        /// <summary>
+        /// Represents the second color component which is Green when RGB or Saturation when HSV.
+        /// </summary>
+        Component2 = 2,
+
+        /// <summary>
+        /// Represents the third color component which is Blue when RGB or Value when HSV.
+        /// </summary>
+        Component3 = 3
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorModel.cs b/src/Avalonia.Controls.ColorPicker/ColorModel.cs
new file mode 100644
index 0000000000..f11b514706
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorModel.cs
@@ -0,0 +1,18 @@
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines the model used to represent colors.
+    /// </summary>
+    public enum ColorModel
+    {
+        /// <summary>
+        /// Color is represented by hue, saturation, value and alpha components.
+        /// </summary>
+        Hsva,
+
+        /// <summary>
+        /// Color is represented by red, green, blue and alpha components.
+        /// </summary>
+        Rgba
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorPreviewer/ColorPreviewer.Properties.cs b/src/Avalonia.Controls.ColorPicker/ColorPreviewer/ColorPreviewer.Properties.cs
new file mode 100644
index 0000000000..0fa6ab8083
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorPreviewer/ColorPreviewer.Properties.cs
@@ -0,0 +1,50 @@
+using Avalonia.Data;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <inheritdoc/>
+    public partial class ColorPreviewer
+    {
+        /// <summary>
+        /// Defines the <see cref="HsvColor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HsvColor> HsvColorProperty =
+            AvaloniaProperty.Register<ColorPreviewer, HsvColor>(
+                nameof(HsvColor),
+                Colors.Transparent.ToHsv(),
+                defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="ShowAccentColors"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> ShowAccentColorsProperty =
+            AvaloniaProperty.Register<ColorPreviewer, bool>(
+                nameof(ShowAccentColors),
+                true);
+
+        /// <summary>
+        /// Gets or sets the currently previewed color in the HSV color model.
+        /// </summary>
+        /// <remarks>
+        /// Only an HSV color is supported in this control to ensure there is never any
+        /// loss of precision or color information. Accent colors, like the color spectrum,
+        /// only operate with the HSV color model.
+        /// </remarks>
+        public HsvColor HsvColor
+        {
+            get => GetValue(HsvColorProperty);
+            set => SetValue(HsvColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether accent colors are shown along
+        /// with the preview color.
+        /// </summary>
+        public bool ShowAccentColors
+        {
+            get => GetValue(ShowAccentColorsProperty);
+            set => SetValue(ShowAccentColorsProperty, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorPreviewer/ColorPreviewer.cs b/src/Avalonia.Controls.ColorPicker/ColorPreviewer/ColorPreviewer.cs
new file mode 100644
index 0000000000..d04ddf4bd6
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorPreviewer/ColorPreviewer.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Globalization;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives.Converters;
+using Avalonia.Input;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Presents a preview color with optional accent colors.
+    /// </summary>
+    [TemplatePart(Name = nameof(AccentDec1Border), Type = typeof(Border))]
+    [TemplatePart(Name = nameof(AccentDec2Border), Type = typeof(Border))]
+    [TemplatePart(Name = nameof(AccentInc1Border), Type = typeof(Border))]
+    [TemplatePart(Name = nameof(AccentInc2Border), Type = typeof(Border))]
+    public partial class ColorPreviewer : TemplatedControl
+    {
+        /// <summary>
+        /// Event for when the selected color changes within the previewer.
+        /// This occurs when an accent color is pressed.
+        /// </summary>
+        public event EventHandler<ColorChangedEventArgs>? ColorChanged;
+
+        private bool eventsConnected = false;
+
+        private Border? AccentDec1Border;
+        private Border? AccentDec2Border;
+        private Border? AccentInc1Border;
+        private Border? AccentInc2Border;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorPreviewer"/> class.
+        /// </summary>
+        public ColorPreviewer() : base()
+        {
+        }
+
+        /// <summary>
+        /// Connects or disconnects all control event handlers.
+        /// </summary>
+        /// <param name="connected">True to connect event handlers, otherwise false.</param>
+        private void ConnectEvents(bool connected)
+        {
+            if (connected == true && eventsConnected == false)
+            {
+                // Add all events
+                if (AccentDec1Border != null) { AccentDec1Border.PointerPressed += AccentBorder_PointerPressed; }
+                if (AccentDec2Border != null) { AccentDec2Border.PointerPressed += AccentBorder_PointerPressed; }
+                if (AccentInc1Border != null) { AccentInc1Border.PointerPressed += AccentBorder_PointerPressed; }
+                if (AccentInc2Border != null) { AccentInc2Border.PointerPressed += AccentBorder_PointerPressed; }
+
+                eventsConnected = true;
+            }
+            else if (connected == false && eventsConnected == true)
+            {
+                // Remove all events
+                if (AccentDec1Border != null) { AccentDec1Border.PointerPressed -= AccentBorder_PointerPressed; }
+                if (AccentDec2Border != null) { AccentDec2Border.PointerPressed -= AccentBorder_PointerPressed; }
+                if (AccentInc1Border != null) { AccentInc1Border.PointerPressed -= AccentBorder_PointerPressed; }
+                if (AccentInc2Border != null) { AccentInc2Border.PointerPressed -= AccentBorder_PointerPressed; }
+
+                eventsConnected = false;
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            // Remove any existing events present if the control was previously loaded then unloaded
+            ConnectEvents(false);
+
+            AccentDec1Border = e.NameScope.Find<Border>(nameof(AccentDec1Border));
+            AccentDec2Border = e.NameScope.Find<Border>(nameof(AccentDec2Border));
+            AccentInc1Border = e.NameScope.Find<Border>(nameof(AccentInc1Border));
+            AccentInc2Border = e.NameScope.Find<Border>(nameof(AccentInc2Border));
+
+            // Must connect after controls are found
+            ConnectEvents(true);
+
+            base.OnApplyTemplate(e);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (change.Property == HsvColorProperty)
+            {
+                OnColorChanged(new ColorChangedEventArgs(
+                    change.GetOldValue<HsvColor>().ToRgb(),
+                    change.GetNewValue<HsvColor>().ToRgb()));
+            }
+
+            base.OnPropertyChanged(change);
+        }
+
+        /// <summary>
+        /// Called before the <see cref="ColorChanged"/> event occurs.
+        /// </summary>
+        /// <param name="e">The <see cref="ColorChangedEventArgs"/> defining old/new colors.</param>
+        protected virtual void OnColorChanged(ColorChangedEventArgs e)
+        {
+            ColorChanged?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Event handler for when an accent color border is pressed.
+        /// This will update the color to the background of the pressed panel.
+        /// </summary>
+        private void AccentBorder_PointerPressed(object? sender, PointerPressedEventArgs e)
+        {
+            Border? border = sender as Border;
+            int accentStep = 0;
+            HsvColor hsvColor = HsvColor;
+
+            // Get the value component delta
+            try
+            {
+                accentStep = int.Parse(border?.Tag?.ToString() ?? "", CultureInfo.InvariantCulture);
+            }
+            catch { }
+
+            HsvColor newHsvColor = AccentColorConverter.GetAccent(hsvColor, accentStep);
+            HsvColor oldHsvColor = HsvColor;
+
+            HsvColor = newHsvColor;
+            OnColorChanged(new ColorChangedEventArgs(oldHsvColor.ToRgb(), newHsvColor.ToRgb()));
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.Properties.cs b/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.Properties.cs
new file mode 100644
index 0000000000..31bd296288
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.Properties.cs
@@ -0,0 +1,146 @@
+using Avalonia.Data;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <inheritdoc/>
+    public partial class ColorSlider
+    {
+        /// <summary>
+        /// Defines the <see cref="Color"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Color> ColorProperty =
+            AvaloniaProperty.Register<ColorSlider, Color>(
+                nameof(Color),
+                Colors.White,
+                defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="ColorComponent"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ColorComponent> ColorComponentProperty =
+            AvaloniaProperty.Register<ColorSlider, ColorComponent>(
+                nameof(ColorComponent),
+                ColorComponent.Component1);
+
+        /// <summary>
+        /// Defines the <see cref="ColorModel"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ColorModel> ColorModelProperty =
+            AvaloniaProperty.Register<ColorSlider, ColorModel>(
+                nameof(ColorModel),
+                ColorModel.Rgba);
+
+        /// <summary>
+        /// Defines the <see cref="HsvColor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HsvColor> HsvColorProperty =
+            AvaloniaProperty.Register<ColorSlider, HsvColor>(
+                nameof(HsvColor),
+                Colors.White.ToHsv(),
+                defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="IsAlphaMaxForced"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsAlphaMaxForcedProperty =
+            AvaloniaProperty.Register<ColorSlider, bool>(
+                nameof(IsAlphaMaxForced),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsAutoUpdatingEnabled"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsAutoUpdatingEnabledProperty =
+            AvaloniaProperty.Register<ColorSlider, bool>(
+                nameof(IsAutoUpdatingEnabled),
+                true);
+
+        /// <summary>
+        /// Defines the <see cref="IsSaturationValueMaxForced"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsSaturationValueMaxForcedProperty =
+            AvaloniaProperty.Register<ColorSlider, bool>(
+                nameof(IsSaturationValueMaxForced),
+                true);
+
+        /// <summary>
+        /// Gets or sets the currently selected color in the RGB color model.
+        /// </summary>
+        /// <remarks>
+        /// Use this property instead of <see cref="HsvColor"/> when in <see cref="ColorModel.Rgba"/>
+        /// to avoid loss of precision and color drifting.
+        /// </remarks>
+        public Color Color
+        {
+            get => GetValue(ColorProperty);
+            set => SetValue(ColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the color component represented by the slider.
+        /// </summary>
+        public ColorComponent ColorComponent
+        {
+            get => GetValue(ColorComponentProperty);
+            set => SetValue(ColorComponentProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the active color model used by the slider.
+        /// </summary>
+        public ColorModel ColorModel
+        {
+            get => GetValue(ColorModelProperty);
+            set => SetValue(ColorModelProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the currently selected color in the HSV color model.
+        /// </summary>
+        /// <remarks>
+        /// Use this property instead of <see cref="Color"/> when in <see cref="ColorModel.Hsva"/>
+        /// to avoid loss of precision and color drifting.
+        /// </remarks>
+        public HsvColor HsvColor
+        {
+            get => GetValue(HsvColorProperty);
+            set => SetValue(HsvColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the alpha component is always forced to maximum for components
+        /// other than <see cref="ColorComponent"/>.
+        /// This ensures that the background is always visible and never transparent regardless of the actual color.
+        /// </summary>
+        public bool IsAlphaMaxForced
+        {
+            get => GetValue(IsAlphaMaxForcedProperty);
+            set => SetValue(IsAlphaMaxForcedProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether automatic background and foreground updates will be
+        /// calculated when the set color changes.
+        /// </summary>
+        /// <remarks>
+        /// This can be disabled for performance reasons when working with multiple sliders.
+        /// </remarks>
+        public bool IsAutoUpdatingEnabled
+        {
+            get => GetValue(IsAutoUpdatingEnabledProperty);
+            set => SetValue(IsAutoUpdatingEnabledProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the saturation and value components are always forced to maximum values
+        /// when using the HSVA color model. Only component values other than <see cref="ColorComponent"/> will be changed.
+        /// This ensures, for example, that the Hue background is always visible and never washed out regardless of the actual color.
+        /// </summary>
+        public bool IsSaturationValueMaxForced
+        {
+            get => GetValue(IsSaturationValueMaxForcedProperty);
+            set => SetValue(IsSaturationValueMaxForcedProperty, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.cs b/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.cs
new file mode 100644
index 0000000000..3c38c6ed1b
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.cs
@@ -0,0 +1,399 @@
+using System;
+using Avalonia.Controls.Metadata;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// A slider with a background that represents a single color component.
+    /// </summary>
+    [PseudoClasses(pcDarkSelector, pcLightSelector)]
+    public partial class ColorSlider : Slider
+    {
+        protected const string pcDarkSelector = ":dark-selector";
+        protected const string pcLightSelector = ":light-selector";
+
+        /// <summary>
+        /// Event for when the selected color changes within the slider.
+        /// </summary>
+        public event EventHandler<ColorChangedEventArgs>? ColorChanged;
+
+        private const double MaxHue = 359.99999999999999999; // 17 decimal places
+        private bool disableUpdates = false;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorSlider"/> class.
+        /// </summary>
+        public ColorSlider() : base()
+        {
+        }
+
+        /// <summary>
+        /// Updates the visual state of the control by applying latest PseudoClasses.
+        /// </summary>
+        private void UpdatePseudoClasses()
+        {
+            // The slider itself can be transparent for certain color values.
+            // This causes an issue where a white selector thumb over a light window background or
+            // a black selector thumb over a dark window background is not visible.
+            // This means under a certain alpha threshold, neither a white or black selector thumb
+            // should be shown and instead the default slider thumb color should be used instead.
+            if (Color.A < 128 &&
+                (IsAlphaMaxForced == false ||
+                 ColorComponent == ColorComponent.Alpha))
+            {
+                PseudoClasses.Set(pcDarkSelector, false);
+                PseudoClasses.Set(pcLightSelector, false);
+            }
+            else
+            {
+                Color perceivedColor;
+
+                if (ColorModel == ColorModel.Hsva)
+                {
+                    perceivedColor = GetEquivalentBackgroundColor(HsvColor).ToRgb();
+                }
+                else
+                {
+                    perceivedColor = GetEquivalentBackgroundColor(Color);
+                }
+
+                if (ColorHelper.GetRelativeLuminance(perceivedColor) <= 0.5)
+                {
+                    PseudoClasses.Set(pcDarkSelector, false);
+                    PseudoClasses.Set(pcLightSelector, true);
+                }
+                else
+                {
+                    PseudoClasses.Set(pcDarkSelector, true);
+                    PseudoClasses.Set(pcLightSelector, false);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Generates a new background image for the color slider and applies it.
+        /// </summary>
+        private async void UpdateBackground()
+        {
+            // In Avalonia, Bounds returns the actual device-independent pixel size of a control.
+            // However, this is not necessarily the size of the control rendered on a display.
+            // A desktop or application scaling factor may be applied which must be accounted for here.
+            // Remember bitmaps in Avalonia are rendered mapping to actual device pixels, not the device-
+            // independent pixels of controls.
+
+            var scale = LayoutHelper.GetLayoutScale(this);
+            var pixelWidth = Convert.ToInt32(Bounds.Width * scale);
+            var pixelHeight = Convert.ToInt32(Bounds.Height * scale);
+
+            if (pixelWidth != 0 && pixelHeight != 0)
+            {
+                var bitmap = await ColorPickerHelpers.CreateComponentBitmapAsync(
+                    pixelWidth,
+                    pixelHeight,
+                    Orientation,
+                    ColorModel,
+                    ColorComponent,
+                    HsvColor,
+                    IsAlphaMaxForced,
+                    IsSaturationValueMaxForced);
+
+                if (bitmap != null)
+                {
+                    Background = new ImageBrush(ColorPickerHelpers.CreateBitmapFromPixelData(bitmap, pixelWidth, pixelHeight));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the slider property values by applying the current color.
+        /// </summary>
+        /// <remarks>
+        /// Warning: This will trigger property changed updates.
+        /// Consider using <see cref="disableUpdates"/> externally.
+        /// </remarks>
+        private void SetColorToSliderValues()
+        {
+            var hsvColor = HsvColor;
+            var rgbColor = Color;
+            var component = ColorComponent;
+
+            if (ColorModel == ColorModel.Hsva)
+            {
+                // Note: Components converted into a usable range for the user
+                switch (component)
+                {
+                    case ColorComponent.Alpha:
+                        Minimum = 0;
+                        Maximum = 100;
+                        Value   = hsvColor.A * 100;
+                        break;
+                    case ColorComponent.Component1: // Hue
+                        Minimum = 0;
+                        Maximum = MaxHue;
+                        Value   = hsvColor.H;
+                        break;
+                    case ColorComponent.Component2: // Saturation
+                        Minimum = 0;
+                        Maximum = 100;
+                        Value   = hsvColor.S * 100;
+                        break;
+                    case ColorComponent.Component3: // Value
+                        Minimum = 0;
+                        Maximum = 100;
+                        Value   = hsvColor.V * 100;
+                        break;
+                }
+            }
+            else
+            {
+                switch (component)
+                {
+                    case ColorComponent.Alpha:
+                        Minimum = 0;
+                        Maximum = 255;
+                        Value   = Convert.ToDouble(rgbColor.A);
+                        break;
+                    case ColorComponent.Component1: // Red
+                        Minimum = 0;
+                        Maximum = 255;
+                        Value   = Convert.ToDouble(rgbColor.R);
+                        break;
+                    case ColorComponent.Component2: // Green
+                        Minimum = 0;
+                        Maximum = 255;
+                        Value   = Convert.ToDouble(rgbColor.G);
+                        break;
+                    case ColorComponent.Component3: // Blue
+                        Minimum = 0;
+                        Maximum = 255;
+                        Value   = Convert.ToDouble(rgbColor.B);
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the current color determined by the slider values.
+        /// </summary>
+        private (Color, HsvColor) GetColorFromSliderValues()
+        {
+            HsvColor hsvColor = new HsvColor();
+            Color rgbColor = new Color();
+            double sliderPercent = Value / (Maximum - Minimum);
+
+            var baseHsvColor = HsvColor;
+            var baseRgbColor = Color;
+            var component = ColorComponent;
+
+            if (ColorModel == ColorModel.Hsva)
+            {
+                switch (component)
+                {
+                    case ColorComponent.Alpha:
+                    {
+                        hsvColor = new HsvColor(sliderPercent, baseHsvColor.H, baseHsvColor.S, baseHsvColor.V);
+                        break;
+                    }
+                    case ColorComponent.Component1:
+                    {
+                        hsvColor = new HsvColor(baseHsvColor.A, sliderPercent * MaxHue, baseHsvColor.S, baseHsvColor.V);
+                        break;
+                    }
+                    case ColorComponent.Component2:
+                    {
+                        hsvColor = new HsvColor(baseHsvColor.A, baseHsvColor.H, sliderPercent, baseHsvColor.V);
+                        break;
+                    }
+                    case ColorComponent.Component3:
+                    {
+                        hsvColor = new HsvColor(baseHsvColor.A, baseHsvColor.H, baseHsvColor.S, sliderPercent);
+                        break;
+                    }
+                }
+
+                return (hsvColor.ToRgb(), hsvColor);
+            }
+            else
+            {
+                byte componentValue = Convert.ToByte(MathUtilities.Clamp(sliderPercent * 255, 0, 255));
+
+                switch (component)
+                {
+                    case ColorComponent.Alpha:
+                        rgbColor = new Color(componentValue, baseRgbColor.R, baseRgbColor.G, baseRgbColor.B);
+                        break;
+                    case ColorComponent.Component1:
+                        rgbColor = new Color(baseRgbColor.A, componentValue, baseRgbColor.G, baseRgbColor.B);
+                        break;
+                    case ColorComponent.Component2:
+                        rgbColor = new Color(baseRgbColor.A, baseRgbColor.R, componentValue, baseRgbColor.B);
+                        break;
+                    case ColorComponent.Component3:
+                        rgbColor = new Color(baseRgbColor.A, baseRgbColor.R, baseRgbColor.G, componentValue);
+                        break;
+                }
+
+                return (rgbColor, rgbColor.ToHsv());
+            }
+        }
+
+        /// <summary>
+        /// Gets the actual background color displayed for the given HSV color.
+        /// This can differ due to the effects of certain properties intended to improve perception.
+        /// </summary>
+        /// <param name="hsvColor">The actual color to get the equivalent background color for.</param>
+        /// <returns>The equivalent, perceived background color.</returns>
+        private HsvColor GetEquivalentBackgroundColor(HsvColor hsvColor)
+        {
+            var component = ColorComponent;
+            var isAlphaMaxForced = IsAlphaMaxForced;
+            var isSaturationValueMaxForced = IsSaturationValueMaxForced;
+
+            if (isAlphaMaxForced &&
+                component != ColorComponent.Alpha)
+            {
+                hsvColor = new HsvColor(1.0, hsvColor.H, hsvColor.S, hsvColor.V);
+            }
+
+            switch (component)
+            {
+                case ColorComponent.Component1:
+                    return new HsvColor(
+                        hsvColor.A,
+                        hsvColor.H,
+                        isSaturationValueMaxForced ? 1.0 : hsvColor.S,
+                        isSaturationValueMaxForced ? 1.0 : hsvColor.V);
+                case ColorComponent.Component2:
+                    return new HsvColor(
+                        hsvColor.A,
+                        hsvColor.H,
+                        hsvColor.S,
+                        isSaturationValueMaxForced ? 1.0 : hsvColor.V);
+                case ColorComponent.Component3:
+                    return new HsvColor(
+                        hsvColor.A,
+                        hsvColor.H,
+                        isSaturationValueMaxForced ? 1.0 : hsvColor.S,
+                        hsvColor.V);
+                default:
+                    return hsvColor;
+            }
+        }
+
+        /// <summary>
+        /// Gets the actual background color displayed for the given RGB color.
+        /// This can differ due to the effects of certain properties intended to improve perception.
+        /// </summary>
+        /// <param name="rgbColor">The actual color to get the equivalent background color for.</param>
+        /// <returns>The equivalent, perceived background color.</returns>
+        private Color GetEquivalentBackgroundColor(Color rgbColor)
+        {
+            var component = ColorComponent;
+            var isAlphaMaxForced = IsAlphaMaxForced;
+
+            if (isAlphaMaxForced &&
+                component != ColorComponent.Alpha)
+            {
+                rgbColor = new Color(255, rgbColor.R, rgbColor.G, rgbColor.B);
+            }
+
+            return rgbColor;
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (disableUpdates)
+            {
+                base.OnPropertyChanged(change);
+                return;
+            }
+
+            // Always keep the two color properties in sync
+            if (change.Property == ColorProperty)
+            {
+                disableUpdates = true;
+
+                HsvColor = Color.ToHsv();
+
+                if (IsAutoUpdatingEnabled)
+                {
+                    SetColorToSliderValues();
+                    UpdateBackground();
+                }
+
+                UpdatePseudoClasses();
+                OnColorChanged(new ColorChangedEventArgs(
+                    change.GetOldValue<Color>(),
+                    change.GetNewValue<Color>()));
+
+                disableUpdates = false;
+            }
+            else if (change.Property == HsvColorProperty)
+            {
+                disableUpdates = true;
+
+                Color = HsvColor.ToRgb();
+
+                if (IsAutoUpdatingEnabled)
+                {
+                    SetColorToSliderValues();
+                    UpdateBackground();
+                }
+
+                UpdatePseudoClasses();
+                OnColorChanged(new ColorChangedEventArgs(
+                    change.GetOldValue<HsvColor>().ToRgb(),
+                    change.GetNewValue<HsvColor>().ToRgb()));
+
+                disableUpdates = false;
+            }
+            else if (change.Property == BoundsProperty)
+            {
+                if (IsAutoUpdatingEnabled)
+                {
+                    UpdateBackground();
+                }
+            }
+            else if (change.Property == ValueProperty ||
+                     change.Property == MinimumProperty ||
+                     change.Property == MaximumProperty)
+            {
+                disableUpdates = true;
+
+                Color oldColor = Color;
+                (var color, var hsvColor) = GetColorFromSliderValues();
+
+                if (ColorModel == ColorModel.Hsva)
+                {
+                    HsvColor = hsvColor;
+                    Color = hsvColor.ToRgb();
+                }
+                else
+                {
+                    Color = color;
+                    HsvColor = color.ToHsv();
+                }
+
+                UpdatePseudoClasses();
+                OnColorChanged(new ColorChangedEventArgs(oldColor, Color));
+
+                disableUpdates = false;
+            }
+
+            base.OnPropertyChanged(change);
+        }
+
+        /// <summary>
+        /// Called before the <see cref="ColorChanged"/> event occurs.
+        /// </summary>
+        /// <param name="e">The <see cref="ColorChangedEventArgs"/> defining old/new colors.</param>
+        protected virtual void OnColorChanged(ColorChangedEventArgs e)
+        {
+            ColorChanged?.Invoke(this, e);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs
new file mode 100644
index 0000000000..587a89ee38
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs
@@ -0,0 +1,222 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using Avalonia.Data;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <inheritdoc/>
+    public partial class ColorSpectrum
+    {
+        /// <summary>
+        /// Defines the <see cref="Color"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Color> ColorProperty =
+            AvaloniaProperty.Register<ColorSpectrum, Color>(
+                nameof(Color),
+                Colors.White,
+                defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="Components"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ColorSpectrumComponents> ComponentsProperty =
+            AvaloniaProperty.Register<ColorSpectrum, ColorSpectrumComponents>(
+                nameof(Components),
+                ColorSpectrumComponents.HueSaturation);
+
+        /// <summary>
+        /// Defines the <see cref="HsvColor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HsvColor> HsvColorProperty =
+            AvaloniaProperty.Register<ColorSpectrum, HsvColor>(
+                nameof(HsvColor),
+                Colors.White.ToHsv(),
+                defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="MaxHue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MaxHueProperty =
+            AvaloniaProperty.Register<ColorSpectrum, int>(
+                nameof(MaxHue),
+                359);
+
+        /// <summary>
+        /// Defines the <see cref="MaxSaturation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MaxSaturationProperty =
+            AvaloniaProperty.Register<ColorSpectrum, int>(
+                nameof(MaxSaturation),
+                100);
+
+        /// <summary>
+        /// Defines the <see cref="MaxValue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MaxValueProperty =
+            AvaloniaProperty.Register<ColorSpectrum, int>(
+                nameof(MaxValue),
+                100);
+
+        /// <summary>
+        /// Defines the <see cref="MinHue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MinHueProperty =
+            AvaloniaProperty.Register<ColorSpectrum, int>(
+                nameof(MinHue),
+                0);
+
+        /// <summary>
+        /// Defines the <see cref="MinSaturation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MinSaturationProperty =
+            AvaloniaProperty.Register<ColorSpectrum, int>(
+                nameof(MinSaturation),
+                0);
+
+        /// <summary>
+        /// Defines the <see cref="MinValue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MinValueProperty =
+            AvaloniaProperty.Register<ColorSpectrum, int>(
+                nameof(MinValue),
+                0);
+
+        /// <summary>
+        /// Defines the <see cref="Shape"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ColorSpectrumShape> ShapeProperty =
+            AvaloniaProperty.Register<ColorSpectrum, ColorSpectrumShape>(
+                nameof(Shape),
+                ColorSpectrumShape.Box);
+
+        /// <summary>
+        /// Gets or sets the currently selected color in the RGB color model.
+        /// </summary>
+        /// <remarks>
+        /// For control authors use <see cref="HsvColor"/> instead to avoid loss
+        /// of precision and color drifting.
+        /// </remarks>
+        public Color Color
+        {
+            get => GetValue(ColorProperty);
+            set => SetValue(ColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the two HSV color components displayed by the spectrum.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public ColorSpectrumComponents Components
+        {
+            get => GetValue(ComponentsProperty);
+            set => SetValue(ComponentsProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the currently selected color in the HSV color model.
+        /// </summary>
+        /// <remarks>
+        /// This should be used in all cases instead of the <see cref="Color"/> property.
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model and using
+        /// this property will avoid loss of precision and color drifting.
+        /// </remarks>
+        public HsvColor HsvColor
+        {
+            get => GetValue(HsvColorProperty);
+            set => SetValue(HsvColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the Hue component in the range from 0..359.
+        /// This property must be greater than <see cref="MinHue"/>.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public int MaxHue
+        {
+            get => GetValue(MaxHueProperty);
+            set => SetValue(MaxHueProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the Saturation component in the range from 0..100.
+        /// This property must be greater than <see cref="MinSaturation"/>.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public int MaxSaturation
+        {
+            get => GetValue(MaxSaturationProperty);
+            set => SetValue(MaxSaturationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the Value component in the range from 0..100.
+        /// This property must be greater than <see cref="MinValue"/>.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public int MaxValue
+        {
+            get => GetValue(MaxValueProperty);
+            set => SetValue(MaxValueProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value of the Hue component in the range from 0..359.
+        /// This property must be less than <see cref="MaxHue"/>.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public int MinHue
+        {
+            get => GetValue(MinHueProperty);
+            set => SetValue(MinHueProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value of the Saturation component in the range from 0..100.
+        /// This property must be less than <see cref="MaxSaturation"/>.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public int MinSaturation
+        {
+            get => GetValue(MinSaturationProperty);
+            set => SetValue(MinSaturationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value of the Value component in the range from 0..100.
+        /// This property must be less than <see cref="MaxValue"/>.
+        /// </summary>
+        /// <remarks>
+        /// Internally, the <see cref="ColorSpectrum"/> uses the HSV color model.
+        /// </remarks>
+        public int MinValue
+        {
+            get => GetValue(MinValueProperty);
+            set => SetValue(MinValueProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the displayed shape of the spectrum.
+        /// </summary>
+        public ColorSpectrumShape Shape
+        {
+            get => GetValue(ShapeProperty);
+            set => SetValue(ShapeProperty, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
new file mode 100644
index 0000000000..245592207e
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
@@ -0,0 +1,1606 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Shapes;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Threading;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// A two dimensional spectrum for color selection.
+    /// </summary>
+    [TemplatePart("PART_InputTarget",              typeof(Canvas))]
+    [TemplatePart("PART_LayoutRoot",               typeof(Panel))]
+    [TemplatePart("PART_SelectionEllipsePanel",    typeof(Panel))]
+    [TemplatePart("PART_SizingPanel",              typeof(Panel))]
+    [TemplatePart("PART_SpectrumEllipse",          typeof(Ellipse))]
+    [TemplatePart("PART_SpectrumRectangle",        typeof(Rectangle))]
+    [TemplatePart("PART_SpectrumOverlayEllipse",   typeof(Ellipse))]
+    [TemplatePart("PART_SpectrumOverlayRectangle", typeof(Rectangle))]
+    [PseudoClasses(pcPressed, pcLargeSelector, pcDarkSelector, pcLightSelector)]
+    public partial class ColorSpectrum : TemplatedControl
+    {
+        protected const string pcPressed       = ":pressed";
+        protected const string pcDarkSelector  = ":dark-selector";
+        protected const string pcLargeSelector = ":large-selector";
+        protected const string pcLightSelector = ":light-selector";
+
+        /// <summary>
+        /// Event for when the selected color changes within the spectrum.
+        /// </summary>
+        public event EventHandler<ColorChangedEventArgs>? ColorChanged;
+
+        private bool _updatingColor = false;
+        private bool _updatingHsvColor = false;
+        private bool _isPointerOver = false;
+        private bool _isPointerPressed = false;
+        private bool _shouldShowLargeSelection = false;
+        private List<Hsv> _hsvValues = new List<Hsv>();
+
+        private IDisposable? _layoutRootDisposable;
+        private IDisposable? _selectionEllipsePanelDisposable;
+
+        // XAML template parts
+        private Panel? _layoutRoot;
+        private Panel? _sizingPanel;
+        private Rectangle? _spectrumRectangle;
+        private Ellipse? _spectrumEllipse;
+        private Rectangle? _spectrumOverlayRectangle;
+        private Ellipse? _spectrumOverlayEllipse;
+        private Canvas? _inputTarget;
+        private Panel? _selectionEllipsePanel;
+
+        // Put the spectrum images in a bitmap, which is then given to an ImageBrush.
+        private WriteableBitmap? _hueRedBitmap;
+        private WriteableBitmap? _hueYellowBitmap;
+        private WriteableBitmap? _hueGreenBitmap;
+        private WriteableBitmap? _hueCyanBitmap;
+        private WriteableBitmap? _hueBlueBitmap;
+        private WriteableBitmap? _huePurpleBitmap;
+
+        private WriteableBitmap? _saturationMinimumBitmap;
+        private WriteableBitmap? _saturationMaximumBitmap;
+
+        private WriteableBitmap? _valueBitmap;
+
+        // Fields used by UpdateEllipse() to ensure that it's using the data
+        // associated with the last call to CreateBitmapsAndColorMap(),
+        // in order to function properly while the asynchronous bitmap creation
+        // is in progress.
+        private ColorSpectrumShape _shapeFromLastBitmapCreation = ColorSpectrumShape.Box;
+        private ColorSpectrumComponents _componentsFromLastBitmapCreation = ColorSpectrumComponents.HueSaturation;
+        private double _imageWidthFromLastBitmapCreation = 0.0;
+        private double _imageHeightFromLastBitmapCreation = 0.0;
+        private int _minHueFromLastBitmapCreation = 0;
+        private int _maxHueFromLastBitmapCreation = 0;
+        private int _minSaturationFromLastBitmapCreation = 0;
+        private int _maxSaturationFromLastBitmapCreation = 0;
+        private int _minValueFromLastBitmapCreation = 0;
+        private int _maxValueFromLastBitmapCreation = 0;
+
+        private Color _oldColor = Color.FromArgb(255, 255, 255, 255);
+        private HsvColor _oldHsvColor = HsvColor.FromAhsv(0.0f, 0.0f, 1.0f, 1.0f);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ColorSpectrum"/> class.
+        /// </summary>
+        public ColorSpectrum()
+        {
+            _shapeFromLastBitmapCreation = Shape;
+            _componentsFromLastBitmapCreation = Components;
+            _imageWidthFromLastBitmapCreation = 0;
+            _imageHeightFromLastBitmapCreation = 0;
+            _minHueFromLastBitmapCreation = MinHue;
+            _maxHueFromLastBitmapCreation = MaxHue;
+            _minSaturationFromLastBitmapCreation = MinSaturation;
+            _maxSaturationFromLastBitmapCreation = MaxSaturation;
+            _minValueFromLastBitmapCreation = MinValue;
+            _maxValueFromLastBitmapCreation = MaxValue;
+        }
+
+        /// <inheritdoc/>
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            UnregisterEvents(); // Failsafe
+
+            _inputTarget = e.NameScope.Find<Canvas>("PART_InputTarget");
+            _layoutRoot = e.NameScope.Find<Panel>("PART_LayoutRoot");
+            _selectionEllipsePanel = e.NameScope.Find<Panel>("PART_SelectionEllipsePanel");
+            _sizingPanel = e.NameScope.Find<Panel>("PART_SizingPanel");
+            _spectrumEllipse = e.NameScope.Find<Ellipse>("PART_SpectrumEllipse");
+            _spectrumRectangle = e.NameScope.Find<Rectangle>("PART_SpectrumRectangle");
+            _spectrumOverlayEllipse = e.NameScope.Find<Ellipse>("PART_SpectrumOverlayEllipse");
+            _spectrumOverlayRectangle = e.NameScope.Find<Rectangle>("PART_SpectrumOverlayRectangle");
+
+            if (_inputTarget != null)
+            {
+                _inputTarget.PointerEnter += InputTarget_PointerEnter;
+                _inputTarget.PointerLeave += InputTarget_PointerLeave;
+                _inputTarget.PointerPressed += InputTarget_PointerPressed;
+                _inputTarget.PointerMoved += InputTarget_PointerMoved;
+                _inputTarget.PointerReleased += InputTarget_PointerReleased;
+            }
+
+            if (_layoutRoot != null)
+            {
+                _layoutRootDisposable = _layoutRoot.GetObservable(BoundsProperty).Subscribe(_ => 
+                {
+                    CreateBitmapsAndColorMap();
+                });
+            }
+
+            if (_selectionEllipsePanel != null)
+            {
+                _selectionEllipsePanelDisposable = _selectionEllipsePanel.GetObservable(FlowDirectionProperty).Subscribe(_ => 
+                {
+                    UpdateEllipse();
+                });
+            }
+
+            if (_selectionEllipsePanel != null &&
+                ColorHelper.ToDisplayNameExists)
+            {
+                ToolTip.SetTip(_selectionEllipsePanel, ColorHelper.ToDisplayName(Color));
+            }
+
+            // If we haven't yet created our bitmaps, do so now.
+            if (_hsvValues.Count == 0)
+            {
+                CreateBitmapsAndColorMap();
+            }
+
+            UpdateEllipse();
+            UpdatePseudoClasses();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            // OnAttachedToVisualTree is called after OnApplyTemplate so events cannot be connected here
+        }
+
+        /// <inheritdoc/>
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+        }
+
+        /// <summary>
+        /// Explicitly unregisters all events connected in OnApplyTemplate().
+        /// </summary>
+        private void UnregisterEvents()
+        {
+            _layoutRootDisposable?.Dispose();
+            _layoutRootDisposable = null;
+
+            _selectionEllipsePanelDisposable?.Dispose();
+            _selectionEllipsePanelDisposable = null;
+
+            if (_inputTarget != null)
+            {
+                _inputTarget.PointerEnter -= InputTarget_PointerEnter;
+                _inputTarget.PointerLeave -= InputTarget_PointerLeave;
+                _inputTarget.PointerPressed -= InputTarget_PointerPressed;
+                _inputTarget.PointerMoved -= InputTarget_PointerMoved;
+                _inputTarget.PointerReleased -= InputTarget_PointerReleased;
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            var key = e.Key;
+
+            if (key != Key.Left &&
+                key != Key.Right &&
+                key != Key.Up &&
+                key != Key.Down)
+            {
+                base.OnKeyDown(e);
+                return;
+            }
+
+            bool isControlDown = e.KeyModifiers.HasFlag(KeyModifiers.Control);
+
+            HsvComponent incrementComponent = HsvComponent.Hue;
+
+            bool isSaturationValue = false;
+
+            if (key == Key.Left ||
+                key == Key.Right)
+            {
+                switch (Components)
+                {
+                    case ColorSpectrumComponents.HueSaturation:
+                    case ColorSpectrumComponents.HueValue:
+                        incrementComponent = HsvComponent.Hue;
+                        break;
+
+                    case ColorSpectrumComponents.SaturationValue:
+                        isSaturationValue = true;
+                        goto case ColorSpectrumComponents.SaturationHue;
+                    case ColorSpectrumComponents.SaturationHue:
+                        incrementComponent = HsvComponent.Saturation;
+                        break;
+
+                    case ColorSpectrumComponents.ValueHue:
+                    case ColorSpectrumComponents.ValueSaturation:
+                        incrementComponent = HsvComponent.Value;
+                        break;
+                }
+            }
+            else if (key == Key.Up ||
+                     key == Key.Down)
+            {
+                switch (Components)
+                {
+                    case ColorSpectrumComponents.SaturationHue:
+                    case ColorSpectrumComponents.ValueHue:
+                        incrementComponent = HsvComponent.Hue;
+                        break;
+
+                    case ColorSpectrumComponents.HueSaturation:
+                    case ColorSpectrumComponents.ValueSaturation:
+                        incrementComponent = HsvComponent.Saturation;
+                        break;
+
+                    case ColorSpectrumComponents.SaturationValue:
+                        isSaturationValue = true;
+                        goto case ColorSpectrumComponents.HueValue;
+                    case ColorSpectrumComponents.HueValue:
+                        incrementComponent = HsvComponent.Value;
+                        break;
+                }
+            }
+
+            double minBound = 0.0;
+            double maxBound = 0.0;
+
+            switch (incrementComponent)
+            {
+                case HsvComponent.Hue:
+                    minBound = MinHue;
+                    maxBound = MaxHue;
+                    break;
+
+                case HsvComponent.Saturation:
+                    minBound = MinSaturation;
+                    maxBound = MaxSaturation;
+                    break;
+
+                case HsvComponent.Value:
+                    minBound = MinValue;
+                    maxBound = MaxValue;
+                    break;
+            }
+
+            // The order of saturation and value in the spectrum is reversed - the max value is at the bottom while the min value is at the top -
+            // so we want left and up to be lower for hue, but higher for saturation and value.
+            // This will ensure that the icon always moves in the direction of the key press.
+            IncrementDirection direction =
+                (incrementComponent == HsvComponent.Hue && (key == Key.Left || key == Key.Up)) ||
+                (incrementComponent != HsvComponent.Hue && (key == Key.Right || key == Key.Down)) ?
+                IncrementDirection.Lower :
+                IncrementDirection.Higher;
+
+            // Image is flipped in RightToLeft, so we need to invert direction in that case.
+            // The combination saturation and value is also flipped, so we need to invert in that case too.
+            // If both are false, we don't need to invert.
+            // If both are true, we would invert twice, so not invert at all.
+            if ((FlowDirection == FlowDirection.RightToLeft) != isSaturationValue &&
+                (key == Key.Left || key == Key.Right))
+            {
+                if (direction == IncrementDirection.Higher)
+                {
+                    direction = IncrementDirection.Lower;
+                }
+                else
+                {
+                    direction = IncrementDirection.Higher;
+                }
+            }
+
+            IncrementAmount amount = isControlDown ? IncrementAmount.Large : IncrementAmount.Small;
+
+            HsvColor hsvColor = HsvColor;
+            UpdateColor(ColorPickerHelpers.IncrementColorComponent(
+                new Hsv(hsvColor),
+                incrementComponent,
+                direction,
+                amount,
+                shouldWrap: true,
+                minBound,
+                maxBound));
+
+            e.Handled = true;
+        }
+
+        /// <inheritdoc/>
+        protected override void OnGotFocus(GotFocusEventArgs e)
+        {
+            // We only want to bother with the color name tool tip if we can provide color names.
+            if (_selectionEllipsePanel != null &&
+                ColorHelper.ToDisplayNameExists)
+            {
+                ToolTip.SetIsOpen(_selectionEllipsePanel, true);
+            }
+
+            UpdatePseudoClasses();
+
+            base.OnGotFocus(e);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnLostFocus(RoutedEventArgs e)
+        {
+            // We only want to bother with the color name tool tip if we can provide color names.
+            if (_selectionEllipsePanel != null &&
+                ColorHelper.ToDisplayNameExists)
+            {
+                ToolTip.SetIsOpen(_selectionEllipsePanel, false);
+            }
+
+            UpdatePseudoClasses();
+
+            base.OnLostFocus(e);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPointerLeave(PointerEventArgs e)
+        {
+            // We only want to bother with the color name tool tip if we can provide color names.
+            if (_selectionEllipsePanel != null &&
+                ColorHelper.ToDisplayNameExists)
+            {
+                ToolTip.SetIsOpen(_selectionEllipsePanel, false);
+            }
+
+            UpdatePseudoClasses();
+
+            base.OnPointerLeave(e);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (change.Property == ColorProperty)
+            {
+                // If we're in the process of internally updating the color,
+                // then we don't want to respond to the Color property changing.
+                if (!_updatingColor)
+                {
+                    Color color = Color;
+
+                    _updatingHsvColor = true;
+                    Hsv newHsv = (new Rgb(color)).ToHsv();
+                    HsvColor = newHsv.ToHsvColor(color.A / 255.0);
+                    _updatingHsvColor = false;
+
+                    UpdateEllipse();
+                    UpdateBitmapSources();
+                }
+
+                _oldColor = change.GetOldValue<Color>();
+            }
+            else if (change.Property == HsvColorProperty)
+            {
+                // If we're in the process of internally updating the HSV color,
+                // then we don't want to respond to the HsvColor property changing.
+                if (!_updatingHsvColor)
+                {
+                    SetColor();
+                }
+
+                _oldHsvColor = change.GetOldValue<HsvColor>();
+            }
+            else if (change.Property == MinHueProperty ||
+                     change.Property == MaxHueProperty)
+            {
+                int minHue = MinHue;
+                int maxHue = MaxHue;
+
+                if (minHue < 0 || minHue > 359)
+                {
+                    throw new ArgumentException("MinHue must be between 0 and 359.");
+                }
+                else if (maxHue < 0 || maxHue > 359)
+                {
+                    throw new ArgumentException("MaxHue must be between 0 and 359.");
+                }
+
+                ColorSpectrumComponents components = Components;
+
+                // If hue is one of the axes in the spectrum bitmap, then we'll need to regenerate it
+                // if the maximum or minimum value has changed.
+                if (components != ColorSpectrumComponents.SaturationValue &&
+                    components != ColorSpectrumComponents.ValueSaturation)
+                {
+                    CreateBitmapsAndColorMap();
+                }
+            }
+            else if (change.Property == MinSaturationProperty ||
+                     change.Property == MaxSaturationProperty)
+            {
+                int minSaturation = MinSaturation;
+                int maxSaturation = MaxSaturation;
+
+                if (minSaturation < 0 || minSaturation > 100)
+                {
+                    throw new ArgumentException("MinSaturation must be between 0 and 100.");
+                }
+                else if (maxSaturation < 0 || maxSaturation > 100)
+                {
+                    throw new ArgumentException("MaxSaturation must be between 0 and 100.");
+                }
+
+                ColorSpectrumComponents components = Components;
+
+                // If value is one of the axes in the spectrum bitmap, then we'll need to regenerate it
+                // if the maximum or minimum value has changed.
+                if (components != ColorSpectrumComponents.HueValue &&
+                    components != ColorSpectrumComponents.ValueHue)
+                {
+                    CreateBitmapsAndColorMap();
+                }
+            }
+            else if (change.Property == MinValueProperty ||
+                     change.Property == MaxValueProperty)
+            {
+                int minValue = MinValue;
+                int maxValue = MaxValue;
+
+                if (minValue < 0 || minValue > 100)
+                {
+                    throw new ArgumentException("MinValue must be between 0 and 100.");
+                }
+                else if (maxValue < 0 || maxValue > 100)
+                {
+                    throw new ArgumentException("MaxValue must be between 0 and 100.");
+                }
+
+                ColorSpectrumComponents components = Components;
+
+                // If value is one of the axes in the spectrum bitmap, then we'll need to regenerate it
+                // if the maximum or minimum value has changed.
+                if (components != ColorSpectrumComponents.HueSaturation &&
+                    components != ColorSpectrumComponents.SaturationHue)
+                {
+                    CreateBitmapsAndColorMap();
+                }
+            }
+            else if (change.Property == ShapeProperty)
+            {
+                CreateBitmapsAndColorMap();
+            }
+            else if (change.Property == ComponentsProperty)
+            {
+                CreateBitmapsAndColorMap();
+            }
+
+            base.OnPropertyChanged(change);
+        }
+
+        private void SetColor()
+        {
+            HsvColor hsvColor = HsvColor;
+
+            _updatingColor = true;
+            Rgb newRgb = (new Hsv(hsvColor)).ToRgb();
+
+            Color = newRgb.ToColor(hsvColor.A);
+
+            _updatingColor = false;
+
+            UpdateEllipse();
+            UpdateBitmapSources();
+            RaiseColorChanged();
+        }
+
+        public void RaiseColorChanged()
+        {
+            Color newColor = Color;
+
+            bool colorChanged =
+                _oldColor.A != newColor.A ||
+                _oldColor.R != newColor.R ||
+                _oldColor.G != newColor.G ||
+                _oldColor.B != newColor.B;
+
+            bool areBothColorsBlack =
+                (_oldColor.R == newColor.R && newColor.R == 0) ||
+                (_oldColor.G == newColor.G && newColor.G == 0) ||
+                (_oldColor.B == newColor.B && newColor.B == 0);
+
+            if (colorChanged || areBothColorsBlack)
+            {
+                var colorChangedEventArgs = new ColorChangedEventArgs(_oldColor, newColor);
+                ColorChanged?.Invoke(this, colorChangedEventArgs);
+
+                if (_selectionEllipsePanel != null &&
+                    ColorHelper.ToDisplayNameExists)
+                {
+                    ToolTip.SetTip(_selectionEllipsePanel, ColorHelper.ToDisplayName(Color));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the visual state of the control by applying latest PseudoClasses.
+        /// </summary>
+        private void UpdatePseudoClasses()
+        {
+            PseudoClasses.Set(pcPressed, _isPointerPressed);
+            // Note: The ":pointerover" pseudo class is set in the base Control
+
+            if (_isPointerPressed)
+            {
+                PseudoClasses.Set(pcLargeSelector, _shouldShowLargeSelection);
+            }
+            else
+            {
+                PseudoClasses.Set(pcLargeSelector, false);
+            }
+
+            if (SelectionEllipseShouldBeLight())
+            {
+                PseudoClasses.Set(pcDarkSelector, false);
+                PseudoClasses.Set(pcLightSelector, true);
+            }
+            else
+            {
+                PseudoClasses.Set(pcDarkSelector, true);
+                PseudoClasses.Set(pcLightSelector, false);
+            }
+        }
+
+        private void UpdateColor(Hsv newHsv)
+        {
+            _updatingColor = true;
+            _updatingHsvColor = true;
+
+            Rgb newRgb = newHsv.ToRgb();
+            double alpha = HsvColor.A;
+
+            Color = newRgb.ToColor(alpha);
+            HsvColor = newHsv.ToHsvColor(alpha);
+
+            UpdateEllipse();
+            UpdatePseudoClasses();
+
+            _updatingHsvColor = false;
+            _updatingColor = false;
+
+            RaiseColorChanged();
+        }
+
+        private void UpdateColorFromPoint(PointerPoint point)
+        {
+            // If we haven't initialized our HSV value array yet, then we should just ignore any user input -
+            // we don't yet know what to do with it.
+            if (_hsvValues.Count == 0)
+            {
+                return;
+            }
+
+            // Remember the bitmap size follows physical device pixels
+            var scale = LayoutHelper.GetLayoutScale(this);
+            double xPosition = point.Position.X * scale;
+            double yPosition = point.Position.Y * scale;
+            double radius = Math.Min(_imageWidthFromLastBitmapCreation, _imageHeightFromLastBitmapCreation) / 2;
+            double distanceFromRadius = Math.Sqrt(Math.Pow(xPosition - radius, 2) + Math.Pow(yPosition - radius, 2));
+
+            var shape = Shape;
+
+            // If the point is outside the circle, we should bring it back into the circle.
+            if (distanceFromRadius > radius && shape == ColorSpectrumShape.Ring)
+            {
+                xPosition = (radius / distanceFromRadius) * (xPosition - radius) + radius;
+                yPosition = (radius / distanceFromRadius) * (yPosition - radius) + radius;
+            }
+
+            // Now we need to find the index into the array of HSL values at each point in the spectrum m_image.
+            int x = (int)Math.Round(xPosition);
+            int y = (int)Math.Round(yPosition);
+            int width = (int)Math.Round(_imageWidthFromLastBitmapCreation);
+
+            if (x < 0)
+            {
+                x = 0;
+            }
+            else if (x >= _imageWidthFromLastBitmapCreation)
+            {
+                x = (int)Math.Round(_imageWidthFromLastBitmapCreation) - 1;
+            }
+
+            if (y < 0)
+            {
+                y = 0;
+            }
+            else if (y >= _imageHeightFromLastBitmapCreation)
+            {
+                y = (int)Math.Round(_imageHeightFromLastBitmapCreation) - 1;
+            }
+
+            // The gradient image contains two dimensions of HSL information, but not the third.
+            // We should keep the third where it already was.
+            // Note: This can sometimes cause a crash -- possibly due to differences in c# rounding. Therefore, index is now clamped.
+            Hsv hsvAtPoint = _hsvValues[MathUtilities.Clamp((y * width + x), 0, _hsvValues.Count - 1)];
+
+            var hsvColor = HsvColor;
+
+            switch (Components)
+            {
+                case ColorSpectrumComponents.HueValue:
+                case ColorSpectrumComponents.ValueHue:
+                    hsvAtPoint.S = hsvColor.S;
+                    break;
+
+                case ColorSpectrumComponents.HueSaturation:
+                case ColorSpectrumComponents.SaturationHue:
+                    hsvAtPoint.V = hsvColor.V;
+                    break;
+
+                case ColorSpectrumComponents.ValueSaturation:
+                case ColorSpectrumComponents.SaturationValue:
+                    hsvAtPoint.H = hsvColor.H;
+                    break;
+            }
+
+            UpdateColor(hsvAtPoint);
+        }
+
+        private void UpdateEllipse()
+        {
+            if (_selectionEllipsePanel == null)
+            {
+                return;
+            }
+
+            // If we don't have an image size yet, we shouldn't be showing the ellipse.
+            if (_imageWidthFromLastBitmapCreation == 0 ||
+                _imageHeightFromLastBitmapCreation == 0)
+            {
+                _selectionEllipsePanel.IsVisible = false;
+                return;
+            }
+            else
+            {
+                _selectionEllipsePanel.IsVisible = true;
+            }
+
+            double xPosition;
+            double yPosition;
+
+            Hsv hsvColor = new Hsv(HsvColor);
+
+            hsvColor.H = MathUtilities.Clamp(hsvColor.H, (double)_minHueFromLastBitmapCreation, (double)_maxHueFromLastBitmapCreation);
+            hsvColor.S = MathUtilities.Clamp(hsvColor.S, _minSaturationFromLastBitmapCreation / 100.0, _maxSaturationFromLastBitmapCreation / 100.0);
+            hsvColor.V = MathUtilities.Clamp(hsvColor.V, _minValueFromLastBitmapCreation / 100.0, _maxValueFromLastBitmapCreation / 100.0);
+
+            if (_shapeFromLastBitmapCreation == ColorSpectrumShape.Box)
+            {
+                double xPercent = 0;
+                double yPercent = 0;
+
+                double hPercent = (hsvColor.H - _minHueFromLastBitmapCreation) / (_maxHueFromLastBitmapCreation - _minHueFromLastBitmapCreation);
+                double sPercent = (hsvColor.S * 100.0 - _minSaturationFromLastBitmapCreation) / (_maxSaturationFromLastBitmapCreation - _minSaturationFromLastBitmapCreation);
+                double vPercent = (hsvColor.V * 100.0 - _minValueFromLastBitmapCreation) / (_maxValueFromLastBitmapCreation - _minValueFromLastBitmapCreation);
+
+                // In the case where saturation was an axis in the spectrum with hue, or value is an axis, full stop,
+                // we inverted the direction of that axis in order to put more hue on the outside of the ring,
+                // so we need to do similarly here when positioning the ellipse.
+                if (_componentsFromLastBitmapCreation == ColorSpectrumComponents.HueSaturation ||
+                    _componentsFromLastBitmapCreation == ColorSpectrumComponents.SaturationHue)
+                {
+                    sPercent = 1 - sPercent;
+                }
+                else
+                {
+                    vPercent = 1 - vPercent;
+                }
+
+                switch (_componentsFromLastBitmapCreation)
+                {
+                    case ColorSpectrumComponents.HueValue:
+                        xPercent = hPercent;
+                        yPercent = vPercent;
+                        break;
+
+                    case ColorSpectrumComponents.HueSaturation:
+                        xPercent = hPercent;
+                        yPercent = sPercent;
+                        break;
+
+                    case ColorSpectrumComponents.ValueHue:
+                        xPercent = vPercent;
+                        yPercent = hPercent;
+                        break;
+
+                    case ColorSpectrumComponents.ValueSaturation:
+                        xPercent = vPercent;
+                        yPercent = sPercent;
+                        break;
+
+                    case ColorSpectrumComponents.SaturationHue:
+                        xPercent = sPercent;
+                        yPercent = hPercent;
+                        break;
+
+                    case ColorSpectrumComponents.SaturationValue:
+                        xPercent = sPercent;
+                        yPercent = vPercent;
+                        break;
+                }
+
+                xPosition = _imageWidthFromLastBitmapCreation * xPercent;
+                yPosition = _imageHeightFromLastBitmapCreation * yPercent;
+            }
+            else
+            {
+                double thetaValue = 0;
+                double rValue = 0;
+
+                double hThetaValue =
+                    _maxHueFromLastBitmapCreation != _minHueFromLastBitmapCreation ?
+                    360 * (hsvColor.H - _minHueFromLastBitmapCreation) / (_maxHueFromLastBitmapCreation - _minHueFromLastBitmapCreation) :
+                    0;
+                double sThetaValue =
+                    _maxSaturationFromLastBitmapCreation != _minSaturationFromLastBitmapCreation ?
+                    360 * (hsvColor.S * 100.0 - _minSaturationFromLastBitmapCreation) / (_maxSaturationFromLastBitmapCreation - _minSaturationFromLastBitmapCreation) :
+                    0;
+                double vThetaValue =
+                    _maxValueFromLastBitmapCreation != _minValueFromLastBitmapCreation ?
+                    360 * (hsvColor.V * 100.0 - _minValueFromLastBitmapCreation) / (_maxValueFromLastBitmapCreation - _minValueFromLastBitmapCreation) :
+                    0;
+                double hRValue = _maxHueFromLastBitmapCreation != _minHueFromLastBitmapCreation ?
+                    (hsvColor.H - _minHueFromLastBitmapCreation) / (_maxHueFromLastBitmapCreation - _minHueFromLastBitmapCreation) - 1 :
+                    0;
+                double sRValue = _maxSaturationFromLastBitmapCreation != _minSaturationFromLastBitmapCreation ?
+                    (hsvColor.S * 100.0 - _minSaturationFromLastBitmapCreation) / (_maxSaturationFromLastBitmapCreation - _minSaturationFromLastBitmapCreation) - 1 :
+                    0;
+                double vRValue = _maxValueFromLastBitmapCreation != _minValueFromLastBitmapCreation ?
+                    (hsvColor.V * 100.0 - _minValueFromLastBitmapCreation) / (_maxValueFromLastBitmapCreation - _minValueFromLastBitmapCreation) - 1 :
+                    0;
+
+                // In the case where saturation was an axis in the spectrum with hue, or value is an axis, full stop,
+                // we inverted the direction of that axis in order to put more hue on the outside of the ring,
+                // so we need to do similarly here when positioning the ellipse.
+                if (_componentsFromLastBitmapCreation == ColorSpectrumComponents.HueSaturation ||
+                    _componentsFromLastBitmapCreation == ColorSpectrumComponents.SaturationHue)
+                {
+                    sThetaValue = 360 - sThetaValue;
+                    sRValue = -sRValue - 1;
+                }
+                else
+                {
+                    vThetaValue = 360 - vThetaValue;
+                    vRValue = -vRValue - 1;
+                }
+
+                switch (_componentsFromLastBitmapCreation)
+                {
+                    case ColorSpectrumComponents.HueValue:
+                        thetaValue = hThetaValue;
+                        rValue = vRValue;
+                        break;
+
+                    case ColorSpectrumComponents.HueSaturation:
+                        thetaValue = hThetaValue;
+                        rValue = sRValue;
+                        break;
+
+                    case ColorSpectrumComponents.ValueHue:
+                        thetaValue = vThetaValue;
+                        rValue = hRValue;
+                        break;
+
+                    case ColorSpectrumComponents.ValueSaturation:
+                        thetaValue = vThetaValue;
+                        rValue = sRValue;
+                        break;
+
+                    case ColorSpectrumComponents.SaturationHue:
+                        thetaValue = sThetaValue;
+                        rValue = hRValue;
+                        break;
+
+                    case ColorSpectrumComponents.SaturationValue:
+                        thetaValue = sThetaValue;
+                        rValue = vRValue;
+                        break;
+                }
+
+                double radius = Math.Min(_imageWidthFromLastBitmapCreation, _imageHeightFromLastBitmapCreation) / 2;
+
+                xPosition = (Math.Cos((thetaValue * Math.PI / 180.0) + Math.PI) * radius * rValue) + radius;
+                yPosition = (Math.Sin((thetaValue * Math.PI / 180.0) + Math.PI) * radius * rValue) + radius;
+            }
+
+            // Remember the bitmap size follows physical device pixels
+            var scale = LayoutHelper.GetLayoutScale(this);
+            Canvas.SetLeft(_selectionEllipsePanel, (xPosition / scale) - (_selectionEllipsePanel.Width / 2));
+            Canvas.SetTop(_selectionEllipsePanel, (yPosition / scale) - (_selectionEllipsePanel.Height / 2));
+
+            // We only want to bother with the color name tool tip if we can provide color names.
+            if (IsFocused &&
+                _selectionEllipsePanel != null &&
+                ColorHelper.ToDisplayNameExists)
+            {
+                ToolTip.SetIsOpen(_selectionEllipsePanel, true);
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        /// <inheritdoc cref="InputElement.PointerEnter"/>
+        private void InputTarget_PointerEnter(object? sender, PointerEventArgs args)
+        {
+            _isPointerOver = true;
+            UpdatePseudoClasses();
+            args.Handled = true;
+        }
+
+        /// <inheritdoc cref="InputElement.PointerLeave"/>
+        private void InputTarget_PointerLeave(object? sender, PointerEventArgs args)
+        {
+            _isPointerOver = false;
+            UpdatePseudoClasses();
+            args.Handled = true;
+        }
+
+        /// <inheritdoc cref="InputElement.PointerPressed"/>
+        private void InputTarget_PointerPressed(object? sender, PointerPressedEventArgs args)
+        {
+            var inputTarget = _inputTarget;
+
+            Focus();
+
+            _isPointerPressed = true;
+            _shouldShowLargeSelection =
+                // TODO: After Pen PR is merged: https://github.com/AvaloniaUI/Avalonia/pull/7412
+                // args.Pointer.Type == PointerType.Pen ||
+                args.Pointer.Type == PointerType.Touch;
+
+            args.Pointer.Capture(inputTarget);
+            UpdateColorFromPoint(args.GetCurrentPoint(inputTarget));
+            UpdatePseudoClasses();
+            UpdateEllipse();
+
+            args.Handled = true;
+        }
+
+        /// <inheritdoc cref="InputElement.PointerMoved"/>
+        private void InputTarget_PointerMoved(object? sender, PointerEventArgs args)
+        {
+            if (!_isPointerPressed)
+            {
+                return;
+            }
+
+            UpdateColorFromPoint(args.GetCurrentPoint(_inputTarget));
+            args.Handled = true;
+        }
+
+        /// <inheritdoc cref="InputElement.PointerReleased"/>
+        private void InputTarget_PointerReleased(object? sender, PointerReleasedEventArgs args)
+        {
+            _isPointerPressed = false;
+            _shouldShowLargeSelection = false;
+
+            args.Pointer.Capture(null);
+            UpdatePseudoClasses();
+            UpdateEllipse();
+
+            args.Handled = true;
+        }
+
+        private async void CreateBitmapsAndColorMap()
+        {
+            if (_layoutRoot == null ||
+                _sizingPanel == null ||
+                _inputTarget == null ||
+                _spectrumRectangle == null ||
+                _spectrumEllipse == null ||
+                _spectrumOverlayRectangle == null ||
+                _spectrumOverlayEllipse == null
+                /*|| SharedHelpers.IsInDesignMode*/)
+            {
+                return;
+            }
+
+            // We want ColorSpectrum to always be a square, so we'll take the smaller of the dimensions
+            // and size the sizing panel to that.
+            double minDimension = Math.Min(_layoutRoot.Bounds.Width, _layoutRoot.Bounds.Height);
+
+            if (minDimension == 0)
+            {
+                return;
+            }
+
+            _sizingPanel.Width = minDimension;
+            _sizingPanel.Height = minDimension;
+            _inputTarget.Width = minDimension;
+            _inputTarget.Height = minDimension;
+            _spectrumRectangle.Width = minDimension;
+            _spectrumRectangle.Height = minDimension;
+            _spectrumEllipse.Width = minDimension;
+            _spectrumEllipse.Height = minDimension;
+            _spectrumOverlayRectangle.Width = minDimension;
+            _spectrumOverlayRectangle.Height = minDimension;
+            _spectrumOverlayEllipse.Width = minDimension;
+            _spectrumOverlayEllipse.Height = minDimension;
+
+            HsvColor hsvColor = HsvColor;
+            int minHue = MinHue;
+            int maxHue = MaxHue;
+            int minSaturation = MinSaturation;
+            int maxSaturation = MaxSaturation;
+            int minValue = MinValue;
+            int maxValue = MaxValue;
+            ColorSpectrumShape shape = Shape;
+            ColorSpectrumComponents components = Components;
+
+            // If min >= max, then by convention, min is the only number that a property can have.
+            if (minHue >= maxHue)
+            {
+                maxHue = minHue;
+            }
+
+            if (minSaturation >= maxSaturation)
+            {
+                maxSaturation = minSaturation;
+            }
+
+            if (minValue >= maxValue)
+            {
+                maxValue = minValue;
+            }
+
+            Hsv hsv = new Hsv(hsvColor);
+
+            // The middle 4 are only needed and used in the case of hue as the third dimension.
+            // Saturation and luminosity need only a min and max.
+            List<byte> bgraMinPixelData = new List<byte>();
+            List<byte> bgraMiddle1PixelData = new List<byte>();
+            List<byte> bgraMiddle2PixelData = new List<byte>();
+            List<byte> bgraMiddle3PixelData = new List<byte>();
+            List<byte> bgraMiddle4PixelData = new List<byte>();
+            List<byte> bgraMaxPixelData = new List<byte>();
+            List<Hsv> newHsvValues = new List<Hsv>();
+
+            // In Avalonia, Bounds returns the actual device-independent pixel size of a control.
+            // However, this is not necessarily the size of the control rendered on a display.
+            // A desktop or application scaling factor may be applied which must be accounted for here.
+            // Remember bitmaps in Avalonia are rendered mapping to actual device pixels, not the device-
+            // independent pixels of controls.
+            var scale = LayoutHelper.GetLayoutScale(this);
+            int pixelDimension = (int)Math.Round(minDimension * scale);
+            var pixelCount = pixelDimension * pixelDimension;
+            var pixelDataSize = pixelCount * 4;
+            bgraMinPixelData.Capacity = pixelDataSize;
+
+            // We'll only save pixel data for the middle bitmaps if our third dimension is hue.
+            if (components == ColorSpectrumComponents.ValueSaturation ||
+                components == ColorSpectrumComponents.SaturationValue)
+            {
+                bgraMiddle1PixelData.Capacity = pixelDataSize;
+                bgraMiddle2PixelData.Capacity = pixelDataSize;
+                bgraMiddle3PixelData.Capacity = pixelDataSize;
+                bgraMiddle4PixelData.Capacity = pixelDataSize;
+            }
+
+            bgraMaxPixelData.Capacity = pixelDataSize;
+            newHsvValues.Capacity = pixelCount;
+
+            await Task.Run(() =>
+            {
+                // As the user perceives it, every time the third dimension not represented in the ColorSpectrum changes,
+                // the ColorSpectrum will visually change to accommodate that value.  For example, if the ColorSpectrum handles hue and luminosity,
+                // and the saturation externally goes from 1.0 to 0.5, then the ColorSpectrum will visually change to look more washed out
+                // to represent that third dimension's new value.
+                // Internally, however, we don't want to regenerate the ColorSpectrum bitmap every single time this happens, since that's very expensive.
+                // In order to make it so that we don't have to, we implement an optimization where, rather than having only one bitmap,
+                // we instead have multiple that we blend together using opacity to create the effect that we want.
+                // In the case where the third dimension is saturation or luminosity, we only need two: one bitmap at the minimum value
+                // of the third dimension, and one bitmap at the maximum.  Then we set the second's opacity at whatever the value of
+                // the third dimension is - e.g., a saturation of 0.5 implies an opacity of 50%.
+                // In the case where the third dimension is hue, we need six: one bitmap corresponding to red, yellow, green, cyan, blue, and purple.
+                // We'll then blend between whichever colors our hue exists between - e.g., an orange color would use red and yellow with an opacity of 50%.
+                // This optimization does incur slightly more startup time initially since we have to generate multiple bitmaps at once instead of only one,
+                // but the running time savings after that are *huge* when we can just set an opacity instead of generating a brand new bitmap.
+                if (shape == ColorSpectrumShape.Box)
+                {
+                    for (int x = pixelDimension - 1; x >= 0; --x)
+                    {
+                        for (int y = pixelDimension - 1; y >= 0; --y)
+                        {
+                            FillPixelForBox(
+                                x, y, hsv, pixelDimension, components, minHue, maxHue, minSaturation, maxSaturation, minValue, maxValue,
+                                bgraMinPixelData, bgraMiddle1PixelData, bgraMiddle2PixelData, bgraMiddle3PixelData, bgraMiddle4PixelData, bgraMaxPixelData,
+                                newHsvValues);
+                        }
+                    }
+                }
+                else
+                {
+                    for (int y = 0; y < pixelDimension; ++y)
+                    {
+                        for (int x = 0; x < pixelDimension; ++x)
+                        {
+                            FillPixelForRing(
+                                x, y, pixelDimension / 2.0, hsv, components, minHue, maxHue, minSaturation, maxSaturation, minValue, maxValue,
+                                bgraMinPixelData, bgraMiddle1PixelData, bgraMiddle2PixelData, bgraMiddle3PixelData, bgraMiddle4PixelData, bgraMaxPixelData,
+                                newHsvValues);
+                        }
+                    }
+                }
+            });
+
+            Dispatcher.UIThread.Post(() =>
+            {
+                int pixelWidth = pixelDimension;
+                int pixelHeight = pixelDimension;
+
+                ColorSpectrumComponents components2 = Components;
+
+                WriteableBitmap minBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraMinPixelData, pixelWidth, pixelHeight);
+                WriteableBitmap maxBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraMaxPixelData, pixelWidth, pixelHeight);
+
+                switch (components2)
+                {
+                    case ColorSpectrumComponents.HueValue:
+                    case ColorSpectrumComponents.ValueHue:
+                        _saturationMinimumBitmap = minBitmap;
+                        _saturationMaximumBitmap = maxBitmap;
+                        break;
+                    case ColorSpectrumComponents.HueSaturation:
+                    case ColorSpectrumComponents.SaturationHue:
+                        _valueBitmap = maxBitmap;
+                        break;
+                    case ColorSpectrumComponents.ValueSaturation:
+                    case ColorSpectrumComponents.SaturationValue:
+                        _hueRedBitmap = minBitmap;
+                        _hueYellowBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraMiddle1PixelData, pixelWidth, pixelHeight);
+                        _hueGreenBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraMiddle2PixelData, pixelWidth, pixelHeight);
+                        _hueCyanBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraMiddle3PixelData, pixelWidth, pixelHeight);
+                        _hueBlueBitmap = ColorPickerHelpers.CreateBitmapFromPixelData(bgraMiddle4PixelData, pixelWidth, pixelHeight);
+                        _huePurpleBitmap = maxBitmap;
+                        break;
+                }
+
+                _shapeFromLastBitmapCreation = Shape;
+                _componentsFromLastBitmapCreation = Components;
+                _imageWidthFromLastBitmapCreation = pixelDimension;
+                _imageHeightFromLastBitmapCreation = pixelDimension;
+                _minHueFromLastBitmapCreation = MinHue;
+                _maxHueFromLastBitmapCreation = MaxHue;
+                _minSaturationFromLastBitmapCreation = MinSaturation;
+                _maxSaturationFromLastBitmapCreation = MaxSaturation;
+                _minValueFromLastBitmapCreation = MinValue;
+                _maxValueFromLastBitmapCreation = MaxValue;
+
+                _hsvValues = newHsvValues;
+
+                UpdateBitmapSources();
+                UpdateEllipse();
+            });
+        }
+
+        private void FillPixelForBox(
+            double x,
+            double y,
+            Hsv baseHsv,
+            int minDimension,
+            ColorSpectrumComponents components,
+            double minHue,
+            double maxHue,
+            double minSaturation,
+            double maxSaturation,
+            double minValue,
+            double maxValue,
+            List<byte> bgraMinPixelData,
+            List<byte> bgraMiddle1PixelData,
+            List<byte> bgraMiddle2PixelData,
+            List<byte> bgraMiddle3PixelData,
+            List<byte> bgraMiddle4PixelData,
+            List<byte> bgraMaxPixelData,
+            List<Hsv> newHsvValues)
+        {
+            double hMin = minHue;
+            double hMax = maxHue;
+            double sMin = minSaturation / 100.0;
+            double sMax = maxSaturation / 100.0;
+            double vMin = minValue / 100.0;
+            double vMax = maxValue / 100.0;
+
+            Hsv hsvMin = baseHsv;
+            Hsv hsvMiddle1 = baseHsv;
+            Hsv hsvMiddle2 = baseHsv;
+            Hsv hsvMiddle3 = baseHsv;
+            Hsv hsvMiddle4 = baseHsv;
+            Hsv hsvMax = baseHsv;
+
+            double xPercent = (minDimension - 1 - x) / (minDimension - 1);
+            double yPercent = (minDimension - 1 - y) / (minDimension - 1);
+
+            switch (components)
+            {
+                case ColorSpectrumComponents.HueValue:
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + yPercent * (hMax - hMin);
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + xPercent * (vMax - vMin);
+                    hsvMin.S = 0;
+                    hsvMax.S = 1;
+                    break;
+
+                case ColorSpectrumComponents.HueSaturation:
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + yPercent * (hMax - hMin);
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + xPercent * (sMax - sMin);
+                    hsvMin.V = 0;
+                    hsvMax.V = 1;
+                    break;
+
+                case ColorSpectrumComponents.ValueHue:
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + yPercent * (vMax - vMin);
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + xPercent * (hMax - hMin);
+                    hsvMin.S = 0;
+                    hsvMax.S = 1;
+                    break;
+
+                case ColorSpectrumComponents.ValueSaturation:
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + yPercent * (vMax - vMin);
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + xPercent * (sMax - sMin);
+                    hsvMin.H = 0;
+                    hsvMiddle1.H = 60;
+                    hsvMiddle2.H = 120;
+                    hsvMiddle3.H = 180;
+                    hsvMiddle4.H = 240;
+                    hsvMax.H = 300;
+                    break;
+
+                case ColorSpectrumComponents.SaturationHue:
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + yPercent * (sMax - sMin);
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + xPercent * (hMax - hMin);
+                    hsvMin.V = 0;
+                    hsvMax.V = 1;
+                    break;
+
+                case ColorSpectrumComponents.SaturationValue:
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + yPercent * (sMax - sMin);
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + xPercent * (vMax - vMin);
+                    hsvMin.H = 0;
+                    hsvMiddle1.H = 60;
+                    hsvMiddle2.H = 120;
+                    hsvMiddle3.H = 180;
+                    hsvMiddle4.H = 240;
+                    hsvMax.H = 300;
+                    break;
+            }
+
+            // If saturation is an axis in the spectrum with hue, or value is an axis, then we want
+            // that axis to go from maximum at the top to minimum at the bottom,
+            // or maximum at the outside to minimum at the inside in the case of the ring configuration,
+            // so we'll invert the number before assigning the HSL value to the array.
+            // Otherwise, we'll have a very narrow section in the middle that actually has meaningful hue
+            // in the case of the ring configuration.
+            if (components == ColorSpectrumComponents.HueSaturation ||
+                components == ColorSpectrumComponents.SaturationHue)
+            {
+                hsvMin.S = sMax - hsvMin.S + sMin;
+                hsvMiddle1.S = sMax - hsvMiddle1.S + sMin;
+                hsvMiddle2.S = sMax - hsvMiddle2.S + sMin;
+                hsvMiddle3.S = sMax - hsvMiddle3.S + sMin;
+                hsvMiddle4.S = sMax - hsvMiddle4.S + sMin;
+                hsvMax.S = sMax - hsvMax.S + sMin;
+            }
+            else
+            {
+                hsvMin.V = vMax - hsvMin.V + vMin;
+                hsvMiddle1.V = vMax - hsvMiddle1.V + vMin;
+                hsvMiddle2.V = vMax - hsvMiddle2.V + vMin;
+                hsvMiddle3.V = vMax - hsvMiddle3.V + vMin;
+                hsvMiddle4.V = vMax - hsvMiddle4.V + vMin;
+                hsvMax.V = vMax - hsvMax.V + vMin;
+            }
+
+            newHsvValues.Add(hsvMin);
+
+            Rgb rgbMin = hsvMin.ToRgb();
+            bgraMinPixelData.Add((byte)Math.Round(rgbMin.B * 255.0)); // b
+            bgraMinPixelData.Add((byte)Math.Round(rgbMin.G * 255.0)); // g
+            bgraMinPixelData.Add((byte)Math.Round(rgbMin.R * 255.0)); // r
+            bgraMinPixelData.Add(255); // a - ignored
+
+            // We'll only save pixel data for the middle bitmaps if our third dimension is hue.
+            if (components == ColorSpectrumComponents.ValueSaturation ||
+                components == ColorSpectrumComponents.SaturationValue)
+            {
+                Rgb rgbMiddle1 = hsvMiddle1.ToRgb();
+                bgraMiddle1PixelData.Add((byte)Math.Round(rgbMiddle1.B * 255.0)); // b
+                bgraMiddle1PixelData.Add((byte)Math.Round(rgbMiddle1.G * 255.0)); // g
+                bgraMiddle1PixelData.Add((byte)Math.Round(rgbMiddle1.R * 255.0)); // r
+                bgraMiddle1PixelData.Add(255); // a - ignored
+
+                Rgb rgbMiddle2 = hsvMiddle2.ToRgb();
+                bgraMiddle2PixelData.Add((byte)Math.Round(rgbMiddle2.B * 255.0)); // b
+                bgraMiddle2PixelData.Add((byte)Math.Round(rgbMiddle2.G * 255.0)); // g
+                bgraMiddle2PixelData.Add((byte)Math.Round(rgbMiddle2.R * 255.0)); // r
+                bgraMiddle2PixelData.Add(255); // a - ignored
+
+                Rgb rgbMiddle3 = hsvMiddle3.ToRgb();
+                bgraMiddle3PixelData.Add((byte)Math.Round(rgbMiddle3.B * 255.0)); // b
+                bgraMiddle3PixelData.Add((byte)Math.Round(rgbMiddle3.G * 255.0)); // g
+                bgraMiddle3PixelData.Add((byte)Math.Round(rgbMiddle3.R * 255.0)); // r
+                bgraMiddle3PixelData.Add(255); // a - ignored
+
+                Rgb rgbMiddle4 = hsvMiddle4.ToRgb();
+                bgraMiddle4PixelData.Add((byte)Math.Round(rgbMiddle4.B * 255.0)); // b
+                bgraMiddle4PixelData.Add((byte)Math.Round(rgbMiddle4.G * 255.0)); // g
+                bgraMiddle4PixelData.Add((byte)Math.Round(rgbMiddle4.R * 255.0)); // r
+                bgraMiddle4PixelData.Add(255); // a - ignored
+            }
+
+            Rgb rgbMax = hsvMax.ToRgb();
+            bgraMaxPixelData.Add((byte)Math.Round(rgbMax.B * 255.0)); // b
+            bgraMaxPixelData.Add((byte)Math.Round(rgbMax.G * 255.0)); // g
+            bgraMaxPixelData.Add((byte)Math.Round(rgbMax.R * 255.0)); // r
+            bgraMaxPixelData.Add(255); // a - ignored
+        }
+
+        private void FillPixelForRing(
+            double x,
+            double y,
+            double radius,
+            Hsv baseHsv,
+            ColorSpectrumComponents components,
+            double minHue,
+            double maxHue,
+            double minSaturation,
+            double maxSaturation,
+            double minValue,
+            double maxValue,
+            List<byte> bgraMinPixelData,
+            List<byte> bgraMiddle1PixelData,
+            List<byte> bgraMiddle2PixelData,
+            List<byte> bgraMiddle3PixelData,
+            List<byte> bgraMiddle4PixelData,
+            List<byte> bgraMaxPixelData,
+            List<Hsv> newHsvValues)
+        {
+            double hMin = minHue;
+            double hMax = maxHue;
+            double sMin = minSaturation / 100.0;
+            double sMax = maxSaturation / 100.0;
+            double vMin = minValue / 100.0;
+            double vMax = maxValue / 100.0;
+
+            double distanceFromRadius = Math.Sqrt(Math.Pow(x - radius, 2) + Math.Pow(y - radius, 2));
+
+            double xToUse = x;
+            double yToUse = y;
+
+            // If we're outside the ring, then we want the pixel to appear as blank.
+            // However, to avoid issues with rounding errors, we'll act as though this point
+            // is on the edge of the ring for the purposes of returning an HSL value.
+            // That way, hit testing on the edges will always return the correct value.
+            if (distanceFromRadius > radius)
+            {
+                xToUse = (radius / distanceFromRadius) * (x - radius) + radius;
+                yToUse = (radius / distanceFromRadius) * (y - radius) + radius;
+                distanceFromRadius = radius;
+            }
+
+            Hsv hsvMin = baseHsv;
+            Hsv hsvMiddle1 = baseHsv;
+            Hsv hsvMiddle2 = baseHsv;
+            Hsv hsvMiddle3 = baseHsv;
+            Hsv hsvMiddle4 = baseHsv;
+            Hsv hsvMax = baseHsv;
+
+            double r = 1 - distanceFromRadius / radius;
+
+            double theta = Math.Atan2((radius - yToUse), (radius - xToUse)) * 180.0 / Math.PI;
+            theta += 180.0;
+            theta = Math.Floor(theta);
+
+            while (theta > 360)
+            {
+                theta -= 360;
+            }
+
+            double thetaPercent = theta / 360;
+
+            switch (components)
+            {
+                case ColorSpectrumComponents.HueValue:
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + thetaPercent * (hMax - hMin);
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + r * (vMax - vMin);
+                    hsvMin.S = 0;
+                    hsvMax.S = 1;
+                    break;
+
+                case ColorSpectrumComponents.HueSaturation:
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + thetaPercent * (hMax - hMin);
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + r * (sMax - sMin);
+                    hsvMin.V = 0;
+                    hsvMax.V = 1;
+                    break;
+
+                case ColorSpectrumComponents.ValueHue:
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + thetaPercent * (vMax - vMin);
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + r * (hMax - hMin);
+                    hsvMin.S = 0;
+                    hsvMax.S = 1;
+                    break;
+
+                case ColorSpectrumComponents.ValueSaturation:
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + thetaPercent * (vMax - vMin);
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + r * (sMax - sMin);
+                    hsvMin.H = 0;
+                    hsvMiddle1.H = 60;
+                    hsvMiddle2.H = 120;
+                    hsvMiddle3.H = 180;
+                    hsvMiddle4.H = 240;
+                    hsvMax.H = 300;
+                    break;
+
+                case ColorSpectrumComponents.SaturationHue:
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + thetaPercent * (sMax - sMin);
+                    hsvMin.H = hsvMiddle1.H = hsvMiddle2.H = hsvMiddle3.H = hsvMiddle4.H = hsvMax.H = hMin + r * (hMax - hMin);
+                    hsvMin.V = 0;
+                    hsvMax.V = 1;
+                    break;
+
+                case ColorSpectrumComponents.SaturationValue:
+                    hsvMin.S = hsvMiddle1.S = hsvMiddle2.S = hsvMiddle3.S = hsvMiddle4.S = hsvMax.S = sMin + thetaPercent * (sMax - sMin);
+                    hsvMin.V = hsvMiddle1.V = hsvMiddle2.V = hsvMiddle3.V = hsvMiddle4.V = hsvMax.V = vMin + r * (vMax - vMin);
+                    hsvMin.H = 0;
+                    hsvMiddle1.H = 60;
+                    hsvMiddle2.H = 120;
+                    hsvMiddle3.H = 180;
+                    hsvMiddle4.H = 240;
+                    hsvMax.H = 300;
+                    break;
+            }
+
+            // If saturation is an axis in the spectrum with hue, or value is an axis, then we want
+            // that axis to go from maximum at the top to minimum at the bottom,
+            // or maximum at the outside to minimum at the inside in the case of the ring configuration,
+            // so we'll invert the number before assigning the HSL value to the array.
+            // Otherwise, we'll have a very narrow section in the middle that actually has meaningful hue
+            // in the case of the ring configuration.
+            if (components == ColorSpectrumComponents.HueSaturation ||
+                components == ColorSpectrumComponents.SaturationHue)
+            {
+                hsvMin.S = sMax - hsvMin.S + sMin;
+                hsvMiddle1.S = sMax - hsvMiddle1.S + sMin;
+                hsvMiddle2.S = sMax - hsvMiddle2.S + sMin;
+                hsvMiddle3.S = sMax - hsvMiddle3.S + sMin;
+                hsvMiddle4.S = sMax - hsvMiddle4.S + sMin;
+                hsvMax.S = sMax - hsvMax.S + sMin;
+            }
+            else
+            {
+                hsvMin.V = vMax - hsvMin.V + vMin;
+                hsvMiddle1.V = vMax - hsvMiddle1.V + vMin;
+                hsvMiddle2.V = vMax - hsvMiddle2.V + vMin;
+                hsvMiddle3.V = vMax - hsvMiddle3.V + vMin;
+                hsvMiddle4.V = vMax - hsvMiddle4.V + vMin;
+                hsvMax.V = vMax - hsvMax.V + vMin;
+            }
+
+            newHsvValues.Add(hsvMin);
+
+            Rgb rgbMin = hsvMin.ToRgb();
+            bgraMinPixelData.Add((byte)Math.Round(rgbMin.B * 255)); // b
+            bgraMinPixelData.Add((byte)Math.Round(rgbMin.G * 255)); // g
+            bgraMinPixelData.Add((byte)Math.Round(rgbMin.R * 255)); // r
+            bgraMinPixelData.Add(255); // a
+
+            // We'll only save pixel data for the middle bitmaps if our third dimension is hue.
+            if (components == ColorSpectrumComponents.ValueSaturation ||
+                components == ColorSpectrumComponents.SaturationValue)
+            {
+                Rgb rgbMiddle1 = hsvMiddle1.ToRgb();
+                bgraMiddle1PixelData.Add((byte)Math.Round(rgbMiddle1.B * 255)); // b
+                bgraMiddle1PixelData.Add((byte)Math.Round(rgbMiddle1.G * 255)); // g
+                bgraMiddle1PixelData.Add((byte)Math.Round(rgbMiddle1.R * 255)); // r
+                bgraMiddle1PixelData.Add(255); // a
+
+                Rgb rgbMiddle2 = hsvMiddle2.ToRgb();
+                bgraMiddle2PixelData.Add((byte)Math.Round(rgbMiddle2.B * 255)); // b
+                bgraMiddle2PixelData.Add((byte)Math.Round(rgbMiddle2.G * 255)); // g
+                bgraMiddle2PixelData.Add((byte)Math.Round(rgbMiddle2.R * 255)); // r
+                bgraMiddle2PixelData.Add(255); // a
+
+                Rgb rgbMiddle3 = hsvMiddle3.ToRgb();
+                bgraMiddle3PixelData.Add((byte)Math.Round(rgbMiddle3.B * 255)); // b
+                bgraMiddle3PixelData.Add((byte)Math.Round(rgbMiddle3.G * 255)); // g
+                bgraMiddle3PixelData.Add((byte)Math.Round(rgbMiddle3.R * 255)); // r
+                bgraMiddle3PixelData.Add(255); // a
+
+                Rgb rgbMiddle4 = hsvMiddle4.ToRgb();
+                bgraMiddle4PixelData.Add((byte)Math.Round(rgbMiddle4.B * 255)); // b
+                bgraMiddle4PixelData.Add((byte)Math.Round(rgbMiddle4.G * 255)); // g
+                bgraMiddle4PixelData.Add((byte)Math.Round(rgbMiddle4.R * 255)); // r
+                bgraMiddle4PixelData.Add(255); // a
+            }
+
+            Rgb rgbMax = hsvMax.ToRgb();
+            bgraMaxPixelData.Add((byte)Math.Round(rgbMax.B * 255)); // b
+            bgraMaxPixelData.Add((byte)Math.Round(rgbMax.G * 255)); // g
+            bgraMaxPixelData.Add((byte)Math.Round(rgbMax.R * 255)); // r
+            bgraMaxPixelData.Add(255); // a
+        }
+
+        private void UpdateBitmapSources()
+        {
+            if (_spectrumOverlayRectangle == null ||
+                _spectrumOverlayEllipse == null ||
+                _spectrumRectangle == null ||
+                _spectrumEllipse == null)
+            {
+                return;
+            }
+
+            HsvColor hsvColor = HsvColor;
+            ColorSpectrumComponents components = Components;
+
+            // We'll set the base image and the overlay image based on which component is our third dimension.
+            // If it's saturation or luminosity, then the base image is that dimension at its minimum value,
+            // while the overlay image is that dimension at its maximum value.
+            // If it's hue, then we'll figure out where in the color wheel we are, and then use the two
+            // colors on either side of our position as our base image and overlay image.
+            // For example, if our hue is orange, then the base image would be red and the overlay image yellow.
+            switch (components)
+            {
+                case ColorSpectrumComponents.HueValue:
+                case ColorSpectrumComponents.ValueHue:
+                    {
+                        if (_saturationMinimumBitmap == null ||
+                            _saturationMaximumBitmap == null)
+                        {
+                            return;
+                        }
+
+                        ImageBrush spectrumBrush = new ImageBrush(_saturationMinimumBitmap);
+                        ImageBrush spectrumOverlayBrush = new ImageBrush(_saturationMaximumBitmap);
+
+                        _spectrumOverlayRectangle.Opacity = hsvColor.S;
+                        _spectrumOverlayEllipse.Opacity = hsvColor.S;
+                        _spectrumRectangle.Fill = spectrumBrush;
+                        _spectrumEllipse.Fill = spectrumBrush;
+                        _spectrumOverlayRectangle.Fill = spectrumOverlayBrush;
+                        _spectrumOverlayRectangle.Fill = spectrumOverlayBrush;
+                    }
+                    break;
+
+                case ColorSpectrumComponents.HueSaturation:
+                case ColorSpectrumComponents.SaturationHue:
+                    {
+                        if (_valueBitmap == null)
+                        {
+                            return;
+                        }
+
+                        ImageBrush spectrumBrush = new ImageBrush(_valueBitmap);
+                        ImageBrush spectrumOverlayBrush = new ImageBrush(_valueBitmap);
+
+                        _spectrumOverlayRectangle.Opacity = 1.0;
+                        _spectrumOverlayEllipse.Opacity = 1.0;
+                        _spectrumRectangle.Fill = spectrumBrush;
+                        _spectrumEllipse.Fill = spectrumBrush;
+                        _spectrumOverlayRectangle.Fill = spectrumOverlayBrush;
+                        _spectrumOverlayRectangle.Fill = spectrumOverlayBrush;
+                    }
+                    break;
+
+                case ColorSpectrumComponents.ValueSaturation:
+                case ColorSpectrumComponents.SaturationValue:
+                    {
+                        if (_hueRedBitmap == null ||
+                            _hueYellowBitmap == null ||
+                            _hueGreenBitmap == null ||
+                            _hueCyanBitmap == null ||
+                            _hueBlueBitmap == null ||
+                            _huePurpleBitmap == null)
+                        {
+                            return;
+                        }
+
+                        ImageBrush spectrumBrush;
+                        ImageBrush spectrumOverlayBrush;
+
+                        double sextant = hsvColor.H / 60.0;
+
+                        if (sextant < 1)
+                        {
+                            spectrumBrush = new ImageBrush(_hueRedBitmap);
+                            spectrumOverlayBrush = new ImageBrush(_hueYellowBitmap);
+                        }
+                        else if (sextant >= 1 && sextant < 2)
+                        {
+                            spectrumBrush = new ImageBrush(_hueYellowBitmap);
+                            spectrumOverlayBrush = new ImageBrush(_hueGreenBitmap);
+                        }
+                        else if (sextant >= 2 && sextant < 3)
+                        {
+                            spectrumBrush = new ImageBrush(_hueGreenBitmap);
+                            spectrumOverlayBrush = new ImageBrush(_hueCyanBitmap);
+                        }
+                        else if (sextant >= 3 && sextant < 4)
+                        {
+                            spectrumBrush = new ImageBrush(_hueCyanBitmap);
+                            spectrumOverlayBrush = new ImageBrush(_hueBlueBitmap);
+                        }
+                        else if (sextant >= 4 && sextant < 5)
+                        {
+                            spectrumBrush = new ImageBrush(_hueBlueBitmap);
+                            spectrumOverlayBrush = new ImageBrush(_huePurpleBitmap);
+                        }
+                        else
+                        {
+                            spectrumBrush = new ImageBrush(_huePurpleBitmap);
+                            spectrumOverlayBrush = new ImageBrush(_hueRedBitmap);
+                        }
+
+                        _spectrumOverlayRectangle.Opacity = sextant - (int)sextant;
+                        _spectrumOverlayEllipse.Opacity = sextant - (int)sextant;
+                        _spectrumRectangle.Fill = spectrumBrush;
+                        _spectrumEllipse.Fill = spectrumBrush;
+                        _spectrumOverlayRectangle.Fill = spectrumOverlayBrush;
+                        _spectrumOverlayRectangle.Fill = spectrumOverlayBrush;
+                    }
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the selection ellipse should be light based on the relative
+        /// luminance of the selected color.
+        /// </summary>
+        private bool SelectionEllipseShouldBeLight()
+        {
+            // The selection ellipse should be light if and only if the chosen color
+            // contrasts more with black than it does with white.
+            // To find how much something contrasts with white, we use the equation
+            // for relative luminance.
+            //
+            // If the third component is value, then we won't be updating the spectrum's displayed colors,
+            // so in that case we should use a value of 1 when considering the backdrop
+            // for the selection ellipse.
+            Color displayedColor;
+
+            if (Components == ColorSpectrumComponents.HueSaturation ||
+                Components == ColorSpectrumComponents.SaturationHue)
+            {
+                HsvColor hsvColor = HsvColor;
+                Rgb color = (new Hsv(hsvColor.H, hsvColor.S, 1.0)).ToRgb();
+                displayedColor = color.ToColor(hsvColor.A);
+            }
+            else
+            {
+                displayedColor = Color;
+            }
+
+            var lum = ColorHelper.GetRelativeLuminance(displayedColor);
+
+            return lum <= 0.5;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrumComponents.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrumComponents.cs
new file mode 100644
index 0000000000..164089096e
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrumComponents.cs
@@ -0,0 +1,73 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines the two HSV color components displayed by a <see cref="ColorSpectrum"/>.
+    /// </summary>
+    /// <remarks>
+    /// Order of the color components is important and correspond with an X/Y axis in Box
+    /// shape or a degree/radius in Ring shape.
+    /// </remarks>
+    public enum ColorSpectrumComponents
+    {
+        /// <summary>
+        /// The Hue and Value components.
+        /// </summary>
+        /// <remarks>
+        /// In Box shape, Hue is mapped to the X-axis and Value is mapped to the Y-axis.
+        /// In Ring shape, Hue is mapped to degrees and Value is mapped to radius.
+        /// </remarks>
+        HueValue,
+
+        /// <summary>
+        /// The Value and Hue components.
+        /// </summary>
+        /// <remarks>
+        /// In Box shape, Value is mapped to the X-axis and Hue is mapped to the Y-axis.
+        /// In Ring shape, Value is mapped to degrees and Hue is mapped to radius.
+        /// </remarks>
+        ValueHue,
+
+        /// <summary>
+        /// The Hue and Saturation components.
+        /// </summary>
+        /// <remarks>
+        /// In Box shape, Hue is mapped to the X-axis and Saturation is mapped to the Y-axis.
+        /// In Ring shape, Hue is mapped to degrees and Saturation is mapped to radius.
+        /// </remarks>
+        HueSaturation,
+
+        /// <summary>
+        /// The Saturation and Hue components.
+        /// </summary>
+        /// <remarks>
+        /// In Box shape, Saturation is mapped to the X-axis and Hue is mapped to the Y-axis.
+        /// In Ring shape, Saturation is mapped to degrees and Hue is mapped to radius.
+        /// </remarks>
+        SaturationHue,
+
+        /// <summary>
+        /// The Saturation and Value components.
+        /// </summary>
+        /// <remarks>
+        /// In Box shape, Saturation is mapped to the X-axis and Value is mapped to the Y-axis.
+        /// In Ring shape, Saturation is mapped to degrees and Value is mapped to radius.
+        /// </remarks>
+        SaturationValue,
+
+        /// <summary>
+        /// The Value and Saturation components.
+        /// </summary>
+        /// <remarks>
+        /// In Box shape, Value is mapped to the X-axis and Saturation is mapped to the Y-axis.
+        /// In Ring shape, Value is mapped to degrees and Saturation is mapped to radius.
+        /// </remarks>
+        ValueSaturation,
+    };
+}
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrumShape.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrumShape.cs
new file mode 100644
index 0000000000..0319d4a6c8
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrumShape.cs
@@ -0,0 +1,26 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines the shape of a <see cref="ColorSpectrum"/>.
+    /// </summary>
+    public enum ColorSpectrumShape
+    {
+        /// <summary>
+        /// The spectrum is in the shape of a rectangular or square box.
+        /// Note that more colors are visible to the user in Box shape.
+        /// </summary>
+        Box,
+
+        /// <summary>
+        /// The spectrum is in the shape of an ellipse or circle.
+        /// </summary>
+        Ring,
+    };
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/AccentColorConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/AccentColorConverter.cs
new file mode 100644
index 0000000000..4d05222e31
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/AccentColorConverter.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives.Converters
+{
+    /// <summary>
+    /// Creates an accent color for a given base color value and step parameter.
+    /// This is a highly-specialized converter for the color picker.
+    /// </summary>
+    public class AccentColorConverter : IValueConverter
+    {
+        /// <summary>
+        /// The amount to change the Value component for each accent color step.
+        /// </summary>
+        public const double ValueDelta = 0.1;
+
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            int accentStep;
+            Color? rgbColor = null;
+            HsvColor? hsvColor = null;
+
+            if (value is Color valueColor)
+            {
+                rgbColor = valueColor;
+            }
+            else if (value is HslColor valueHslColor)
+            {
+                rgbColor = valueHslColor.ToRgb();
+            }
+            else if (value is HsvColor valueHsvColor)
+            {
+                hsvColor = valueHsvColor;
+            }
+            else if (value is SolidColorBrush valueBrush)
+            {
+                rgbColor = valueBrush.Color;
+            }
+            else
+            {
+                // Invalid color value provided
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            // Get the value component delta
+            try
+            {
+                accentStep = int.Parse(parameter?.ToString() ?? "", CultureInfo.InvariantCulture);
+            }
+            catch
+            {
+                // Invalid parameter provided, unable to convert to integer
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            if (hsvColor == null &&
+                rgbColor != null)
+            {
+                hsvColor = rgbColor.Value.ToHsv();
+            }
+
+            if (hsvColor != null)
+            {
+                return new SolidColorBrush(GetAccent(hsvColor.Value, accentStep).ToRgb());
+            }
+            else
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            return AvaloniaProperty.UnsetValue;
+        }
+
+        /// <summary>
+        /// This does not account for perceptual differences and also does not match with
+        /// system accent color calculation.
+        /// </summary>
+        /// <remarks>
+        /// Use the HSV representation as it's more perceptual.
+        /// In most cases only the value is changed by a fixed percentage so the algorithm is reproducible.
+        /// </remarks>
+        /// <param name="hsvColor">The base color to calculate the accent from.</param>
+        /// <param name="accentStep">The number of accent color steps to move.</param>
+        /// <returns>The new accent color.</returns>
+        public static HsvColor GetAccent(HsvColor hsvColor, int accentStep)
+        {
+            if (accentStep != 0)
+            {
+                double colorValue = hsvColor.V;
+                colorValue += (accentStep * AccentColorConverter.ValueDelta);
+                colorValue = Math.Round(colorValue, 2);
+
+                return new HsvColor(hsvColor.A, hsvColor.H, hsvColor.S, colorValue);
+            }
+            else
+            {
+                return hsvColor;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/ColorToDisplayNameConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/ColorToDisplayNameConverter.cs
new file mode 100644
index 0000000000..4f727287ba
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/ColorToDisplayNameConverter.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Globalization;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Gets the approximated display name for the color.
+    /// </summary>
+    public class ColorToDisplayNameConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            Color color;
+
+            if (value is Color valueColor)
+            {
+                color = valueColor;
+            }
+            else if (value is HslColor valueHslColor)
+            {
+                color = valueHslColor.ToRgb();
+            }
+            else if (value is HsvColor valueHsvColor)
+            {
+                color = valueHsvColor.ToRgb();
+            }
+            else if (value is SolidColorBrush valueBrush)
+            {
+                color = valueBrush.Color;
+            }
+            else
+            {
+                // Invalid color value provided
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            // ColorHelper.ToDisplayName ignores the alpha component
+            // This means fully transparent colors will be named as a real color
+            // That undesirable behavior is specially overridden here
+            if (color.A == 0x00)
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
+            else
+            {
+                return ColorHelper.ToDisplayName(color);
+            }
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            return AvaloniaProperty.UnsetValue;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/ColorToHexConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/ColorToHexConverter.cs
new file mode 100644
index 0000000000..9b09073d9d
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/ColorToHexConverter.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Converts a color to a hex string and vice versa.
+    /// </summary>
+    public class ColorToHexConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            Color color;
+            bool includeSymbol = parameter as bool? ?? false;
+
+            if (value is Color valueColor)
+            {
+                color = valueColor;
+            }
+            else if (value is HslColor valueHslColor)
+            {
+                color = valueHslColor.ToRgb();
+            }
+            else if (value is HsvColor valueHsvColor)
+            {
+                color = valueHsvColor.ToRgb();
+            }
+            else if (value is SolidColorBrush valueBrush)
+            {
+                color = valueBrush.Color;
+            }
+            else
+            {
+                // Invalid color value provided
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            string hexColor = color.ToString();
+
+            if (includeSymbol == false)
+            {
+                // TODO: When .net standard 2.0 is dropped, replace the below line
+                //hexColor = hexColor.Replace("#", string.Empty, StringComparison.Ordinal);
+                hexColor = hexColor.Replace("#", string.Empty);
+            }
+
+            return hexColor;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            string hexValue = value?.ToString() ?? string.Empty;
+
+            if (Color.TryParse(hexValue, out Color color))
+            {
+                return color;
+            }
+            else if (hexValue.StartsWith("#", StringComparison.Ordinal) == false &&
+                     Color.TryParse("#" + hexValue, out Color color2))
+            {
+                return color2;
+            }
+            else
+            {
+                // Invalid hex color value provided
+                return AvaloniaProperty.UnsetValue;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/ThirdComponentConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/ThirdComponentConverter.cs
new file mode 100644
index 0000000000..220a993f99
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/ThirdComponentConverter.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Controls.Primitives.Converters
+{
+    /// <summary>
+    /// Gets the third <see cref="ColorComponent"/> corresponding with a given
+    /// <see cref="ColorSpectrumComponents"/> that represents the other two components.
+    /// This is a highly-specialized converter for the color picker.
+    /// </summary>
+    public class ThirdComponentConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            if (value is ColorSpectrumComponents components)
+            {
+                // Note: Alpha is not relevant here
+                switch (components)
+                {
+                    case ColorSpectrumComponents.HueSaturation:
+                    case ColorSpectrumComponents.SaturationHue:
+                        return (ColorComponent)HsvComponent.Value;
+                    case ColorSpectrumComponents.HueValue:
+                    case ColorSpectrumComponents.ValueHue:
+                        return (ColorComponent)HsvComponent.Saturation;
+                    case ColorSpectrumComponents.SaturationValue:
+                    case ColorSpectrumComponents.ValueSaturation:
+                        return (ColorComponent)HsvComponent.Hue;
+                }
+            }
+
+            return AvaloniaProperty.UnsetValue;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            return AvaloniaProperty.UnsetValue;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/ToBrushConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/ToBrushConverter.cs
new file mode 100644
index 0000000000..9e8c264dd3
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/ToBrushConverter.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Converts the given value into an <see cref="IBrush"/> when a conversion is possible.
+    /// </summary>
+    public class ToBrushConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            if (value is IBrush brush)
+            {
+                return brush;
+            }
+            else if (value is Color valueColor)
+            {
+                return new SolidColorBrush(valueColor);
+            }
+            else if (value is HslColor valueHslColor)
+            {
+                return new SolidColorBrush(valueHslColor.ToRgb());
+            }
+            else if (value is HsvColor valueHsvColor)
+            {
+                return new SolidColorBrush(valueHsvColor.ToRgb());
+            }
+
+            return AvaloniaProperty.UnsetValue;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            return AvaloniaProperty.UnsetValue;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/ToColorConverter.cs b/src/Avalonia.Controls.ColorPicker/Converters/ToColorConverter.cs
new file mode 100644
index 0000000000..14b2be225e
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/ToColorConverter.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Converts the given value into a <see cref="Color"/> when a conversion is possible.
+    /// </summary>
+    public class ToColorConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            if (value is Color valueColor)
+            {
+                return valueColor;
+            }
+            else if (value is HslColor valueHslColor)
+            {
+                return valueHslColor.ToRgb();
+            }
+            else if (value is HsvColor valueHsvColor)
+            {
+                return valueHsvColor.ToRgb();
+            }
+            else if (value is SolidColorBrush valueBrush)
+            {
+                // A brush may have an opacity set along with alpha transparency
+                double alpha = valueBrush.Color.A * valueBrush.Opacity;
+
+                return new Color(
+                    (byte)MathUtilities.Clamp(alpha, 0x00, 0xFF),
+                    valueBrush.Color.R,
+                    valueBrush.Color.G,
+                    valueBrush.Color.B);
+            }
+
+            return AvaloniaProperty.UnsetValue;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            return AvaloniaProperty.UnsetValue;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Converters/ValueConverterGroup.cs b/src/Avalonia.Controls.ColorPicker/Converters/ValueConverterGroup.cs
new file mode 100644
index 0000000000..2710c220f4
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Converters/ValueConverterGroup.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Controls.Primitives.Converters
+{
+    /// <summary>
+    /// Converter to chain together multiple converters.
+    /// </summary>
+    public class ValueConverterGroup : List<IValueConverter>, IValueConverter
+    {
+        /// <inheritdoc/>
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            object? curValue;
+
+            curValue = value;
+            for (int i = 0; i < Count; i++)
+            {
+                curValue = this[i].Convert(curValue, targetType, parameter, culture);
+            }
+
+            return curValue;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
+        {
+            object? curValue;
+
+            curValue = value;
+            for (int i = (Count - 1); i >= 0; i--)
+            {
+                curValue = this[i].ConvertBack(curValue, targetType, parameter, culture);
+            }
+
+            return curValue;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/ColorHelper.cs b/src/Avalonia.Controls.ColorPicker/Helpers/ColorHelper.cs
new file mode 100644
index 0000000000..32a898ee71
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/ColorHelper.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Globalization;
+using System.Collections.Generic;
+using Avalonia.Media;
+using System.Text;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Contains helpers useful when working with colors.
+    /// </summary>
+    public static class ColorHelper
+    {
+        private static readonly Dictionary<Color, string> cachedDisplayNames = new Dictionary<Color, string>();
+        private static readonly object cacheMutex = new object();
+
+        /// <summary>
+        /// Gets the relative (perceptual) luminance/brightness of the given color.
+        /// 1 is closer to white while 0 is closer to black.
+        /// </summary>
+        /// <param name="color">The color to calculate relative luminance for.</param>
+        /// <returns>The relative (perceptual) luminance/brightness of the given color.</returns>
+        public static double GetRelativeLuminance(Color color)
+        {
+            // The equation for relative luminance is given by
+            //
+            // L = 0.2126 * Rg + 0.7152 * Gg + 0.0722 * Bg
+            //
+            // where Xg = { X/3294 if X <= 10, (R/269 + 0.0513)^2.4 otherwise }
+            //
+            // If L is closer to 1, then the color is closer to white; if it is closer to 0,
+            // then the color is closer to black.  This is based on the fact that the human
+            // eye perceives green to be much brighter than red, which in turn is perceived to be
+            // brighter than blue.
+
+            double rg = color.R <= 10 ? color.R / 3294.0 : Math.Pow(color.R / 269.0 + 0.0513, 2.4);
+            double gg = color.G <= 10 ? color.G / 3294.0 : Math.Pow(color.G / 269.0 + 0.0513, 2.4);
+            double bg = color.B <= 10 ? color.B / 3294.0 : Math.Pow(color.B / 269.0 + 0.0513, 2.4);
+
+            return (0.2126 * rg + 0.7152 * gg + 0.0722 * bg);
+        }
+
+        /// <summary>
+        /// Determines if color display names are supported based on the current thread culture.
+        /// </summary>
+        /// <remarks>
+        /// Only English names are currently supported following known color names.
+        /// In the future known color names could be localized.
+        /// </remarks>
+        public static bool ToDisplayNameExists
+        {
+            get => CultureInfo.CurrentUICulture.Name.StartsWith("EN", StringComparison.OrdinalIgnoreCase);
+        }
+
+        /// <summary>
+        /// Determines an approximate display name for the given color.
+        /// </summary>
+        /// <param name="color">The color to get the display name for.</param>
+        /// <returns>The approximate color display name.</returns>
+        public static string ToDisplayName(Color color)
+        {
+            // Without rounding, there are 16,777,216 possible RGB colors (without alpha).
+            // This is too many to cache and search through for performance reasons.
+            // It is also needlessly large as there are only ~140 known/named colors.
+            // Therefore, rounding of the input color's component values is done to
+            // reduce the color space into something more useful.
+            double rounding = 5;
+            var roundedColor = new Color(
+                0xFF,
+                Convert.ToByte(Math.Round(color.R / rounding) * rounding),
+                Convert.ToByte(Math.Round(color.G / rounding) * rounding),
+                Convert.ToByte(Math.Round(color.B / rounding) * rounding));
+
+            // Attempt to use a previously cached display name
+            lock (cacheMutex)
+            {
+                if (cachedDisplayNames.TryGetValue(roundedColor, out var displayName))
+                {
+                    return displayName;
+                }
+            }
+
+            // Find the closest known color by measuring 3D Euclidean distance (ignore alpha)
+            var closestKnownColor = KnownColor.None;
+            var closestKnownColorDistance = double.PositiveInfinity;
+            var knownColors = (KnownColor[])Enum.GetValues(typeof(KnownColor));
+
+            for (int i = 1; i < knownColors.Length; i++) // Skip 'None'
+            {
+                // Transparent is skipped since alpha is ignored making it equivalent to White
+                if (knownColors[i] != KnownColor.Transparent)
+                {
+                    Color knownColor = KnownColors.ToColor(knownColors[i]);
+
+                    double distance = Math.Sqrt(
+                        Math.Pow((double)(roundedColor.R - knownColor.R), 2.0) +
+                        Math.Pow((double)(roundedColor.G - knownColor.G), 2.0) +
+                        Math.Pow((double)(roundedColor.B - knownColor.B), 2.0));
+
+                    if (distance < closestKnownColorDistance)
+                    {
+                        closestKnownColor = knownColors[i];
+                        closestKnownColorDistance = distance;
+                    }
+                }
+            }
+
+            // Return the closest known color as the display name
+            // Cache results for next time as well
+            if (closestKnownColor != KnownColor.None)
+            {
+                StringBuilder sb = new StringBuilder(); 
+                string name = closestKnownColor.ToString();
+
+                // Add spaces converting PascalCase to human-readable names
+                for (int i = 0; i < name.Length; i++)
+                {
+                    if (i != 0 &&
+                        char.IsUpper(name[i]))
+                    {
+                        sb.Append(' ');
+                    }
+
+                    sb.Append(name[i]);
+                }
+
+                string displayName = sb.ToString();
+
+                lock (cacheMutex)
+                {
+                    cachedDisplayNames.Add(roundedColor, displayName);
+                }
+
+                return displayName;
+            }
+            else
+            {
+                return string.Empty;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/ColorPickerHelpers.cs b/src/Avalonia.Controls.ColorPicker/Helpers/ColorPickerHelpers.cs
new file mode 100644
index 0000000000..c1904a3c30
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/ColorPickerHelpers.cs
@@ -0,0 +1,629 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Contains internal, special-purpose helpers used with the color picker.
+    /// </summary>
+    internal static class ColorPickerHelpers
+    {
+        /// <summary>
+        /// Generates a new bitmap of the specified size by changing a specific color component.
+        /// This will produce a gradient representing a sweep of all possible values of the color component.
+        /// </summary>
+        /// <param name="width">The pixel width (X, horizontal) of the resulting bitmap.</param>
+        /// <param name="height">The pixel height (Y, vertical) of the resulting bitmap.</param>
+        /// <param name="orientation">The orientation of the resulting bitmap (gradient direction).</param>
+        /// <param name="colorModel">The color model being used: RGBA or HSVA.</param>
+        /// <param name="component">The specific color component to sweep.</param>
+        /// <param name="baseHsvColor">The base HSV color used for components not being changed.</param>
+        /// <param name="isAlphaMaxForced">Fix the alpha component value to maximum during calculation.
+        /// This will remove any alpha/transparency from the other component backgrounds.</param>
+        /// <param name="isSaturationValueMaxForced">Fix the saturation and value components to maximum
+        /// during calculation with the HSVA color model.
+        /// This will ensure colors are always discernible regardless of saturation/value.</param>
+        /// <returns>A new bitmap representing a gradient of color component values.</returns>
+        public static async Task<byte[]> CreateComponentBitmapAsync(
+            int width,
+            int height,
+            Orientation orientation,
+            ColorModel colorModel,
+            ColorComponent component,
+            HsvColor baseHsvColor,
+            bool isAlphaMaxForced,
+            bool isSaturationValueMaxForced)
+        {
+            if (width == 0 || height == 0)
+            {
+                return new byte[0];
+            }
+
+            var bitmap = await Task.Run<byte[]>(() =>
+            {
+                int pixelDataIndex = 0;
+                double componentStep;
+                byte[] bgraPixelData;
+                Color baseRgbColor = Colors.White;
+                Color rgbColor;
+                int bgraPixelDataHeight;
+                int bgraPixelDataWidth;
+
+                // Allocate the buffer
+                // BGRA formatted color components 1 byte each (4 bytes in a pixel)
+                bgraPixelData       = new byte[width * height * 4];
+                bgraPixelDataHeight = height * 4;
+                bgraPixelDataWidth  = width * 4;
+
+                // Maximize alpha component value
+                if (isAlphaMaxForced &&
+                    component != ColorComponent.Alpha)
+                {
+                    baseHsvColor = new HsvColor(1.0, baseHsvColor.H, baseHsvColor.S, baseHsvColor.V);
+                }
+
+                // Convert HSV to RGB once
+                if (colorModel == ColorModel.Rgba)
+                {
+                    baseRgbColor = baseHsvColor.ToRgb();
+                }
+
+                // Maximize Saturation and Value components when in HSVA mode
+                if (isSaturationValueMaxForced &&
+                    colorModel == ColorModel.Hsva &&
+                    component != ColorComponent.Alpha)
+                {
+                    switch (component)
+                    {
+                        case ColorComponent.Component1:
+                            baseHsvColor = new HsvColor(baseHsvColor.A, baseHsvColor.H, 1.0, 1.0);
+                            break;
+                        case ColorComponent.Component2:
+                            baseHsvColor = new HsvColor(baseHsvColor.A, baseHsvColor.H, baseHsvColor.S, 1.0);
+                            break;
+                        case ColorComponent.Component3:
+                            baseHsvColor = new HsvColor(baseHsvColor.A, baseHsvColor.H, 1.0, baseHsvColor.V);
+                            break;
+                    }
+                }
+
+                // Create the color component gradient
+                if (orientation == Orientation.Horizontal)
+                {
+                    // Determine the numerical increment of the color steps within the component
+                    if (colorModel == ColorModel.Hsva)
+                    {
+                        if (component == ColorComponent.Component1)
+                        {
+                            componentStep = 360.0 / width;
+                        }
+                        else
+                        {
+                            componentStep = 1.0 / width;
+                        }
+                    }
+                    else
+                    {
+                        componentStep = 255.0 / width;
+                    }
+
+                    for (int y = 0; y < height; y++)
+                    {
+                        for (int x = 0; x < width; x++)
+                        {
+                            if (y == 0)
+                            {
+                                rgbColor = GetColor(x * componentStep);
+
+                                // Get a new color
+                                bgraPixelData[pixelDataIndex + 0] = Convert.ToByte(rgbColor.B * rgbColor.A / 255);
+                                bgraPixelData[pixelDataIndex + 1] = Convert.ToByte(rgbColor.G * rgbColor.A / 255);
+                                bgraPixelData[pixelDataIndex + 2] = Convert.ToByte(rgbColor.R * rgbColor.A / 255);
+                                bgraPixelData[pixelDataIndex + 3] = rgbColor.A;
+                            }
+                            else
+                            {
+                                // Use the color in the row above
+                                // Remember the pixel data is 1 dimensional instead of 2
+                                bgraPixelData[pixelDataIndex + 0] = bgraPixelData[pixelDataIndex + 0 - bgraPixelDataWidth];
+                                bgraPixelData[pixelDataIndex + 1] = bgraPixelData[pixelDataIndex + 1 - bgraPixelDataWidth];
+                                bgraPixelData[pixelDataIndex + 2] = bgraPixelData[pixelDataIndex + 2 - bgraPixelDataWidth];
+                                bgraPixelData[pixelDataIndex + 3] = bgraPixelData[pixelDataIndex + 3 - bgraPixelDataWidth];
+                            }
+
+                            pixelDataIndex += 4;
+                        }
+                    }
+                }
+                else
+                {
+                    // Determine the numerical increment of the color steps within the component
+                    if (colorModel == ColorModel.Hsva)
+                    {
+                        if (component == ColorComponent.Component1)
+                        {
+                            componentStep = 360.0 / height;
+                        }
+                        else
+                        {
+                            componentStep = 1.0 / height;
+                        }
+                    }
+                    else
+                    {
+                        componentStep = 255.0 / height;
+                    }
+
+                    for (int y = 0; y < height; y++)
+                    {
+                        for (int x = 0; x < width; x++)
+                        {
+                            if (x == 0)
+                            {
+                                // The lowest component value should be at the 'bottom' of the bitmap
+                                rgbColor = GetColor((height - 1 - y) * componentStep);
+
+                                // Get a new color
+                                bgraPixelData[pixelDataIndex + 0] = Convert.ToByte(rgbColor.B * rgbColor.A / 255);
+                                bgraPixelData[pixelDataIndex + 1] = Convert.ToByte(rgbColor.G * rgbColor.A / 255);
+                                bgraPixelData[pixelDataIndex + 2] = Convert.ToByte(rgbColor.R * rgbColor.A / 255);
+                                bgraPixelData[pixelDataIndex + 3] = rgbColor.A;
+                            }
+                            else
+                            {
+                                // Use the color in the column to the left
+                                // Remember the pixel data is 1 dimensional instead of 2
+                                bgraPixelData[pixelDataIndex + 0] = bgraPixelData[pixelDataIndex - 4];
+                                bgraPixelData[pixelDataIndex + 1] = bgraPixelData[pixelDataIndex - 3];
+                                bgraPixelData[pixelDataIndex + 2] = bgraPixelData[pixelDataIndex - 2];
+                                bgraPixelData[pixelDataIndex + 3] = bgraPixelData[pixelDataIndex - 1];
+                            }
+
+                            pixelDataIndex += 4;
+                        }
+                    }
+                }
+
+                Color GetColor(double componentValue)
+                {
+                    Color newRgbColor = Colors.White;
+
+                    switch (component)
+                    {
+                        case ColorComponent.Component1:
+                            {
+                                if (colorModel == ColorModel.Hsva)
+                                {
+                                    // Sweep hue
+                                    newRgbColor = HsvColor.ToRgb(
+                                        MathUtilities.Clamp(componentValue, 0.0, 360.0),
+                                        baseHsvColor.S,
+                                        baseHsvColor.V,
+                                        baseHsvColor.A);
+                                }
+                                else
+                                {
+                                    // Sweep red
+                                    newRgbColor = new Color(
+                                        baseRgbColor.A,
+                                        Convert.ToByte(MathUtilities.Clamp(componentValue, 0.0, 255.0)),
+                                        baseRgbColor.G,
+                                        baseRgbColor.B);
+                                }
+
+                                break;
+                            }
+                        case ColorComponent.Component2:
+                            {
+                                if (colorModel == ColorModel.Hsva)
+                                {
+                                    // Sweep saturation
+                                    newRgbColor = HsvColor.ToRgb(
+                                        baseHsvColor.H,
+                                        MathUtilities.Clamp(componentValue, 0.0, 1.0),
+                                        baseHsvColor.V,
+                                        baseHsvColor.A);
+                                }
+                                else
+                                {
+                                    // Sweep green
+                                    newRgbColor = new Color(
+                                        baseRgbColor.A,
+                                        baseRgbColor.R,
+                                        Convert.ToByte(MathUtilities.Clamp(componentValue, 0.0, 255.0)),
+                                        baseRgbColor.B);
+                                }
+
+                                break;
+                            }
+                        case ColorComponent.Component3:
+                            {
+                                if (colorModel == ColorModel.Hsva)
+                                {
+                                    // Sweep value
+                                    newRgbColor = HsvColor.ToRgb(
+                                        baseHsvColor.H,
+                                        baseHsvColor.S,
+                                        MathUtilities.Clamp(componentValue, 0.0, 1.0),
+                                        baseHsvColor.A);
+                                }
+                                else
+                                {
+                                    // Sweep blue
+                                    newRgbColor = new Color(
+                                        baseRgbColor.A,
+                                        baseRgbColor.R,
+                                        baseRgbColor.G,
+                                        Convert.ToByte(MathUtilities.Clamp(componentValue, 0.0, 255.0)));
+                                }
+
+                                break;
+                            }
+                        case ColorComponent.Alpha:
+                            {
+                                if (colorModel == ColorModel.Hsva)
+                                {
+                                    // Sweep alpha
+                                    newRgbColor = HsvColor.ToRgb(
+                                        baseHsvColor.H,
+                                        baseHsvColor.S,
+                                        baseHsvColor.V,
+                                        MathUtilities.Clamp(componentValue, 0.0, 1.0));
+                                }
+                                else
+                                {
+                                    // Sweep alpha
+                                    newRgbColor = new Color(
+                                        Convert.ToByte(MathUtilities.Clamp(componentValue, 0.0, 255.0)),
+                                        baseRgbColor.R,
+                                        baseRgbColor.G,
+                                        baseRgbColor.B);
+                                }
+
+                                break;
+                            }
+                    }
+
+                    return newRgbColor;
+                }
+
+                return bgraPixelData;
+            });
+
+            return bitmap;
+        }
+
+        public static Hsv IncrementColorComponent(
+            Hsv originalHsv,
+            HsvComponent component,
+            IncrementDirection direction,
+            IncrementAmount amount,
+            bool shouldWrap,
+            double minBound,
+            double maxBound)
+        {
+            Hsv newHsv = originalHsv;
+
+            if (amount == IncrementAmount.Small || !ColorHelper.ToDisplayNameExists)
+            {
+                // In order to avoid working with small values that can incur rounding issues,
+                // we'll multiple saturation and value by 100 to put them in the range of 0-100 instead of 0-1.
+                newHsv.S *= 100;
+                newHsv.V *= 100;
+
+                // Note: *valueToIncrement replaced with ref local variable for C#, must be initialized
+                ref double valueToIncrement = ref newHsv.H;
+                double incrementAmount = 0.0;
+
+                // If we're adding a small increment, then we'll just add or subtract 1.
+                // If we're adding a large increment, then we want to snap to the next
+                // or previous major value - for hue, this is every increment of 30;
+                // for saturation and value, this is every increment of 10.
+                switch (component)
+                {
+                    case HsvComponent.Hue:
+                        valueToIncrement = ref newHsv.H;
+                        incrementAmount = amount == IncrementAmount.Small ? 1 : 30;
+                        break;
+
+                    case HsvComponent.Saturation:
+                        valueToIncrement = ref newHsv.S;
+                        incrementAmount = amount == IncrementAmount.Small ? 1 : 10;
+                        break;
+
+                    case HsvComponent.Value:
+                        valueToIncrement = ref newHsv.V;
+                        incrementAmount = amount == IncrementAmount.Small ? 1 : 10;
+                        break;
+
+                    default:
+                        throw new InvalidOperationException("Invalid HsvComponent.");
+                }
+
+                double previousValue = valueToIncrement;
+
+                valueToIncrement += (direction == IncrementDirection.Lower ? -incrementAmount : incrementAmount);
+
+                // If the value has reached outside the bounds, we were previous at the boundary, and we should wrap,
+                // then we'll place the selection on the other side of the spectrum.
+                // Otherwise, we'll place it on the boundary that was exceeded.
+                if (valueToIncrement < minBound)
+                {
+                    valueToIncrement = (shouldWrap && previousValue == minBound) ? maxBound : minBound;
+                }
+
+                if (valueToIncrement > maxBound)
+                {
+                    valueToIncrement = (shouldWrap && previousValue == maxBound) ? minBound : maxBound;
+                }
+
+                // We multiplied saturation and value by 100 previously, so now we want to put them back in the 0-1 range.
+                newHsv.S /= 100;
+                newHsv.V /= 100;
+            }
+            else
+            {
+                // While working with named colors, we're going to need to be working in actual HSV units,
+                // so we'll divide the min bound and max bound by 100 in the case of saturation or value,
+                // since we'll have received units between 0-100 and we need them within 0-1.
+                if (component == HsvComponent.Saturation ||
+                    component == HsvComponent.Value)
+                {
+                    minBound /= 100;
+                    maxBound /= 100;
+                }
+
+                newHsv = FindNextNamedColor(originalHsv, component, direction, shouldWrap, minBound, maxBound);
+            }
+
+            return newHsv;
+        }
+
+        public static Hsv FindNextNamedColor(
+            Hsv originalHsv,
+            HsvComponent component,
+            IncrementDirection direction,
+            bool shouldWrap,
+            double minBound,
+            double maxBound)
+        {
+            // There's no easy way to directly get the next named color, so what we'll do
+            // is just iterate in the direction that we want to find it until we find a color
+            // in that direction that has a color name different than our current color name.
+            // Once we find a new color name, then we'll iterate across that color name until
+            // we find its bounds on the other side, and then select the color that is exactly
+            // in the middle of that color's bounds.
+            Hsv newHsv = originalHsv;
+            
+            string originalColorName = ColorHelper.ToDisplayName(originalHsv.ToRgb().ToColor());
+            string newColorName = originalColorName;
+
+            // Note: *newValue replaced with ref local variable for C#, must be initialized
+            double originalValue = 0.0;
+            ref double newValue = ref newHsv.H;
+            double incrementAmount = 0.0;
+
+            switch (component)
+            {
+                case HsvComponent.Hue:
+                    originalValue = originalHsv.H;
+                    newValue = ref newHsv.H;
+                    incrementAmount = 1;
+                    break;
+
+                case HsvComponent.Saturation:
+                    originalValue = originalHsv.S;
+                    newValue = ref newHsv.S;
+                    incrementAmount = 0.01;
+                    break;
+
+                case HsvComponent.Value:
+                    originalValue = originalHsv.V;
+                    newValue = ref newHsv.V;
+                    incrementAmount = 0.01;
+                    break;
+
+                default:
+                    throw new InvalidOperationException("Invalid HsvComponent.");
+            }
+
+            bool shouldFindMidPoint = true;
+
+            while (newColorName == originalColorName)
+            {
+                double previousValue = newValue;
+                newValue += (direction == IncrementDirection.Lower ? -1 : 1) * incrementAmount;
+
+                bool justWrapped = false;
+
+                // If we've hit a boundary, then either we should wrap or we shouldn't.
+                // If we should, then we'll perform that wrapping if we were previously up against
+                // the boundary that we've now hit.  Otherwise, we'll stop at that boundary.
+                if (newValue > maxBound)
+                {
+                    if (shouldWrap)
+                    {
+                        newValue = minBound;
+                        justWrapped = true;
+                    }
+                    else
+                    {
+                        newValue = maxBound;
+                        shouldFindMidPoint = false;
+                        newColorName = ColorHelper.ToDisplayName(newHsv.ToRgb().ToColor());
+                        break;
+                    }
+                }
+                else if (newValue < minBound)
+                {
+                    if (shouldWrap)
+                    {
+                        newValue = maxBound;
+                        justWrapped = true;
+                    }
+                    else
+                    {
+                        newValue = minBound;
+                        shouldFindMidPoint = false;
+                        newColorName = ColorHelper.ToDisplayName(newHsv.ToRgb().ToColor());
+                        break;
+                    }
+                }
+
+                if (!justWrapped &&
+                    previousValue != originalValue &&
+                    Math.Sign(newValue - originalValue) != Math.Sign(previousValue - originalValue))
+                {
+                    // If we've wrapped all the way back to the start and have failed to find a new color name,
+                    // then we'll just quit - there isn't a new color name that we're going to find.
+                    shouldFindMidPoint = false;
+                    break;
+                }
+
+                newColorName = ColorHelper.ToDisplayName(newHsv.ToRgb().ToColor());
+            }
+
+            if (shouldFindMidPoint)
+            {
+                Hsv startHsv = newHsv;
+                Hsv currentHsv = startHsv;
+                double startEndOffset = 0;
+                string currentColorName = newColorName;
+
+                // Note: *startValue/*currentValue replaced with ref local variables for C#, must be initialized
+                ref double startValue = ref startHsv.H;
+                ref double currentValue = ref currentHsv.H;
+                double wrapIncrement = 0;
+
+                switch (component)
+                {
+                    case HsvComponent.Hue:
+                        startValue = ref startHsv.H;
+                        currentValue = ref currentHsv.H;
+                        wrapIncrement = 360.0;
+                        break;
+
+                    case HsvComponent.Saturation:
+                        startValue = ref startHsv.S;
+                        currentValue = ref currentHsv.S;
+                        wrapIncrement = 1.0;
+                        break;
+
+                    case HsvComponent.Value:
+                        startValue = ref startHsv.V;
+                        currentValue = ref currentHsv.V;
+                        wrapIncrement = 1.0;
+                        break;
+
+                    default:
+                        throw new InvalidOperationException("Invalid HsvComponent.");
+                }
+
+                while (newColorName == currentColorName)
+                {
+                    currentValue += (direction == IncrementDirection.Lower ? -1 : 1) * incrementAmount;
+
+                    // If we've hit a boundary, then either we should wrap or we shouldn't.
+                    // If we should, then we'll perform that wrapping if we were previously up against
+                    // the boundary that we've now hit.  Otherwise, we'll stop at that boundary.
+                    if (currentValue > maxBound)
+                    {
+                        if (shouldWrap)
+                        {
+                            currentValue = minBound;
+                            startEndOffset = maxBound - minBound;
+                        }
+                        else
+                        {
+                            currentValue = maxBound;
+                            break;
+                        }
+                    }
+                    else if (currentValue < minBound)
+                    {
+                        if (shouldWrap)
+                        {
+                            currentValue = maxBound;
+                            startEndOffset = minBound - maxBound;
+                        }
+                        else
+                        {
+                            currentValue = minBound;
+                            break;
+                        }
+                    }
+
+                    currentColorName = ColorHelper.ToDisplayName(currentHsv.ToRgb().ToColor());
+                }
+
+                newValue = (startValue + currentValue + startEndOffset) / 2;
+
+                // Dividing by 2 may have gotten us halfway through a single step, so we'll
+                // remove that half-step if it exists.
+                double leftoverValue = Math.Abs(newValue);
+
+                while (leftoverValue > incrementAmount)
+                {
+                    leftoverValue -= incrementAmount;
+                }
+
+                newValue -= leftoverValue;
+
+                while (newValue < minBound)
+                {
+                    newValue += wrapIncrement;
+                }
+
+                while (newValue > maxBound)
+                {
+                    newValue -= wrapIncrement;
+                }
+            }
+
+            return newHsv;
+        }
+
+        /// <summary>
+        /// Converts the given raw BGRA pre-multiplied alpha pixel data into a bitmap.
+        /// </summary>
+        /// <param name="bgraPixelData">The bitmap (in raw BGRA pre-multiplied alpha pixels).</param>
+        /// <param name="pixelWidth">The pixel width of the bitmap.</param>
+        /// <param name="pixelHeight">The pixel height of the bitmap.</param>
+        /// <returns>A new <see cref="WriteableBitmap"/>.</returns>
+        public static WriteableBitmap CreateBitmapFromPixelData(
+            IList<byte> bgraPixelData,
+            int pixelWidth,
+            int pixelHeight)
+        {
+            // Standard may need to change on some devices
+            Vector dpi = new Vector(96, 96);
+
+            var bitmap = new WriteableBitmap(
+                new PixelSize(pixelWidth, pixelHeight),
+                dpi,
+                PixelFormat.Bgra8888,
+                AlphaFormat.Premul);
+
+            // Warning: This is highly questionable
+            using (var frameBuffer = bitmap.Lock())
+            {
+                Marshal.Copy(bgraPixelData.ToArray(), 0, frameBuffer.Address, bgraPixelData.Count);
+            }
+
+            return bitmap;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/Hsv.cs b/src/Avalonia.Controls.ColorPicker/Helpers/Hsv.cs
new file mode 100644
index 0000000000..8a425b9581
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/Hsv.cs
@@ -0,0 +1,86 @@
+// Portions of this source file are adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Contains and allows modification of Hue, Saturation and Value components.
+    /// </summary>
+    /// <remarks>
+    ///   The is a specialized struct optimized for permanence and memory:
+    ///   <list type="bullet">
+    ///     <item>This is not a read-only struct like <see cref="HsvColor"/> and allows editing the fields</item>
+    ///     <item>Removes the alpha component unnecessary in core calculations</item>
+    ///     <item>No component bounds checks or clamping is done.</item>
+    ///   </list>
+    /// </remarks>
+    internal struct Hsv
+    {
+        /// <summary>
+        /// The Hue component in the range from 0..359.
+        /// </summary>
+        public double H;
+
+        /// <summary>
+        /// The Saturation component in the range from 0..1.
+        /// </summary>
+        public double S;
+
+        /// <summary>
+        /// The Value component in the range from 0..1.
+        /// </summary>
+        public double V;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Hsv"/> struct.
+        /// </summary>
+        /// <param name="h">The Hue component in the range from 0..360.</param>
+        /// <param name="s">The Saturation component in the range from 0..1.</param>
+        /// <param name="v">The Value component in the range from 0..1.</param>
+        public Hsv(double h, double s, double v)
+        {
+            H = h;
+            S = s;
+            V = v;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Hsv"/> struct.
+        /// </summary>
+        /// <param name="hsvColor">An existing <see cref="HsvColor"/> to convert to <see cref="Hsv"/>.</param>
+        public Hsv(HsvColor hsvColor)
+        {
+            H = hsvColor.H;
+            S = hsvColor.S;
+            V = hsvColor.V;
+        }
+
+        /// <summary>
+        /// Converts this <see cref="Hsv"/> struct into a standard <see cref="HsvColor"/>.
+        /// </summary>
+        /// <param name="alpha">The Alpha component in the range from 0..1.</param>
+        /// <returns>A new <see cref="HsvColor"/> representing this <see cref="Hsv"/> struct.</returns>
+        public HsvColor ToHsvColor(double alpha = 1.0)
+        {
+            // Clamping is done automatically in the constructor
+            return HsvColor.FromAhsv(alpha, H, S, V);
+        }
+
+        /// <summary>
+        /// Returns the <see cref="Rgb"/> color model equivalent of this <see cref="Hsv"/> color.
+        /// </summary>
+        /// <returns>The <see cref="Rgb"/> equivalent color.</returns>
+        public Rgb ToRgb()
+        {
+            // Instantiating a Color is unfortunately necessary to use existing conversions
+            // Clamping is done internally in the conversion method
+            Color color = HsvColor.ToRgb(H, S, V);
+
+            return new Rgb(color);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/IncrementAmount.cs b/src/Avalonia.Controls.ColorPicker/Helpers/IncrementAmount.cs
new file mode 100644
index 0000000000..12aca593d5
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/IncrementAmount.cs
@@ -0,0 +1,23 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Defines a relative amount that a color component should be incremented.
+    /// </summary>
+    internal enum IncrementAmount
+    {
+        /// <summary>
+        /// A smaller change in value.
+        /// </summary>
+        Small,
+
+        /// <summary>
+        /// A larger change in value.
+        /// </summary>
+        Large,
+    };
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/IncrementDirection.cs b/src/Avalonia.Controls.ColorPicker/Helpers/IncrementDirection.cs
new file mode 100644
index 0000000000..df9c1e3350
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/IncrementDirection.cs
@@ -0,0 +1,23 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Defines the direction a color component should be incremented.
+    /// </summary>
+    internal enum IncrementDirection
+    {
+        /// <summary>
+        /// Decreasing in value towards zero.
+        /// </summary>
+        Lower,
+
+        /// <summary>
+        /// Increasing in value towards positive infinity.
+        /// </summary>
+        Higher,
+    };
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Helpers/Rgb.cs b/src/Avalonia.Controls.ColorPicker/Helpers/Rgb.cs
new file mode 100644
index 0000000000..72e3821c2b
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Helpers/Rgb.cs
@@ -0,0 +1,94 @@
+// Portions of this source file are adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Contains and allows modification of Red, Green and Blue components.
+    /// </summary>
+    /// <remarks>
+    ///   The is a specialized struct optimized for permanence and memory:
+    ///   <list type="bullet">
+    ///     <item>This is not a read-only struct like <see cref="Color"/> and allows editing the fields</item>
+    ///     <item>Removes the alpha component unnecessary in core calculations</item>
+    ///     <item>Normalizes RGB components in the range of 0..1 to simplify calculations.</item>
+    ///     <item>No component bounds checks or clamping is done.</item>
+    ///   </list>
+    /// </remarks>
+    internal struct Rgb
+    {
+        /// <summary>
+        /// The Red component in the range from 0..1.
+        /// </summary>
+        public double R;
+
+        /// <summary>
+        /// The Green component in the range from 0..1.
+        /// </summary>
+        public double G;
+
+        /// <summary>
+        /// The Blue component in the range from 0..1.
+        /// </summary>
+        public double B;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rgb"/> struct.
+        /// </summary>
+        /// <param name="r">The Red component in the range from 0..1.</param>
+        /// <param name="g">The Green component in the range from 0..1.</param>
+        /// <param name="b">The Blue component in the range from 0..1.</param>
+        public Rgb(double r, double g, double b)
+        {
+            R = r;
+            G = g;
+            B = b;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Rgb"/> struct.
+        /// </summary>
+        /// <param name="color">An existing <see cref="Color"/> to convert to <see cref="Rgb"/>.</param>
+        public Rgb(Color color)
+        {
+            R = color.R / 255.0;
+            G = color.G / 255.0;
+            B = color.B / 255.0;
+        }
+
+        /// <summary>
+        /// Converts this <see cref="Rgb"/> struct into a standard <see cref="Color"/>.
+        /// </summary>
+        /// <param name="alpha">The Alpha component in the range from 0..1.</param>
+        /// <returns>A new <see cref="Color"/> representing this <see cref="Rgb"/> struct.</returns>
+        public Color ToColor(double alpha = 1.0)
+        {
+            return Color.FromArgb(
+                (byte)MathUtilities.Clamp(alpha * 255.0, 0x00, 0xFF),
+                (byte)MathUtilities.Clamp(R * 255.0, 0x00, 0xFF),
+                (byte)MathUtilities.Clamp(G * 255.0, 0x00, 0xFF),
+                (byte)MathUtilities.Clamp(B * 255.0, 0x00, 0xFF));
+        }
+
+        /// <summary>
+        /// Returns the <see cref="Hsv"/> color model equivalent of this <see cref="Rgb"/> color.
+        /// </summary>
+        /// <returns>The <see cref="Hsv"/> equivalent color.</returns>
+        public Hsv ToHsv()
+        {
+            // Instantiating an HsvColor is unfortunately necessary to use existing conversions
+            // Clamping must be done here as it isn't done in the conversion method (internal-use only)
+            HsvColor hsvColor = Color.ToHsv(
+                MathUtilities.Clamp(R, 0.0, 1.0),
+                MathUtilities.Clamp(G, 0.0, 1.0),
+                MathUtilities.Clamp(B, 0.0, 1.0));
+
+            return new Hsv(hsvColor);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.ColorPicker/HsvComponent.cs b/src/Avalonia.Controls.ColorPicker/HsvComponent.cs
new file mode 100644
index 0000000000..1a7a13166a
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/HsvComponent.cs
@@ -0,0 +1,47 @@
+// This source file is adapted from the WinUI project.
+// (https://github.com/microsoft/microsoft-ui-xaml)
+//
+// Licensed to The Avalonia Project under the MIT License.
+
+using Avalonia.Media;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines a specific component in the HSV color model.
+    /// </summary>
+    public enum HsvComponent
+    {
+        /// <summary>
+        /// The Alpha component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="HsvColor.A"/>
+        /// </remarks>
+        Alpha = 0,
+
+        /// <summary>
+        /// The Hue component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="HsvColor.H"/>
+        /// </remarks>
+        Hue = 1,
+
+        /// <summary>
+        /// The Saturation component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="HsvColor.S"/>
+        /// </remarks>
+        Saturation = 2,
+
+        /// <summary>
+        /// The Value component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="HsvColor.V"/>
+        /// </remarks>
+        Value = 3
+    };
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Properties/AssemblyInfo.cs b/src/Avalonia.Controls.ColorPicker/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..64769303d6
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Properties/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using Avalonia.Metadata;
+
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Collections")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Primitives")]
diff --git a/src/Avalonia.Controls.ColorPicker/RgbComponent.cs b/src/Avalonia.Controls.ColorPicker/RgbComponent.cs
new file mode 100644
index 0000000000..c3591573bb
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/RgbComponent.cs
@@ -0,0 +1,42 @@
+using Avalonia.Media;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines a specific component in the RGB color model.
+    /// </summary>
+    public enum RgbComponent
+    {
+        /// <summary>
+        /// The Alpha component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="Color.A"/>
+        /// </remarks>
+        Alpha = 0,
+
+        /// <summary>
+        /// The Red component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="Color.R"/>
+        /// </remarks>
+        Red = 1,
+
+        /// <summary>
+        /// The Green component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="Color.G"/>
+        /// </remarks>
+        Green = 2,
+
+        /// <summary>
+        /// The Blue component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="Color.B"/>
+        /// </remarks>
+        Blue = 3
+    };
+}
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml
new file mode 100644
index 0000000000..15e5ca1655
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml
@@ -0,0 +1,86 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:converters="using:Avalonia.Controls.Converters"
+        xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
+        x:CompileBindings="True">
+
+  <Styles.Resources>
+    <pc:AccentColorConverter x:Key="AccentColor" />
+    <converters:ToBrushConverter x:Key="ToBrush" />
+    <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight"/>
+    <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft"/>
+  </Styles.Resources>
+
+  <Style Selector="ColorPreviewer">
+    <Setter Property="Height" Value="70" />
+    <Setter Property="CornerRadius" Value="0" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid ColumnDefinitions="Auto,*,Auto">
+          <!-- Left accent colors -->
+          <Grid Grid.Column="0"
+                Height="40"
+                Width="80"
+                ColumnDefinitions="*,*"
+                Margin="0,0,-10,0"
+                VerticalAlignment="Center"
+                IsVisible="{TemplateBinding ShowAccentColors}">
+            <Border Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="{StaticResource CheckeredBackgroundBrush}" />
+            <Border x:Name="AccentDec2Border"
+                    Grid.Column="0"
+                    CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                    Tag="-2"
+                    Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColor}, ConverterParameter='-2'}" />
+            <Border x:Name="AccentDec1Border"
+                    Grid.Column="1"
+                    Tag="-1"
+                    Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColor}, ConverterParameter='-1'}" />
+          </Grid>
+          <!-- Right accent colors -->
+          <Grid Grid.Column="2"
+                Height="40"
+                Width="80"
+                ColumnDefinitions="*,*"
+                Margin="-10,0,0,0"
+                VerticalAlignment="Center"
+                IsVisible="{TemplateBinding ShowAccentColors}">
+            <Border Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="{StaticResource CheckeredBackgroundBrush}" />
+            <Border x:Name="AccentInc1Border"
+                    Grid.Column="0"
+                    Tag="1"
+                    Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColor}, ConverterParameter='1'}" />
+            <Border x:Name="AccentInc2Border"
+                    Grid.Column="1"
+                    CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                    Tag="2"
+                    Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColor}, ConverterParameter='2'}" />
+          </Grid>
+          <!-- Must be last for drop shadow Z-index -->
+          <Border Grid.Column="1"
+                  BoxShadow="0 0 10 2 #BF000000"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  Margin="10">
+            <Panel>
+              <Border Background="{StaticResource CheckeredBackgroundBrush}"
+                      CornerRadius="{TemplateBinding CornerRadius}" />
+              <Border x:Name="PreviewBorder"
+                      CornerRadius="{TemplateBinding CornerRadius}"
+                      Background="{TemplateBinding HsvColor, Converter={StaticResource ToBrush}}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch" />
+            </Panel>
+          </Border>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+</Styles>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml
new file mode 100644
index 0000000000..19f10201a5
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml
@@ -0,0 +1,194 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:converters="using:Avalonia.Controls.Converters"
+        x:CompileBindings="True">
+
+  <Styles.Resources>
+    <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadius" Corner="TopLeft" />
+    <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadius" Corner="BottomRight" />
+  </Styles.Resources>
+
+  <Style Selector="Thumb.ColorSliderThumbStyle">
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="10" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style Selector="ColorSlider:horizontal">
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="CornerRadius" Value="10" />
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderThickness="{TemplateBinding BorderThickness}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid Margin="{TemplateBinding Padding}">
+            <Rectangle HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="{StaticResource CheckeredBackgroundBrush}"
+                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+            <Rectangle HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="{TemplateBinding Background}"
+                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+            <Track Name="PART_Track"
+                   HorizontalAlignment="Stretch"
+                   VerticalAlignment="Stretch"
+                   Minimum="{TemplateBinding Minimum}"
+                   Maximum="{TemplateBinding Maximum}"
+                   Value="{TemplateBinding Value, Mode=TwoWay}"
+                   IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                   Orientation="Horizontal">
+              <Track.DecreaseButton>
+                <RepeatButton Name="PART_DecreaseButton"
+                              Background="Transparent"
+                              Focusable="False"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Stretch">
+                  <RepeatButton.Template>
+                    <ControlTemplate>
+                      <Border Name="FocusTarget"
+                              Background="Transparent"
+                              Margin="0,-10" />
+                    </ControlTemplate>
+                  </RepeatButton.Template>
+                </RepeatButton>
+              </Track.DecreaseButton>
+              <Track.IncreaseButton>
+                <RepeatButton Name="PART_IncreaseButton"
+                              Background="Transparent"
+                              Focusable="False"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Stretch">
+                  <RepeatButton.Template>
+                    <ControlTemplate>
+                      <Border Name="FocusTarget"
+                              Background="Transparent"
+                              Margin="0,-10" />
+                    </ControlTemplate>
+                  </RepeatButton.Template>
+                </RepeatButton>
+              </Track.IncreaseButton>
+              <Thumb Classes="ColorSliderThumbStyle"
+                     Name="ColorSliderThumb"
+                     Margin="0"
+                     Padding="0"
+                     DataContext="{TemplateBinding Value}"
+                     Height="{TemplateBinding Height}"
+                     Width="{TemplateBinding Height}" />
+            </Track>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="ColorSlider:vertical">
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="CornerRadius" Value="10" />
+    <Setter Property="Width" Value="20" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderThickness="{TemplateBinding BorderThickness}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid Margin="{TemplateBinding Padding}">
+            <Rectangle HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="{StaticResource CheckeredBackgroundBrush}"
+                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+            <Rectangle HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="{TemplateBinding Background}"
+                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+            <Track Name="PART_Track"
+                   HorizontalAlignment="Stretch"
+                   VerticalAlignment="Stretch"
+                   Minimum="{TemplateBinding Minimum}"
+                   Maximum="{TemplateBinding Maximum}"
+                   Value="{TemplateBinding Value, Mode=TwoWay}"
+                   IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                   Orientation="Vertical">
+              <Track.DecreaseButton>
+                <RepeatButton Name="PART_DecreaseButton"
+                              Background="Transparent"
+                              Focusable="False"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Stretch">
+                  <RepeatButton.Template>
+                    <ControlTemplate>
+                      <Border Name="FocusTarget"
+                              Background="Transparent"
+                              Margin="0,-10" />
+                    </ControlTemplate>
+                  </RepeatButton.Template>
+                </RepeatButton>
+              </Track.DecreaseButton>
+              <Track.IncreaseButton>
+                <RepeatButton Name="PART_IncreaseButton"
+                              Background="Transparent"
+                              Focusable="False"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Stretch">
+                  <RepeatButton.Template>
+                    <ControlTemplate>
+                      <Border Name="FocusTarget"
+                              Background="Transparent"
+                              Margin="0,-10" />
+                    </ControlTemplate>
+                  </RepeatButton.Template>
+                </RepeatButton>
+              </Track.IncreaseButton>
+              <Thumb Classes="ColorSliderThumbStyle"
+                     Name="ColorSliderThumb"
+                     Margin="0"
+                     Padding="0"
+                     DataContext="{TemplateBinding Value}"
+                     Height="{TemplateBinding Width}"
+                     Width="{TemplateBinding Width}" />
+            </Track>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <!-- Normal State -->
+  <Style Selector="ColorSlider /template/ Thumb.ColorSliderThumbStyle">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="BorderThickness" Value="3" />
+  </Style>
+
+  <!-- Selector/Thumb Color -->
+  <Style Selector="ColorSlider:pointerover /template/ Thumb.ColorSliderThumbStyle">
+    <Setter Property="Opacity" Value="0.75" />
+  </Style>
+  <Style Selector="ColorSlider:pointerover:dark-selector /template/ Thumb.ColorSliderThumbStyle">
+    <Setter Property="Opacity" Value="0.7" />
+  </Style>
+  <Style Selector="ColorSlider:pointerover:light-selector /template/ Thumb.ColorSliderThumbStyle">
+    <Setter Property="Opacity" Value="0.8" />
+  </Style>
+
+  <Style Selector="ColorSlider:dark-selector /template/ Thumb.ColorSliderThumbStyle">
+    <Setter Property="BorderBrush" Value="Black" />
+  </Style>
+  <Style Selector="ColorSlider:light-selector /template/ Thumb.ColorSliderThumbStyle">
+    <Setter Property="BorderBrush" Value="White" />
+  </Style>
+
+</Styles>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml
new file mode 100644
index 0000000000..78e6da8aa3
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml
@@ -0,0 +1,134 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:converters="using:Avalonia.Controls.Converters"
+        x:CompileBindings="True">
+
+  <Styles.Resources>
+    <converters:EnumValueEqualsConverter x:Key="EnumValueEquals" />
+    <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadius" Corner="TopLeft" />
+    <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadius" Corner="BottomRight" />
+  </Styles.Resources>
+
+  <Style Selector="ColorSpectrum">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Panel x:Name="PART_LayoutRoot"
+                 HorizontalAlignment="Stretch"
+                 VerticalAlignment="Stretch">
+            <Panel x:Name="PART_SizingPanel"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   ClipToBounds="True">
+              <Rectangle x:Name="PART_SpectrumRectangle"
+                         IsHitTestVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Box'}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+              <Rectangle x:Name="PART_SpectrumOverlayRectangle"
+                         IsHitTestVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Box'}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+              <Ellipse x:Name="PART_SpectrumEllipse"
+                       IsHitTestVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Ring'}" />
+              <Ellipse x:Name="PART_SpectrumOverlayEllipse"
+                       IsHitTestVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Ring'}" />
+              <Canvas x:Name="PART_InputTarget"
+                      Background="Transparent"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                <!-- Note: ToolTip.VerticalOffset is for touch devices to keep the tip above fingers -->
+                <Panel x:Name="PART_SelectionEllipsePanel"
+                       ToolTip.VerticalOffset="-10"
+                       ToolTip.Placement="Top">
+                  <Ellipse x:Name="FocusEllipse"
+                           Margin="-2"
+                           StrokeThickness="2"
+                           IsHitTestVisible="False"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch" />
+                  <Ellipse x:Name="SelectionEllipse"
+                           StrokeThickness="2"
+                           IsHitTestVisible="False"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch" />
+                  <ToolTip.Tip>
+                    <!-- Set in code-behind -->
+                  </ToolTip.Tip>
+                </Panel>
+              </Canvas>
+              <Rectangle x:Name="BorderRectangle"
+                         IsHitTestVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Box'}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+              <Ellipse x:Name="BorderEllipse"
+                       IsHitTestVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Ring'}" />
+            </Panel>
+          </Panel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!-- Normal -->
+  <!-- Separating this allows easier customization in applications -->
+  <Style Selector="ColorSpectrum /template/ Ellipse#BorderEllipse,
+                   ColorSpectrum /template/ Rectangle#BorderRectangle">
+    <Setter Property="Stroke" Value="{DynamicResource ThemeBorderLowBrush}" />
+    <Setter Property="StrokeThickness" Value="1" />
+  </Style>
+
+  <!-- Focus -->
+  <Style Selector="ColorSpectrum /template/ Ellipse#FocusEllipse">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="ColorSpectrum:focus-visible /template/ Ellipse#FocusEllipse">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+
+  <!-- Selector Color -->
+  <Style Selector="ColorSpectrum /template/ Ellipse#FocusEllipse">
+    <Setter Property="Stroke" Value="White" />
+  </Style>
+  <Style Selector="ColorSpectrum /template/ Ellipse#SelectionEllipse">
+    <Setter Property="Stroke" Value="Black" />
+  </Style>
+  <Style Selector="ColorSpectrum:light-selector /template/ Ellipse#FocusEllipse">
+    <Setter Property="Stroke" Value="Black" />
+  </Style>
+  <Style Selector="ColorSpectrum:light-selector /template/ Ellipse#SelectionEllipse">
+    <Setter Property="Stroke" Value="White" />
+  </Style>
+
+  <Style Selector="ColorSpectrum:pointerover /template/ Ellipse#SelectionEllipse">
+    <Setter Property="Opacity" Value="0.8" />
+  </Style>
+
+  <!-- Selector Size -->
+  <Style Selector="ColorSpectrum /template/ Panel#PART_SelectionEllipsePanel">
+    <Setter Property="Width" Value="16" />
+    <Setter Property="Height" Value="16" />
+  </Style>
+  <Style Selector="ColorSpectrum:large-selector /template/ Panel#PART_SelectionEllipsePanel">
+    <Setter Property="Width" Value="48" />
+    <Setter Property="Height" Value="48" />
+  </Style>
+
+</Styles>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
new file mode 100644
index 0000000000..6d2f979f6e
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
@@ -0,0 +1,28 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+  <Styles.Resources>
+    <VisualBrush x:Key="CheckeredBackgroundBrush"
+                 TileMode="Tile"
+                 Stretch="Uniform"
+                 DestinationRect="0,0,8,8">
+      <VisualBrush.Visual>
+        <DrawingPresenter Width="8"
+                          Height="8">
+          <DrawingGroup>
+            <GeometryDrawing Geometry="M0,0 L2,0 2,2, 0,2Z"
+                             Brush="Transparent" />
+            <GeometryDrawing Geometry="M0,1 L2,1 2,2, 1,2 1,0 0,0Z"
+                             Brush="#19808080" />
+          </DrawingGroup>
+        </DrawingPresenter>
+      </VisualBrush.Visual>
+    </VisualBrush>
+  </Styles.Resources>
+
+  <!-- Primitives -->
+  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml" />
+  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml" />
+  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml" />
+
+</Styles>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
new file mode 100644
index 0000000000..cb764a738c
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
@@ -0,0 +1,86 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:converters="using:Avalonia.Controls.Converters"
+        xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
+        x:CompileBindings="True">
+
+  <Styles.Resources>
+    <pc:AccentColorConverter x:Key="AccentColor" />
+    <converters:ToBrushConverter x:Key="ToBrush" />
+    <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight"/>
+    <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft"/>
+  </Styles.Resources>
+
+  <Style Selector="ColorPreviewer">
+    <Setter Property="Height" Value="70" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid ColumnDefinitions="Auto,*,Auto">
+          <!-- Left accent colors -->
+          <Grid Grid.Column="0"
+                Height="40"
+                Width="80"
+                ColumnDefinitions="*,*"
+                Margin="0,0,-10,0"
+                VerticalAlignment="Center"
+                IsVisible="{TemplateBinding ShowAccentColors}">
+            <Border Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="{StaticResource CheckeredBackgroundBrush}" />
+            <Border x:Name="AccentDec2Border"
+                    Grid.Column="0"
+                    CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                    Tag="-2"
+                    Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColor}, ConverterParameter='-2'}" />
+            <Border x:Name="AccentDec1Border"
+                    Grid.Column="1"
+                    Tag="-1"
+                    Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColor}, ConverterParameter='-1'}" />
+          </Grid>
+          <!-- Right accent colors -->
+          <Grid Grid.Column="2"
+                Height="40"
+                Width="80"
+                ColumnDefinitions="*,*"
+                Margin="-10,0,0,0"
+                VerticalAlignment="Center"
+                IsVisible="{TemplateBinding ShowAccentColors}">
+            <Border Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="{StaticResource CheckeredBackgroundBrush}" />
+            <Border x:Name="AccentInc1Border"
+                    Grid.Column="0"
+                    Tag="1"
+                    Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColor}, ConverterParameter='1'}" />
+            <Border x:Name="AccentInc2Border"
+                    Grid.Column="1"
+                    CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                    Tag="2"
+                    Background="{TemplateBinding HsvColor, Converter={StaticResource AccentColor}, ConverterParameter='2'}" />
+          </Grid>
+          <!-- Must be last for drop shadow Z-index -->
+          <Border Grid.Column="1"
+                  BoxShadow="0 0 10 2 #BF000000"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  Margin="10">
+            <Panel>
+              <Border Background="{StaticResource CheckeredBackgroundBrush}"
+                      CornerRadius="{TemplateBinding CornerRadius}" />
+              <Border x:Name="PreviewBorder"
+                      CornerRadius="{TemplateBinding CornerRadius}"
+                      Background="{TemplateBinding HsvColor, Converter={StaticResource ToBrush}}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch" />
+            </Panel>
+          </Border>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+</Styles>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
new file mode 100644
index 0000000000..18a081721a
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
@@ -0,0 +1,194 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:converters="using:Avalonia.Controls.Converters"
+        x:CompileBindings="True">
+
+  <Styles.Resources>
+    <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadius" Corner="TopLeft" />
+    <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadius" Corner="BottomRight" />
+  </Styles.Resources>
+
+  <Style Selector="Thumb.ColorSliderThumbStyle">
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="10" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style Selector="ColorSlider:horizontal">
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="CornerRadius" Value="10" />
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderThickness="{TemplateBinding BorderThickness}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid Margin="{TemplateBinding Padding}">
+            <Rectangle HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="{StaticResource CheckeredBackgroundBrush}"
+                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+            <Rectangle HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="{TemplateBinding Background}"
+                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+            <Track Name="PART_Track"
+                   HorizontalAlignment="Stretch"
+                   VerticalAlignment="Stretch"
+                   Minimum="{TemplateBinding Minimum}"
+                   Maximum="{TemplateBinding Maximum}"
+                   Value="{TemplateBinding Value, Mode=TwoWay}"
+                   IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                   Orientation="Horizontal">
+              <Track.DecreaseButton>
+                <RepeatButton Name="PART_DecreaseButton"
+                              Background="Transparent"
+                              Focusable="False"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Stretch">
+                  <RepeatButton.Template>
+                    <ControlTemplate>
+                      <Border Name="FocusTarget"
+                              Background="Transparent"
+                              Margin="0,-10" />
+                    </ControlTemplate>
+                  </RepeatButton.Template>
+                </RepeatButton>
+              </Track.DecreaseButton>
+              <Track.IncreaseButton>
+                <RepeatButton Name="PART_IncreaseButton"
+                              Background="Transparent"
+                              Focusable="False"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Stretch">
+                  <RepeatButton.Template>
+                    <ControlTemplate>
+                      <Border Name="FocusTarget"
+                              Background="Transparent"
+                              Margin="0,-10" />
+                    </ControlTemplate>
+                  </RepeatButton.Template>
+                </RepeatButton>
+              </Track.IncreaseButton>
+              <Thumb Classes="ColorSliderThumbStyle"
+                     Name="ColorSliderThumb"
+                     Margin="0"
+                     Padding="0"
+                     DataContext="{TemplateBinding Value}"
+                     Height="{TemplateBinding Height}"
+                     Width="{TemplateBinding Height}" />
+            </Track>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="ColorSlider:vertical">
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="CornerRadius" Value="10" />
+    <Setter Property="Width" Value="20" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderThickness="{TemplateBinding BorderThickness}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid Margin="{TemplateBinding Padding}">
+            <Rectangle HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="{StaticResource CheckeredBackgroundBrush}"
+                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+            <Rectangle HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="{TemplateBinding Background}"
+                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+            <Track Name="PART_Track"
+                   HorizontalAlignment="Stretch"
+                   VerticalAlignment="Stretch"
+                   Minimum="{TemplateBinding Minimum}"
+                   Maximum="{TemplateBinding Maximum}"
+                   Value="{TemplateBinding Value, Mode=TwoWay}"
+                   IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                   Orientation="Vertical">
+              <Track.DecreaseButton>
+                <RepeatButton Name="PART_DecreaseButton"
+                              Background="Transparent"
+                              Focusable="False"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Stretch">
+                  <RepeatButton.Template>
+                    <ControlTemplate>
+                      <Border Name="FocusTarget"
+                              Background="Transparent"
+                              Margin="0,-10" />
+                    </ControlTemplate>
+                  </RepeatButton.Template>
+                </RepeatButton>
+              </Track.DecreaseButton>
+              <Track.IncreaseButton>
+                <RepeatButton Name="PART_IncreaseButton"
+                              Background="Transparent"
+                              Focusable="False"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Stretch">
+                  <RepeatButton.Template>
+                    <ControlTemplate>
+                      <Border Name="FocusTarget"
+                              Background="Transparent"
+                              Margin="0,-10" />
+                    </ControlTemplate>
+                  </RepeatButton.Template>
+                </RepeatButton>
+              </Track.IncreaseButton>
+              <Thumb Classes="ColorSliderThumbStyle"
+                     Name="ColorSliderThumb"
+                     Margin="0"
+                     Padding="0"
+                     DataContext="{TemplateBinding Value}"
+                     Height="{TemplateBinding Width}"
+                     Width="{TemplateBinding Width}" />
+            </Track>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <!-- Normal State -->
+  <Style Selector="ColorSlider /template/ Thumb.ColorSliderThumbStyle">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+    <Setter Property="BorderThickness" Value="3" />
+  </Style>
+
+  <!-- Selector/Thumb Color -->
+  <Style Selector="ColorSlider:pointerover /template/ Thumb.ColorSliderThumbStyle">
+    <Setter Property="Opacity" Value="0.75" />
+  </Style>
+  <Style Selector="ColorSlider:pointerover:dark-selector /template/ Thumb.ColorSliderThumbStyle">
+    <Setter Property="Opacity" Value="0.7" />
+  </Style>
+  <Style Selector="ColorSlider:pointerover:light-selector /template/ Thumb.ColorSliderThumbStyle">
+    <Setter Property="Opacity" Value="0.8" />
+  </Style>
+
+  <Style Selector="ColorSlider:dark-selector /template/ Thumb.ColorSliderThumbStyle">
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlBackgroundChromeBlackHighBrush}" />
+  </Style>
+  <Style Selector="ColorSlider:light-selector /template/ Thumb.ColorSliderThumbStyle">
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlBackgroundChromeWhiteBrush}" />
+  </Style>
+
+</Styles>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml
new file mode 100644
index 0000000000..ac8e2a9c06
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml
@@ -0,0 +1,137 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:converters="using:Avalonia.Controls.Converters"
+        x:CompileBindings="True">
+
+  <Styles.Resources>
+    <converters:EnumValueEqualsConverter x:Key="EnumValueEquals" />
+    <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadius" Corner="TopLeft" />
+    <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadius" Corner="BottomRight" />
+  </Styles.Resources>
+
+  <Style Selector="ColorSpectrum">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Panel x:Name="PART_LayoutRoot"
+                 HorizontalAlignment="Stretch"
+                 VerticalAlignment="Stretch">
+            <Panel x:Name="PART_SizingPanel"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   ClipToBounds="True">
+              <Rectangle x:Name="PART_SpectrumRectangle"
+                         IsHitTestVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Box'}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+              <Rectangle x:Name="PART_SpectrumOverlayRectangle"
+                         IsHitTestVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Box'}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+              <Ellipse x:Name="PART_SpectrumEllipse"
+                       IsHitTestVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Ring'}" />
+              <Ellipse x:Name="PART_SpectrumOverlayEllipse"
+                       IsHitTestVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Ring'}" />
+              <Canvas x:Name="PART_InputTarget"
+                      Background="Transparent"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                <!-- Note: ToolTip.VerticalOffset is for touch devices to keep the tip above fingers -->
+                <Panel x:Name="PART_SelectionEllipsePanel"
+                       ToolTip.VerticalOffset="-10"
+                       ToolTip.Placement="Top">
+                  <Ellipse x:Name="FocusEllipse"
+                           Margin="-2"
+                           StrokeThickness="2"
+                           IsHitTestVisible="False"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch" />
+                  <Ellipse x:Name="SelectionEllipse"
+                           StrokeThickness="2"
+                           IsHitTestVisible="False"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch" />
+                  <ToolTip.Tip>
+                    <!-- Set in code-behind -->
+                  </ToolTip.Tip>
+                </Panel>
+              </Canvas>
+              <Rectangle x:Name="BorderRectangle"
+                         IsHitTestVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Box'}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
+              <Ellipse x:Name="BorderEllipse"
+                       IsHitTestVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Ring'}" />
+            </Panel>
+          </Panel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!-- Normal -->
+  <!-- Separating this allows easier customization in applications -->
+  <Style Selector="ColorSpectrum /template/ Ellipse#BorderEllipse,
+                   ColorSpectrum /template/ Rectangle#BorderRectangle">
+    <Setter Property="Stroke" Value="{DynamicResource SystemControlForegroundListLowBrush}" />
+    <Setter Property="StrokeThickness" Value="1" />
+  </Style>
+
+  <!-- Focus -->
+  <Style Selector="ColorSpectrum /template/ Ellipse#FocusEllipse">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="ColorSpectrum:focus-visible /template/ Ellipse#FocusEllipse">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+
+  <!-- Selector Color -->
+  <Style Selector="ColorSpectrum /template/ Ellipse#FocusEllipse">
+    <Setter Property="Stroke" Value="{DynamicResource SystemControlBackgroundChromeWhiteBrush}" />
+  </Style>
+  <Style Selector="ColorSpectrum /template/ Ellipse#SelectionEllipse">
+    <Setter Property="Stroke" Value="{DynamicResource SystemControlBackgroundChromeBlackHighBrush}" />
+  </Style>
+  <Style Selector="ColorSpectrum:light-selector /template/ Ellipse#FocusEllipse">
+    <Setter Property="Stroke" Value="{DynamicResource SystemControlBackgroundChromeBlackHighBrush}" />
+  </Style>
+  <Style Selector="ColorSpectrum:light-selector /template/ Ellipse#SelectionEllipse">
+    <Setter Property="Stroke" Value="{DynamicResource SystemControlBackgroundChromeWhiteBrush}" />
+  </Style>
+
+  <Style Selector="ColorSpectrum:pointerover /template/ Ellipse#SelectionEllipse">
+    <Setter Property="Opacity" Value="0.7" />
+  </Style>
+  <Style Selector="ColorSpectrum:pointerover:light-selector /template/ Ellipse#SelectionEllipse">
+    <Setter Property="Opacity" Value="0.8" />
+  </Style>
+
+  <!-- Selector Size -->
+  <Style Selector="ColorSpectrum /template/ Panel#PART_SelectionEllipsePanel">
+    <Setter Property="Width" Value="16" />
+    <Setter Property="Height" Value="16" />
+  </Style>
+  <Style Selector="ColorSpectrum:large-selector /template/ Panel#PART_SelectionEllipsePanel">
+    <Setter Property="Width" Value="48" />
+    <Setter Property="Height" Value="48" />
+  </Style>
+
+</Styles>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
new file mode 100644
index 0000000000..c25d79727f
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
@@ -0,0 +1,28 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+  <Styles.Resources>
+    <VisualBrush x:Key="CheckeredBackgroundBrush"
+                 TileMode="Tile"
+                 Stretch="Uniform"
+                 DestinationRect="0,0,8,8">
+      <VisualBrush.Visual>
+        <DrawingPresenter Width="8"
+                          Height="8">
+          <DrawingGroup>
+            <GeometryDrawing Geometry="M0,0 L2,0 2,2, 0,2Z"
+                             Brush="Transparent" />
+            <GeometryDrawing Geometry="M0,1 L2,1 2,2, 1,2 1,0 0,0Z"
+                             Brush="#19808080" />
+          </DrawingGroup>
+        </DrawingPresenter>
+      </VisualBrush.Visual>
+    </VisualBrush>
+  </Styles.Resources>
+
+  <!-- Primitives -->
+  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml" />
+  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml" />
+  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml" />
+
+</Styles>
diff --git a/src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt b/src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..bfcec2960a
--- /dev/null
+++ b/src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt
@@ -0,0 +1,4 @@
+Compat issues with assembly Avalonia.Controls.DataGrid:
+MembersMustExist : Member 'protected void Avalonia.Controls.DataGridCheckBoxColumn.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.DataGridTextColumn.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+Total Issues: 2
diff --git a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
index c89157dc0f..6369961f0f 100644
--- a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
+++ b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
@@ -4,14 +4,8 @@
     <PackageId>Avalonia.Controls.DataGrid</PackageId>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
     <ProjectReference Include="..\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />    
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
@@ -23,4 +17,10 @@
   <Import Project="..\..\build\JetBrains.Annotations.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\ApiDiff.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Controls.DataGrid.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.DesignerSupport, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs b/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs
index fe6acdc532..906ec661ae 100644
--- a/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs
+++ b/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs
@@ -3946,7 +3946,7 @@ namespace Avalonia.Collections
             {
                 sort.Initialize(itemType); 
 
-                if(seq is IOrderedEnumerable<object> orderedEnum)
+                if (seq is IOrderedEnumerable<object> orderedEnum)
                 {
                     seq = sort.ThenBy(orderedEnum);
                 }
diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index 5d71a499e3..aaac3f8f9c 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -32,6 +32,14 @@ namespace Avalonia.Controls
     /// <summary>
     /// Displays data in a customizable grid.
     /// </summary>
+    [TemplatePart(DATAGRID_elementBottomRightCornerHeaderName,     typeof(IVisual))]
+    [TemplatePart(DATAGRID_elementColumnHeadersPresenterName,      typeof(DataGridColumnHeadersPresenter))]
+    [TemplatePart(DATAGRID_elementFrozenColumnScrollBarSpacerName, typeof(Control))]
+    [TemplatePart(DATAGRID_elementHorizontalScrollbarName,         typeof(ScrollBar))]
+    [TemplatePart(DATAGRID_elementRowsPresenterName,               typeof(DataGridRowsPresenter))]
+    [TemplatePart(DATAGRID_elementTopLeftCornerHeaderName,         typeof(ContentControl))]
+    [TemplatePart(DATAGRID_elementTopRightCornerHeaderName,        typeof(ContentControl))]
+    [TemplatePart(DATAGRID_elementVerticalScrollbarName,           typeof(ScrollBar))]
     [PseudoClasses(":invalid", ":empty-rows", ":empty-columns")]
     public partial class DataGrid : TemplatedControl
     {
@@ -669,8 +677,6 @@ namespace Avalonia.Controls
             ItemsProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnItemsPropertyChanged(e));
             CanUserResizeColumnsProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnCanUserResizeColumnsChanged(e));
             ColumnWidthProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnColumnWidthChanged(e));
-            RowBackgroundProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnRowBackgroundChanged(e));
-            AlternatingRowBackgroundProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnRowBackgroundChanged(e));
             FrozenColumnCountProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnFrozenColumnCountChanged(e));
             GridLinesVisibilityProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnGridLinesVisibilityChanged(e));
             HeadersVisibilityProperty.Changed.AddClassHandler<DataGrid>((x, e) => x.OnHeadersVisibilityChanged(e));
@@ -1144,14 +1150,6 @@ namespace Avalonia.Controls
             InvalidateCellsArrange();
         }
 
-        private void OnRowBackgroundChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            foreach (DataGridRow row in GetAllRows())
-            {
-                row.EnsureBackground();
-            }
-        }
-
         private void OnColumnWidthChanged(AvaloniaPropertyChangedEventArgs e)
         {
             var value = (DataGridLength)e.NewValue;
@@ -2060,6 +2058,25 @@ namespace Avalonia.Controls
                     forceHorizontalScroll: true);
             }
         }
+        
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            if (DataConnection.DataSource != null && !DataConnection.EventsWired)
+            {
+                DataConnection.WireEvents(DataConnection.DataSource);
+            }
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+            // When wired to INotifyCollectionChanged, the DataGrid will be cleaned up by GC
+            if (DataConnection.DataSource != null && DataConnection.EventsWired)
+            {
+                DataConnection.UnWireEvents(DataConnection.DataSource);
+            }
+        }
 
         /// <summary>
         /// Arranges the content of the <see cref="T:Avalonia.Controls.DataGridRow" />.
diff --git a/src/Avalonia.Controls.DataGrid/DataGridCell.cs b/src/Avalonia.Controls.DataGrid/DataGridCell.cs
index e3f150f5c4..67183781d3 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridCell.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridCell.cs
@@ -13,6 +13,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Represents an individual <see cref="T:Avalonia.Controls.DataGrid" /> cell.
     /// </summary>
+    [TemplatePart(DATAGRIDCELL_elementRightGridLine, typeof(Rectangle))]
     [PseudoClasses(":selected", ":current", ":edited", ":invalid")]
     public class DataGridCell : ContentControl
     {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
index ccf1f3f77a..9826c15598 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
@@ -46,7 +46,7 @@ namespace Avalonia.Controls
             set => SetValue(IsThreeStateProperty, value);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
index a77b482436..f3ea48ff80 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
@@ -192,14 +192,14 @@ namespace Avalonia.Controls
             set => SetValue(IsVisibleProperty, value);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == IsVisibleProperty)
             {
                 OwningGrid?.OnColumnVisibleStateChanging(this);
-                var isVisible = (change as AvaloniaPropertyChangedEventArgs<bool>).NewValue.Value;
+                var isVisible = change.GetNewValue<bool>();
 
                 if (_headerCell != null)
                 {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumnCollection.cs b/src/Avalonia.Controls.DataGrid/DataGridColumnCollection.cs
index 922b1d9c08..e7f9a9a6c4 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumnCollection.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumnCollection.cs
@@ -12,7 +12,8 @@ namespace Avalonia.Controls
 {
     internal class DataGridColumnCollection : ObservableCollection<DataGridColumn>
     {
-        private DataGrid _owningGrid;
+        private readonly Dictionary<int, int> _columnsMap = new Dictionary<int, int>();
+        private readonly DataGrid _owningGrid;
 
         public DataGridColumnCollection(DataGrid owningGrid)
         {
@@ -124,18 +125,8 @@ namespace Avalonia.Controls
 
         internal int VisibleColumnCount
         {
-            get
-            {
-                int visibleColumnCount = 0;
-                for (int columnIndex = 0; columnIndex < ItemsInternal.Count; columnIndex++)
-                {
-                    if (ItemsInternal[columnIndex].IsVisible)
-                    {
-                        visibleColumnCount++;
-                    }
-                }
-                return visibleColumnCount;
-            }
+            get;
+            private set;
         }
 
         internal double VisibleEdgedColumnsWidth
@@ -287,20 +278,31 @@ namespace Avalonia.Controls
         {
             VisibleStarColumnCount = 0;
             VisibleEdgedColumnsWidth = 0;
+            VisibleColumnCount = 0;
+            _columnsMap.Clear();
+
             for (int columnIndex = 0; columnIndex < ItemsInternal.Count; columnIndex++)
             {
-                if (ItemsInternal[columnIndex].IsVisible)
+                var item = ItemsInternal[columnIndex];
+                _columnsMap[columnIndex] = item.DisplayIndex;
+                if (item.IsVisible)
                 {
-                    ItemsInternal[columnIndex].EnsureWidth();
-                    if (ItemsInternal[columnIndex].Width.IsStar)
+                    VisibleColumnCount++;
+                    item.EnsureWidth();
+                    if (item.Width.IsStar)
                     {
                         VisibleStarColumnCount++;
                     }
-                    VisibleEdgedColumnsWidth += ItemsInternal[columnIndex].ActualWidth;
+                    VisibleEdgedColumnsWidth += item.ActualWidth;
                 }
             }
         }
 
+        internal int GetColumnDisplayIndex(int columnIndex)
+        {
+            return _columnsMap.TryGetValue(columnIndex, out var displayIndex) ? displayIndex : -1;
+        }
+
         internal DataGridColumn GetColumnAtDisplayIndex(int displayIndex)
         {
             if (displayIndex < 0 || displayIndex >= ItemsInternal.Count || displayIndex >= DisplayIndexMap.Count)
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumns.cs b/src/Avalonia.Controls.DataGrid/DataGridColumns.cs
index a4577ee952..52f0ad7537 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumns.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumns.cs
@@ -444,12 +444,11 @@ namespace Avalonia.Controls
 
             // We need to explicitly collapse the cells of the invisible column because layout only goes through
             // visible ones
-            if (!updatedColumn.IsVisible)
+            ColumnHeaders?.InvalidateChildIndex();
+            foreach (var row in GetAllRows())
             {
-                foreach (DataGridRow row in GetAllRows())
-                {
-                    row.Cells[updatedColumn.Index].IsVisible = false;
-                }
+                row.Cells[updatedColumn.Index].IsVisible = updatedColumn.IsVisible;
+                row.InvalidateCellsIndex();
             }
         }
 
diff --git a/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs b/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
index fade597ca1..ae52e5f970 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
@@ -77,7 +77,7 @@ namespace Avalonia.Controls
             private set;
         }
 
-        public int Count => GetCount(true);
+        public int Count => TryGetCount(true, false, out var count) ? count : 0;
 
         public bool DataIsPrimitive
         {
@@ -193,22 +193,28 @@ namespace Avalonia.Controls
             }
         }
 
-        internal bool Any()
-        {
-            return GetCount(false) > 0;
+        /// <summary>Try get number of DataSource itmes.</summary>
+        /// <param name="allowSlow">When "allowSlow" is false, method will not use Linq.Count() method and will return 0 or 1 instead.</param>
+        /// <param name="getAny">If "getAny" is true, method can use Linq.Any() method to speedup.</param>
+        /// <param name="count">number of DataSource itmes.</param>
+        /// <returns>true if able to retrieve number of DataSource itmes; otherwise, false.</returns>
+        internal bool TryGetCount(bool allowSlow, bool getAny, out int count)
+        {
+            bool result;
+            (result, count) = DataSource switch
+            {
+                ICollection collection => (true, collection.Count),
+                DataGridCollectionView cv => (true, cv.Count),
+                IEnumerable enumerable when allowSlow && !getAny => (true, enumerable.Cast<object>().Count()),
+                IEnumerable enumerable when getAny => (true, enumerable.Cast<object>().Any() ? 1 : 0),
+                _ => (false, 0)
+            };
+            return result;
         }
 
-        /// <param name="allowSlow">When "allowSlow" is false, method will not use Linq.Count() method and will return 0 or 1 instead.</param>
-        private int GetCount(bool allowSlow)
+        internal bool Any()
         {
-            return DataSource switch
-            {
-                ICollection collection => collection.Count,
-                DataGridCollectionView cv => cv.Count,
-                IEnumerable enumerable when allowSlow => enumerable.Cast<object>().Count(),
-                IEnumerable enumerable when !allowSlow => enumerable.Cast<object>().Any() ? 1 : 0,
-                _ => 0
-            };
+            return TryGetCount(false, true, out var count) && count > 0;
         }
 
         /// <summary>
@@ -383,7 +389,7 @@ namespace Avalonia.Controls
                     List<string> propertyNames = TypeHelper.SplitPropertyPath(propertyName);
                     for (int i = 0; i < propertyNames.Count; i++)
                     {
-                        propertyInfo = propertyType.GetPropertyOrIndexer(propertyNames[i], out object[] index);
+                        propertyInfo = propertyType.GetPropertyOrIndexer(propertyNames[i], out _);
                         if (propertyInfo == null || propertyType.GetIsReadOnly() || propertyInfo.GetIsReadOnly())
                         {
                             // Either the data type is read-only, the property doesn't exist, or it does exist but is read-only
@@ -391,11 +397,10 @@ namespace Avalonia.Controls
                         }
 
                         // Check if EditableAttribute is defined on the property and if it indicates uneditable
-                        object[] attributes = propertyInfo.GetCustomAttributes(typeof(EditableAttribute), true);
+                        var attributes = propertyInfo.GetCustomAttributes(typeof(EditableAttribute), true);
                         if (attributes != null && attributes.Length > 0)
                         {
-                            EditableAttribute editableAttribute = attributes[0] as EditableAttribute;
-                            Debug.Assert(editableAttribute != null);
+                            var editableAttribute = (EditableAttribute)attributes[0];
                             if (!editableAttribute.AllowEdit)
                             {
                                 return true;
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRow.cs b/src/Avalonia.Controls.DataGrid/DataGridRow.cs
index 1efce7c0b8..b062a14e39 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRow.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRow.cs
@@ -21,6 +21,11 @@ namespace Avalonia.Controls
     /// <summary>
     /// Represents a <see cref="T:Avalonia.Controls.DataGrid" /> row.
     /// </summary>
+    [TemplatePart(DATAGRIDROW_elementBottomGridLine, typeof(Rectangle))]
+    [TemplatePart(DATAGRIDROW_elementCells,          typeof(DataGridCellsPresenter))]
+    [TemplatePart(DATAGRIDROW_elementDetails,        typeof(DataGridDetailsPresenter))]
+    [TemplatePart(DATAGRIDROW_elementRoot,           typeof(Panel))]
+    [TemplatePart(DATAGRIDROW_elementRowHeader,      typeof(DataGridRowHeader))]
     [PseudoClasses(":selected", ":editing", ":invalid")]
     public class DataGridRow : TemplatedControl
     {
@@ -543,7 +548,6 @@ namespace Avalonia.Controls
             RootElement = e.NameScope.Find<Panel>(DATAGRIDROW_elementRoot);
             if (RootElement != null)
             {
-                EnsureBackground();
                 UpdatePseudoClasses();
             }
 
@@ -668,43 +672,9 @@ namespace Avalonia.Controls
             Slot = -1;
         }
 
-        // Make sure the row's background is set to its correct value.  It could be explicity set or inherit
-        // DataGrid.RowBackground or DataGrid.AlternatingRowBackground
-        internal void EnsureBackground()
+        internal void InvalidateCellsIndex()
         {
-            // Inherit the DataGrid's RowBackground properties only if this row doesn't explicity have a background set
-            if (RootElement != null && OwningGrid != null)
-            {
-                IBrush newBackground = null;
-                if (Background == null)
-                {
-                    if (Index % 2 == 0 || OwningGrid.AlternatingRowBackground == null)
-                    {
-                        // Use OwningGrid.RowBackground if the index is even or if the OwningGrid.AlternatingRowBackground is null
-                        if (OwningGrid.RowBackground != null)
-                        {
-                            newBackground = OwningGrid.RowBackground;
-                        }
-                    }
-                    else
-                    {
-                        // Alternate row
-                        if (OwningGrid.AlternatingRowBackground != null)
-                        {
-                            newBackground = OwningGrid.AlternatingRowBackground;
-                        }
-                    }
-                }
-                else
-                {
-                    newBackground = Background;
-                }
-
-                if (RootElement.Background != newBackground)
-                {
-                    RootElement.Background = newBackground;
-                }
-            }
+            _cellsElement?.InvalidateChildIndex();
         }
 
         internal void EnsureFillerVisibility()
@@ -1092,7 +1062,7 @@ namespace Avalonia.Controls
         }
         
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             if (change.Property == DataContextProperty)
             {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
index 49ca23d34c..a3dfa44fc9 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
@@ -14,6 +14,12 @@ using System.Reactive.Linq;
 
 namespace Avalonia.Controls
 {
+    [TemplatePart(DATAGRIDROWGROUPHEADER_expanderButton,      typeof(ToggleButton))]
+    [TemplatePart(DATAGRIDROWGROUPHEADER_indentSpacer,        typeof(Control))]
+    [TemplatePart(DATAGRIDROWGROUPHEADER_itemCountElement,    typeof(TextBlock))]
+    [TemplatePart(DATAGRIDROWGROUPHEADER_propertyNameElement, typeof(TextBlock))]
+    [TemplatePart(DataGridRow.DATAGRIDROW_elementRoot,        typeof(Panel))]
+    [TemplatePart(DataGridRow.DATAGRIDROW_elementRowHeader,   typeof(DataGridRowHeader))]
     [PseudoClasses(":pressed", ":current", ":expanded")]
     public class DataGridRowGroupHeader : TemplatedControl
     {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
index 510072174f..03299bbf35 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
@@ -13,6 +13,7 @@ namespace Avalonia.Controls.Primitives
     /// <summary>
     /// Represents an individual <see cref="T:Avalonia.Controls.DataGrid" /> row header. 
     /// </summary>
+    [TemplatePart(DATAGRIDROWHEADER_elementRootName, typeof(Control))]
     [PseudoClasses(":invalid", ":selected", ":editing", ":current")]
     public class DataGridRowHeader : ContentControl
     {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRows.cs b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
index 1d5c899993..f3afe2c42d 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRows.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
@@ -5,6 +5,7 @@
 
 using Avalonia.Collections;
 using Avalonia.Controls.Utils;
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Utilities;
 using System;
@@ -811,7 +812,7 @@ namespace Avalonia.Controls
                 if (row.Slot > slotDeleted)
                 {
                     CorrectRowAfterDeletion(row, wasRow);
-                    row.EnsureBackground();
+                    _rowsPresenter?.InvalidateChildIndex(row);
                 }
             }
 
@@ -867,7 +868,7 @@ namespace Avalonia.Controls
                 if (row.Slot >= slotInserted)
                 {
                     DataGrid.CorrectRowAfterInsertion(row, rowInserted);
-                    row.EnsureBackground();
+                    _rowsPresenter?.InvalidateChildIndex(row);
                 }
             }
 
@@ -1485,8 +1486,8 @@ namespace Avalonia.Controls
             // If the row has been recycled, reapply the BackgroundBrush
             if (row.IsRecycled)
             {
-                row.EnsureBackground();
                 row.ApplyCellsState();
+                _rowsPresenter?.InvalidateChildIndex(row);
             }
             else if (row == EditingRow)
             {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
index 1cf6ab68ac..bb8637cda2 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
@@ -10,6 +10,7 @@ using System;
 using System.ComponentModel;
 using Avalonia.Layout;
 using Avalonia.Markup.Xaml.MarkupExtensions;
+using Avalonia.Controls.Documents;
 
 namespace Avalonia.Controls
 {
@@ -18,8 +19,6 @@ namespace Avalonia.Controls
     /// </summary>
     public class DataGridTextColumn : DataGridBoundColumn
     {
-        private const string DATAGRID_TextColumnCellTextBlockMarginKey = "DataGridTextColumnCellTextBlockMargin";
-
         /// <summary>
         /// Initializes a new instance of the <see cref="T:Avalonia.Controls.DataGridTextColumn" /> class.
         /// </summary>
@@ -32,7 +31,7 @@ namespace Avalonia.Controls
         /// Identifies the FontFamily dependency property.
         /// </summary>
         public static readonly AttachedProperty<FontFamily> FontFamilyProperty =
-            TextBlock.FontFamilyProperty.AddOwner<DataGridTextColumn>();
+            TextElement.FontFamilyProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font name.
@@ -47,7 +46,7 @@ namespace Avalonia.Controls
         /// Identifies the FontSize dependency property.
         /// </summary>
         public static readonly AttachedProperty<double> FontSizeProperty =
-            TextBlock.FontSizeProperty.AddOwner<DataGridTextColumn>();
+            TextElement.FontSizeProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font size.
@@ -64,7 +63,7 @@ namespace Avalonia.Controls
         /// Identifies the FontStyle dependency property.
         /// </summary>
         public static readonly AttachedProperty<FontStyle> FontStyleProperty =
-            TextBlock.FontStyleProperty.AddOwner<DataGridTextColumn>();
+            TextElement.FontStyleProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font style.
@@ -79,7 +78,7 @@ namespace Avalonia.Controls
         /// Identifies the FontWeight dependency property.
         /// </summary>
         public static readonly AttachedProperty<FontWeight> FontWeightProperty =
-            TextBlock.FontWeightProperty.AddOwner<DataGridTextColumn>();
+            TextElement.FontWeightProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font weight or thickness.
@@ -90,11 +89,26 @@ namespace Avalonia.Controls
             set => SetValue(FontWeightProperty, value);
         }
 
+        /// <summary>
+        /// Identifies the FontStretch dependency property.
+        /// </summary>
+        public static readonly AttachedProperty<FontStretch> FontStretchProperty =
+            TextElement.FontStretchProperty.AddOwner<DataGridTextColumn>();
+
+        /// <summary>
+        /// Gets or sets the font weight or thickness.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get => GetValue(FontStretchProperty);
+            set => SetValue(FontStretchProperty, value);
+        }
+
         /// <summary>
         /// Identifies the Foreground dependency property.
         /// </summary>
         public static readonly AttachedProperty<IBrush> ForegroundProperty =
-            TextBlock.ForegroundProperty.AddOwner<DataGridTextColumn>();
+            TextElement.ForegroundProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets a brush that describes the foreground of the column cells.
@@ -105,7 +119,7 @@ namespace Avalonia.Controls
             set => SetValue(ForegroundProperty, value);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -162,8 +176,7 @@ namespace Avalonia.Controls
         {
             TextBlock textBlockElement = new TextBlock
             {
-                [!Layoutable.MarginProperty] = new DynamicResourceExtension(DATAGRID_TextColumnCellTextBlockMarginKey),
-                VerticalAlignment = VerticalAlignment.Center
+                Name = "CellTextBlock"
             };
 
             SyncProperties(textBlockElement);
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
index c5fe9f0cb2..38d559a031 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
@@ -3,12 +3,13 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Utilities;
 using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Diagnostics;
-using Avalonia.Controls;
-using Avalonia.Controls.Utils;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -16,9 +17,10 @@ namespace Avalonia.Controls.Primitives
     /// Used within the template of a <see cref="T:Avalonia.Controls.DataGrid" />
     /// to specify the location in the control's visual tree where the cells are to be added. 
     /// </summary>
-    public sealed class DataGridCellsPresenter : Panel
+    public sealed class DataGridCellsPresenter : Panel, IChildIndexProvider
     {
         private double _fillerLeftEdge;
+        private EventHandler<ChildIndexChangedEventArgs> _childIndexChanged;
 
         // The desired height needs to be cached due to column virtualization; otherwise, the cells
         // would grow and shrink as the DataGrid scrolls horizontally
@@ -42,6 +44,25 @@ namespace Avalonia.Controls.Primitives
             set;
         }
 
+        event EventHandler<ChildIndexChangedEventArgs> IChildIndexProvider.ChildIndexChanged
+        {
+            add => _childIndexChanged += value;
+            remove => _childIndexChanged -= value;
+        }
+
+        int IChildIndexProvider.GetChildIndex(ILogical child)
+        {
+            return child is DataGridCell cell
+                ? OwningGrid.ColumnsInternal.GetColumnDisplayIndex(cell.ColumnIndex)
+                : throw new InvalidOperationException("Invalid cell type");
+        }
+
+        bool IChildIndexProvider.TryGetTotalCount(out int count)
+        {
+            count = OwningGrid.ColumnsInternal.VisibleColumnCount;
+            return true;
+        }
+
         /// <summary>
         /// Arranges the content of the <see cref="T:Avalonia.Controls.Primitives.DataGridCellsPresenter" />.
         /// </summary>
@@ -120,6 +141,13 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        protected override void ChildrenChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            base.ChildrenChanged(sender, e);
+
+            InvalidateChildIndex();
+        }
+
         private static void EnsureCellDisplay(DataGridCell cell, bool displayColumn)
         {
             if (cell.IsCurrent)
@@ -190,6 +218,8 @@ namespace Avalonia.Controls.Primitives
             {
                 // No explicit height values were set so we can autosize
                 autoSizeHeight = true;
+                // We need to invalidate desired height in order to grow or shrink as needed
+                InvalidateDesiredHeight();
                 measureHeight = double.PositiveInfinity;
             }
             else
@@ -304,6 +334,11 @@ namespace Avalonia.Controls.Primitives
             DesiredHeight = 0;
         }
 
+        internal void InvalidateChildIndex()
+        {
+            _childIndexChanged?.Invoke(this, ChildIndexChangedEventArgs.Empty);
+        }
+
         private bool ShouldDisplayCell(DataGridColumn column, double frozenLeftEdge, double scrollingLeftEdge)
         {
             if (!column.IsVisible)
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
index 4eed119240..108dc8ded7 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
@@ -3,8 +3,10 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 using System;
+using System.Collections.Specialized;
 using System.Diagnostics;
 
 namespace Avalonia.Controls.Primitives
@@ -13,10 +15,11 @@ namespace Avalonia.Controls.Primitives
     /// Used within the template of a <see cref="T:Avalonia.Controls.DataGrid" /> to specify the 
     /// location in the control's visual tree where the column headers are to be added.
     /// </summary>
-    public sealed class DataGridColumnHeadersPresenter : Panel
+    public sealed class DataGridColumnHeadersPresenter : Panel, IChildIndexProvider
     {
         private Control _dragIndicator;
         private IControl _dropLocationIndicator;
+        private EventHandler<ChildIndexChangedEventArgs> _childIndexChanged;
 
         /// <summary>
         /// Tracks which column is currently being dragged.
@@ -104,6 +107,25 @@ namespace Avalonia.Controls.Primitives
             set;
         }
 
+        event EventHandler<ChildIndexChangedEventArgs> IChildIndexProvider.ChildIndexChanged
+        {
+            add => _childIndexChanged += value;
+            remove => _childIndexChanged -= value;
+        }
+
+        int IChildIndexProvider.GetChildIndex(ILogical child)
+        {
+            return child is DataGridColumnHeader header
+                ? OwningGrid.ColumnsInternal.GetColumnDisplayIndex(header.ColumnIndex)
+                : throw new InvalidOperationException("Invalid cell type");
+        }
+
+        bool IChildIndexProvider.TryGetTotalCount(out int count)
+        {
+            count = OwningGrid.ColumnsInternal.VisibleColumnCount;
+            return true;
+        }
+
         /// <summary>
         /// Arranges the content of the <see cref="T:Avalonia.Controls.Primitives.DataGridColumnHeadersPresenter" />.
         /// </summary>
@@ -391,5 +413,17 @@ namespace Avalonia.Controls.Primitives
             OwningGrid.ColumnsInternal.EnsureVisibleEdgedColumnsWidth();
             return new Size(OwningGrid.ColumnsInternal.VisibleEdgedColumnsWidth, height);
         }
+
+        protected override void ChildrenChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            base.ChildrenChanged(sender, e);
+
+            InvalidateChildIndex();
+        }
+
+        internal void InvalidateChildIndex()
+        {
+            _childIndexChanged?.Invoke(this, ChildIndexChangedEventArgs.Empty);
+        }
     }
 }
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
index 308ebc69d4..5d82689eff 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
@@ -7,8 +7,8 @@ using System;
 using System.Diagnostics;
 
 using Avalonia.Input;
-using Avalonia.Input.GestureRecognizers;
 using Avalonia.Layout;
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 
 namespace Avalonia.Controls.Primitives
@@ -17,8 +17,10 @@ namespace Avalonia.Controls.Primitives
     /// Used within the template of a <see cref="T:Avalonia.Controls.DataGrid" /> to specify the
     /// location in the control's visual tree where the rows are to be added.
     /// </summary>
-    public sealed class DataGridRowsPresenter : Panel
+    public sealed class DataGridRowsPresenter : Panel, IChildIndexProvider
     {
+        private EventHandler<ChildIndexChangedEventArgs> _childIndexChanged;
+
         public DataGridRowsPresenter()
         {
             AddHandler(Gestures.ScrollGestureEvent, OnScrollGesture);
@@ -44,6 +46,29 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        event EventHandler<ChildIndexChangedEventArgs> IChildIndexProvider.ChildIndexChanged
+        {
+            add => _childIndexChanged += value;
+            remove => _childIndexChanged -= value;
+        }
+
+        int IChildIndexProvider.GetChildIndex(ILogical child)
+        {
+            return child is DataGridRow row
+                ? row.Index
+                : throw new InvalidOperationException("Invalid DataGrid child");
+        }
+
+        bool IChildIndexProvider.TryGetTotalCount(out int count)
+        {
+            return OwningGrid.DataConnection.TryGetCount(false, true, out count);
+        }
+
+        internal void InvalidateChildIndex(DataGridRow row)
+        {
+            _childIndexChanged?.Invoke(this, new ChildIndexChangedEventArgs(row));
+        }
+
         /// <summary>
         /// Arranges the content of the <see cref="T:Avalonia.Controls.Primitives.DataGridRowsPresenter" />.
         /// </summary>
diff --git a/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs b/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
index d61c05ab6e..64769303d6 100644
--- a/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
@@ -1,9 +1,5 @@
-using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
-[assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.DesignerSupport, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Collections")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Primitives")]
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Default.xaml b/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
index 6715b7ceb9..0d1fe43eb6 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
@@ -12,23 +12,32 @@
     <Setter Property="VerticalContentAlignment" Value="Stretch" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid ColumnDefinitions="*,Auto"
-              Background="{TemplateBinding Background}">
-          <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Margin="{TemplateBinding Padding}"
-                            TextBlock.Foreground="{TemplateBinding Foreground}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-
-          <Rectangle Name="PART_RightGridLine"
-                     Grid.Column="1"
-                     VerticalAlignment="Stretch"
-                     Width="1" />
-        </Grid>
+        <Border x:Name="CellBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid ColumnDefinitions="*,Auto">
+            <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              Margin="{TemplateBinding Padding}"
+                              Foreground="{TemplateBinding Foreground}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+
+            <Rectangle Name="PART_RightGridLine"
+                       Grid.Column="1"
+                       VerticalAlignment="Stretch"
+                       Width="1" />
+          </Grid>
+        </Border>
       </ControlTemplate>
     </Setter>
   </Style>
+  <Style Selector="DataGridCell > TextBlock#CellTextBlock">
+    <Setter Property="Margin" Value="{DynamicResource DataGridTextColumnCellTextBlockMargin}" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+  </Style>
 
   <Style Selector="DataGridColumnHeader">
     <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
@@ -40,35 +49,40 @@
 
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid ColumnDefinitions="*,Auto"
-              Background="{TemplateBinding Background}">
-
-          <Grid ColumnDefinitions="*,Auto"
-                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                Margin="{TemplateBinding Padding}">
-            <ContentPresenter Content="{TemplateBinding Content}" 
-                              ContentTemplate="{TemplateBinding ContentTemplate}" />
-
-            <Path Name="SortIcon"
-                  Grid.Column="1"
-                  Fill="{TemplateBinding Foreground}"
-                  HorizontalAlignment="Left"
-                  VerticalAlignment="Center"
-                  Stretch="Uniform"
-                  Width="8"
-                  Margin="4,0,0,0"
-                  Data="F1 M -5.215,6.099L 5.215,6.099L 0,0L -5.215,6.099 Z "/>
+        <Border x:Name="HeaderBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid ColumnDefinitions="*,Auto">
+
+            <Grid ColumnDefinitions="*,Auto"
+                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                  Margin="{TemplateBinding Padding}">
+              <ContentPresenter Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+              <Path Name="SortIcon"
+                    Grid.Column="1"
+                    Fill="{TemplateBinding Foreground}"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Stretch="Uniform"
+                    Width="8"
+                    Margin="4,0,0,0"
+                    Data="F1 M -5.215,6.099L 5.215,6.099L 0,0L -5.215,6.099 Z "/>
 
-          </Grid>
+            </Grid>
 
-          <Rectangle Name="VerticalSeparator"
-                     Grid.Column="1" Width="1"
-                     VerticalAlignment="Stretch"
-                     Fill="{TemplateBinding SeparatorBrush}"
-                     IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+            <Rectangle Name="VerticalSeparator"
+                       Grid.Column="1" Width="1"
+                       VerticalAlignment="Stretch"
+                       Fill="{TemplateBinding SeparatorBrush}"
+                       IsVisible="{TemplateBinding AreSeparatorsVisible}" />
 
-        </Grid>
+          </Grid>
+        </Border>
       </ControlTemplate>
     </Setter>
   </Style>
@@ -102,22 +116,35 @@
   <Style Selector="DataGridRow">
     <Setter Property="Template">
       <ControlTemplate>
-        <DataGridFrozenGrid Name="PART_Root"
-                                 RowDefinitions="*,Auto,Auto"
-                                 ColumnDefinitions="Auto,*">
+        <Border x:Name="RowBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <DataGridFrozenGrid Name="PART_Root"
+                              RowDefinitions="*,Auto,Auto"
+                              ColumnDefinitions="Auto,*">
 
-          <Rectangle Name="BackgroundRectangle" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
+            <Rectangle Name="BackgroundRectangle" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
 
-          <DataGridRowHeader Grid.RowSpan="3" Name="PART_RowHeader" DataGridFrozenGrid.IsFrozen="True" />
-          <DataGridCellsPresenter Grid.Column="1" Name="PART_CellsPresenter" DataGridFrozenGrid.IsFrozen="True" />
-          <DataGridDetailsPresenter Grid.Row="1" Grid.Column="1" Name="PART_DetailsPresenter"/>
-          <Rectangle Grid.Row="2" Grid.Column="1" Name="PART_BottomGridLine" HorizontalAlignment="Stretch" Height="1" />
+            <DataGridRowHeader Grid.RowSpan="3" Name="PART_RowHeader" DataGridFrozenGrid.IsFrozen="True" />
+            <DataGridCellsPresenter Grid.Column="1" Name="PART_CellsPresenter" DataGridFrozenGrid.IsFrozen="True" />
+            <DataGridDetailsPresenter Grid.Row="1" Grid.Column="1" Name="PART_DetailsPresenter"/>
+            <Rectangle Grid.Row="2" Grid.Column="1" Name="PART_BottomGridLine" HorizontalAlignment="Stretch" Height="1" />
 
-        </DataGridFrozenGrid>
+          </DataGridFrozenGrid>
+        </Border>
       </ControlTemplate>
     </Setter>
   </Style>
 
+  <Style Selector="DataGridRow">
+    <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
+  </Style>
+  <Style Selector="DataGridRow:nth-child(even)">
+    <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
+  </Style>
+
   <Style Selector="DataGridRow /template/ Rectangle#BackgroundRectangle">
     <Setter Property="IsVisible" Value="False"/>
     <Setter Property="Fill" Value="{DynamicResource HighlightBrush}" />
@@ -180,12 +207,18 @@
     <Setter Property="Template">
       <ControlTemplate>
         <DataGridFrozenGrid Name="Root"
-                                 Background="{TemplateBinding Background}"
-                                 ColumnDefinitions="Auto,Auto,Auto,Auto"
-                                 RowDefinitions="Auto,*,Auto">
+                            ColumnDefinitions="Auto,Auto,Auto,Auto"
+                            RowDefinitions="Auto,*,Auto">
 
           <Rectangle Grid.Column="1" Grid.Row="1" Name="IndentSpacer" />
-          <ToggleButton Grid.Column="2" Grid.Row="1" Name="ExpanderButton" Margin="2,0,0,0"/>
+          <ToggleButton Grid.Column="2" Grid.Row="1"
+                        Name="ExpanderButton"
+                        Margin="2,0,0,0"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Foreground="{TemplateBinding Foreground}" />
 
           <StackPanel Grid.Column="3" Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,1,0,1">
             <TextBlock Name="PropertyNameElement" Margin="4,0,0,0" IsVisible="{TemplateBinding IsPropertyNameVisible}"/>
@@ -238,9 +271,11 @@
     </Setter>
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
+        <Border x:Name="DataGridBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                BorderBrush="{TemplateBinding BorderBrush}">
+                CornerRadius="{TemplateBinding CornerRadius}">
           <Grid RowDefinitions="Auto,*,Auto,Auto" ColumnDefinitions="Auto,*,Auto">
 
             <DataGridColumnHeader Name="PART_TopLeftCornerHeader" Width="22" />
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index 432fe2c0bf..2baa8c88c9 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -1,87 +1,51 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <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>
+    <Thickness x:Key="DataGridTextColumnCellTextBlockMargin">12,0,12,0</Thickness>
 
     <StreamGeometry x:Key="DataGridSortIconDescendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
     <StreamGeometry x:Key="DataGridSortIconAscendingPath">M1965 947l-941 -941l-941 941l90 90l787 -787v1798h128v-1798l787 787z</StreamGeometry>
     <StreamGeometry x:Key="DataGridRowGroupHeaderIconClosedPath">M515 93l930 931l-930 931l90 90l1022 -1021l-1022 -1021z</StreamGeometry>
     <StreamGeometry x:Key="DataGridRowGroupHeaderIconOpenedPath">M1939 1581l90 -90l-1005 -1005l-1005 1005l90 90l915 -915z</StreamGeometry>
 
+    <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderDraggedBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+
+    <StaticResource x:Key="DataGridRowBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridRowSelectedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+
+    <SolidColorBrush x:Key="DataGridRowHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="DataGridRowHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+
+    <StaticResource x:Key="DataGridCellBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+
     <SolidColorBrush x:Key="DataGridGridLinesBrush"
-                     Color="{StaticResource SystemBaseMediumLowColor}"
-                     Opacity="0.4" />
-    <SolidColorBrush x:Key="DataGridDropLocationIndicatorBackground"
-                     Color="#3F4346" />
-    <SolidColorBrush x:Key="DataGridDisabledVisualElementBackground"
-                     Color="#8CFFFFFF" />
-    <SolidColorBrush x:Key="DataGridFillerGridLinesBrush"
-                     Color="Transparent" />
-    <SolidColorBrush x:Key="DataGridCurrencyVisualPrimaryBrush"
-                     Color="Transparent" />
-    <StaticResource x:Key="DataGridColumnHeaderBackgroundColor"
-                    ResourceKey="SystemAltHighColor" />
-    <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush"
-                     Color="{StaticResource DataGridColumnHeaderBackgroundColor}" />
-    <StaticResource x:Key="DataGridScrollBarsSeparatorBackground"
-                    ResourceKey="SystemChromeLowColor" />
-    <StaticResource x:Key="DataGridColumnHeaderForegroundBrush"
-                    ResourceKey="SystemControlForegroundBaseMediumBrush" />
-    <StaticResource x:Key="DataGridColumnHeaderHoveredBackgroundColor"
-                    ResourceKey="SystemListLowColor" />
-    <StaticResource x:Key="DataGridColumnHeaderPressedBackgroundColor"
-                    ResourceKey="SystemListMediumColor" />
-    <StaticResource x:Key="DataGridColumnHeaderDraggedBackgroundBrush"
-                    ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
-    <StaticResource x:Key="DataGridColumnHeaderPointerOverBrush"
-                    ResourceKey="SystemControlHighlightListLowBrush" />
-    <StaticResource x:Key="DataGridColumnHeaderPressedBrush"
-                    ResourceKey="SystemControlHighlightListMediumBrush" />
-    <StaticResource x:Key="DataGridDetailsPresenterBackgroundBrush"
-                    ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
-    <StaticResource x:Key="DataGridFillerColumnGridLinesBrush"
-                    ResourceKey="DataGridFillerGridLinesBrush" />
-    <StaticResource x:Key="DataGridRowSelectedBackgroundColor"
-                    ResourceKey="SystemAccentColor" />
-    <StaticResource x:Key="DataGridRowSelectedBackgroundOpacity"
-                    ResourceKey="ListAccentLowOpacity" />
-    <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundColor"
-                    ResourceKey="SystemAccentColor" />
-    <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity"
-                    ResourceKey="ListAccentMediumOpacity" />
-    <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundColor"
-                    ResourceKey="SystemAccentColor" />
-    <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity"
-                    ResourceKey="ListAccentLowOpacity" />
-    <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundColor"
-                    ResourceKey="SystemAccentColor" />
-    <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity"
-                    ResourceKey="ListAccentMediumOpacity" />
-    <StaticResource x:Key="DataGridRowHeaderForegroundBrush"
-                    ResourceKey="SystemControlForegroundBaseMediumBrush" />
-    <StaticResource x:Key="DataGridRowHeaderBackgroundBrush"
-                    ResourceKey="SystemControlBackgroundAltHighBrush" />
-    <StaticResource x:Key="DataGridRowGroupHeaderBackgroundBrush"
-                    ResourceKey="SystemControlBackgroundChromeMediumBrush" />
-    <StaticResource x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush"
-                    ResourceKey="SystemControlBackgroundListLowBrush" />
-    <StaticResource x:Key="DataGridRowGroupHeaderPressedBackgroundBrush"
-                    ResourceKey="SystemControlBackgroundListMediumBrush" />
-    <StaticResource x:Key="DataGridRowGroupHeaderForegroundBrush"
-                    ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="DataGridRowInvalidBrush"
-                    ResourceKey="SystemErrorTextColor" />
-    <StaticResource x:Key="DataGridCellBackgroundBrush"
-                    ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="DataGridCellFocusVisualPrimaryBrush"
-                    ResourceKey="SystemControlFocusVisualPrimaryBrush" />
-    <StaticResource x:Key="DataGridCellFocusVisualSecondaryBrush"
-                    ResourceKey="SystemControlFocusVisualSecondaryBrush" />
-    <StaticResource x:Key="DataGridCellInvalidBrush"
-                    ResourceKey="SystemErrorTextColor" />
+                     Opacity="0.4"
+                     Color="{DynamicResource SystemBaseMediumLowColor}" />
+    <StaticResource x:Key="DataGridCurrencyVisualPrimaryBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+    <StaticResource x:Key="DataGridFillerColumnGridLinesBrush" ResourceKey="SystemControlTransparentBrush" />
   </Styles.Resources>
 
   <Style Selector="DataGridCell">
@@ -93,58 +57,66 @@
     <Setter Property="Focusable" Value="False" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid x:Name="PART_CellRoot"
-              ColumnDefinitions="*,Auto"
-              Background="{TemplateBinding Background}">
+        <Border x:Name="CellBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid x:Name="PART_CellRoot" ColumnDefinitions="*,Auto">
 
-          <Rectangle x:Name="CurrencyVisual"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Stretch"
-                     Fill="Transparent"
-                     IsHitTestVisible="False"
-                     Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
-                     StrokeThickness="1" />
-          <Grid x:Name="FocusVisual"
-                IsHitTestVisible="False">
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
-                       StrokeThickness="2" />
-            <Rectangle Margin="2"
+            <Rectangle x:Name="CurrencyVisual"
                        HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
                        Fill="Transparent"
                        IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                       Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
                        StrokeThickness="1" />
-          </Grid>
+            <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}" />
+            <ContentPresenter Margin="{TemplateBinding Padding}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Foreground="{TemplateBinding Foreground}" />
 
-          <Rectangle x:Name="InvalidVisualElement"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Stretch"
-                     IsHitTestVisible="False"
-                     Stroke="{DynamicResource DataGridCellInvalidBrush}"
-                     StrokeThickness="1" />
+            <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>
+            <Rectangle Name="PART_RightGridLine"
+                       Grid.Column="1"
+                       Width="1"
+                       VerticalAlignment="Stretch"
+                       Fill="{DynamicResource DataGridFillerColumnGridLinesBrush}" />
+          </Grid>
+        </Border>
       </ControlTemplate>
     </Setter>
   </Style>
 
+  <Style Selector="DataGridCell > TextBlock#CellTextBlock">
+    <Setter Property="Margin" Value="{DynamicResource DataGridTextColumnCellTextBlockMargin}" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+  </Style>
+  
   <Style Selector="DataGridCell /template/ Rectangle#CurrencyVisual">
     <Setter Property="IsVisible" Value="False" />
   </Style>
@@ -180,57 +152,58 @@
     <Setter Property="MinHeight" Value="32" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid Name="PART_ColumnHeaderRoot"
-              ColumnDefinitions="*,Auto"
-              Background="{TemplateBinding Background}">
-
-          <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                Margin="{TemplateBinding Padding}">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition MinWidth="32"
-                                Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <ContentPresenter Content="{TemplateBinding Content}" 
-                              ContentTemplate="{TemplateBinding ContentTemplate}" />
-
-            <Path Name="SortIcon"
-                  Grid.Column="1"
-                  Fill="{TemplateBinding Foreground}"
-                  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}" />
+        <Border x:Name="HeaderBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
+
+            <Grid Margin="{TemplateBinding Padding}"
+                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" MinWidth="32" />
+              </Grid.ColumnDefinitions>
+
+              <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+              <Path Name="SortIcon"
+                    Grid.Column="1"
+                    Height="12"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Fill="{TemplateBinding Foreground}"
+                    Stretch="Uniform" />
+            </Grid>
 
-          <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"
+            <Rectangle Name="VerticalSeparator"
+                       Grid.Column="1"
+                       Width="1"
                        VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
-                       StrokeThickness="1" />
+                       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>
-        </Grid>
+        </Border>
       </ControlTemplate>
     </Setter>
   </Style>
@@ -243,10 +216,10 @@
   </Style>
 
   <Style Selector="DataGridColumnHeader:pointerover /template/ Grid#PART_ColumnHeaderRoot">
-    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundColor}" />
+    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}" />
   </Style>
   <Style Selector="DataGridColumnHeader:pressed /template/ Grid#PART_ColumnHeaderRoot">
-    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundColor}" />
+    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}" />
   </Style>
 
   <Style Selector="DataGridColumnHeader:dragIndicator">
@@ -271,38 +244,51 @@
     <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"
+        <Border x:Name="RowBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <DataGridFrozenGrid Name="PART_Root"
+                              ColumnDefinitions="Auto,*"
+                              RowDefinitions="*,Auto,Auto">
+
+            <Rectangle Name="BackgroundRectangle"
+                       Grid.RowSpan="2"
+                       Grid.ColumnSpan="2" />
+            <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"
-                                    Background="{DynamicResource DataGridDetailsPresenterBackgroundBrush}" />
-          <Rectangle Name="PART_BottomGridLine"
-                     Grid.Row="2"
-                     Grid.Column="1"
-                     HorizontalAlignment="Stretch"
-                     Height="1" />
+                                    DataGridFrozenGrid.IsFrozen="True" />
+            <DataGridDetailsPresenter Name="PART_DetailsPresenter"
+                                      Grid.Row="1"
+                                      Grid.Column="1"
+                                      Background="{DynamicResource DataGridDetailsPresenterBackgroundBrush}" />
+            <Rectangle Name="PART_BottomGridLine"
+                       Grid.Row="2"
+                       Grid.Column="1"
+                       Height="1"
+                       HorizontalAlignment="Stretch" />
 
-        </DataGridFrozenGrid>
+          </DataGridFrozenGrid>
+        </Border>
       </ControlTemplate>
     </Setter>
   </Style>
 
+  <Style Selector="DataGridRow">
+    <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
+  </Style>
+  <Style Selector="DataGridRow:nth-child(even)">
+    <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
+  </Style>
+
   <Style Selector="DataGridRow /template/ Rectangle#InvalidVisualElement">
     <Setter Property="Opacity" Value="0" />
   </Style>
@@ -314,29 +300,30 @@
   </Style>
 
   <Style Selector="DataGridRow /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource SystemControlTransparentBrush}" />
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowBackgroundBrush}" />
   </Style>
   <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource SystemListLowColor}" />
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
   </Style>
   <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundColor}" />
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
     <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
   </Style>
   <Style Selector="DataGridRow:selected:pointerover /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundColor}" />
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
     <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
   </Style>
   <Style Selector="DataGridRow:selected:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundColor}" />
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
     <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
   </Style>
   <Style Selector="DataGridRow:selected:pointerover:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundColor}" />
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
     <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
   </Style>
 
   <Style Selector="DataGridRowHeader">
+    <Setter Property="Foreground" Value="{DynamicResource DataGridRowHeaderForegroundBrush}" />
     <Setter Property="Background" Value="{DynamicResource DataGridRowHeaderBackgroundBrush}" />
     <Setter Property="Focusable" Value="False" />
     <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
@@ -388,25 +375,25 @@
   </Style>
 
   <Style Selector="DataGridRowHeader /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource SystemControlTransparentBrush}" />
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowBackgroundBrush}" />
   </Style>
   <Style Selector="DataGridRow:pointerover DataGridRowHeader /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource SystemListLowColor}" />
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
   </Style>
   <Style Selector="DataGridRowHeader:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundColor}" />
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
     <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
   </Style>
   <Style Selector="DataGridRow:pointerover DataGridRowHeader:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundColor}" />
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
     <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
   </Style>
   <Style Selector="DataGridRowHeader:selected:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundColor}" />
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
     <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="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
     <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
   </Style>
 
@@ -430,9 +417,12 @@
                         Width="12"
                         Height="12"
                         Margin="12,0,0,0"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
                         Background="{TemplateBinding Background}"
-                        Foreground="{TemplateBinding Foreground}"
-                        Focusable="False" />
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Focusable="False"
+                        Foreground="{TemplateBinding Foreground}" />
 
           <StackPanel Grid.Column="3"
                       Orientation="Horizontal"
@@ -559,11 +549,12 @@
     </Setter>
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
+        <Border x:Name="DataGridBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                BorderBrush="{TemplateBinding BorderBrush}">
-          <Grid RowDefinitions="Auto,*,Auto,Auto"
-                ColumnDefinitions="Auto,*,Auto">
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="Auto,*,Auto,Auto">
             <Grid.Resources>
               <ControlTemplate x:Key="TopLeftHeaderTemplate"
                                TargetType="DataGridColumnHeader">
diff --git a/src/Avalonia.Controls/ApiCompatBaseline.txt b/src/Avalonia.Controls/ApiCompatBaseline.txt
index 55372a7f1a..33e5efbc15 100644
--- a/src/Avalonia.Controls/ApiCompatBaseline.txt
+++ b/src/Avalonia.Controls/ApiCompatBaseline.txt
@@ -1,9 +1,17 @@
 Compat issues with assembly Avalonia.Controls:
+MembersMustExist : Member 'protected void Avalonia.Controls.Button.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.ButtonSpinner.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.CalendarDatePicker.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.ContextMenu.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'Avalonia.Controls.DropDown' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'Avalonia.Controls.DropDownItem' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Expander.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Controls.IMenuItem.StaysOpenOnClick' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Controls.IMenuItem.StaysOpenOnClick.get()' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.IMenuItem.StaysOpenOnClick.set(System.Boolean)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.INativeMenuExporterEventsImplBridge.RaiseClosed()' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.INativeMenuExporterEventsImplBridge.RaiseOpening()' is present in the implementation but not in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.ItemsRepeater.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.DirectProperty<Avalonia.Controls.NumericUpDown, System.Double> Avalonia.DirectProperty<Avalonia.Controls.NumericUpDown, System.Double> Avalonia.Controls.NumericUpDown.ValueProperty' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.StyledProperty<System.Double> Avalonia.StyledProperty<System.Double> Avalonia.Controls.NumericUpDown.IncrementProperty' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.StyledProperty<System.Double> Avalonia.StyledProperty<System.Double> Avalonia.Controls.NumericUpDown.MaximumProperty' does not exist in the implementation but it does exist in the contract.
@@ -28,10 +36,35 @@ MembersMustExist : Member 'public void Avalonia.Controls.NumericUpDown.Value.set
 MembersMustExist : Member 'public void Avalonia.Controls.NumericUpDownValueChangedEventArgs..ctor(Avalonia.Interactivity.RoutedEvent, System.Double, System.Double)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDownValueChangedEventArgs.NewValue.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDownValueChangedEventArgs.OldValue.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.ProgressBar.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.StyledProperty<System.Boolean> Avalonia.StyledProperty<System.Boolean> Avalonia.Controls.ScrollViewer.AllowAutoHideProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Slider.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.AttachedProperty<Avalonia.Media.FontFamily> Avalonia.AttachedProperty<Avalonia.Media.FontFamily> Avalonia.Controls.TextBlock.FontFamilyProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.AttachedProperty<Avalonia.Media.FontStyle> Avalonia.AttachedProperty<Avalonia.Media.FontStyle> Avalonia.Controls.TextBlock.FontStyleProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.AttachedProperty<Avalonia.Media.FontWeight> Avalonia.AttachedProperty<Avalonia.Media.FontWeight> Avalonia.Controls.TextBlock.FontWeightProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.AttachedProperty<Avalonia.Media.IBrush> Avalonia.AttachedProperty<Avalonia.Media.IBrush> Avalonia.Controls.TextBlock.ForegroundProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.AttachedProperty<System.Double> Avalonia.AttachedProperty<System.Double> Avalonia.Controls.TextBlock.FontSizeProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.StyledProperty<Avalonia.Media.TextAlignment> Avalonia.StyledProperty<Avalonia.Media.TextAlignment> Avalonia.Controls.TextBlock.TextAlignmentProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.StyledProperty<Avalonia.Media.TextTrimming> Avalonia.StyledProperty<Avalonia.Media.TextTrimming> Avalonia.Controls.TextBlock.TextTrimmingProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.StyledProperty<Avalonia.Media.TextWrapping> Avalonia.StyledProperty<Avalonia.Media.TextWrapping> Avalonia.Controls.TextBlock.TextWrappingProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.StyledProperty<System.Double> Avalonia.StyledProperty<System.Double> Avalonia.Controls.TextBlock.LineHeightProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.StyledProperty<System.Int32> Avalonia.StyledProperty<System.Int32> Avalonia.Controls.TextBlock.MaxLinesProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.Media.FontFamily Avalonia.Controls.TextBlock.GetFontFamily(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public System.Double Avalonia.Controls.TextBlock.GetFontSize(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.Media.FontStyle Avalonia.Controls.TextBlock.GetFontStyle(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.Media.FontWeight Avalonia.Controls.TextBlock.GetFontWeight(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.Media.IBrush Avalonia.Controls.TextBlock.GetForeground(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetFontFamily(Avalonia.Controls.Control, Avalonia.Media.FontFamily)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetFontSize(Avalonia.Controls.Control, System.Double)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetFontStyle(Avalonia.Controls.Control, Avalonia.Media.FontStyle)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetFontWeight(Avalonia.Controls.Control, Avalonia.Media.FontWeight)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetForeground(Avalonia.Controls.Control, Avalonia.Media.IBrush)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.TextBox.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.TopLevel' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Viewbox' does not inherit from base type 'Avalonia.Controls.Decorator' in the implementation but it does in the contract.
 MembersMustExist : Member 'public Avalonia.AvaloniaProperty<Avalonia.Media.Stretch> Avalonia.AvaloniaProperty<Avalonia.Media.Stretch> Avalonia.Controls.Viewbox.StretchProperty' does not exist in the implementation but it does exist in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Window' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Window.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.WindowBase' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.EventHandler<Avalonia.Controls.ApplicationLifetimes.ShutdownRequestedEventArgs> Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.ShutdownRequested' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.add_ShutdownRequested(System.EventHandler<Avalonia.Controls.ApplicationLifetimes.ShutdownRequestedEventArgs>)' is present in the implementation but not in the contract.
@@ -42,14 +75,22 @@ MembersMustExist : Member 'public System.Action<Avalonia.Size> Avalonia.Controls
 MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Resized.set(System.Action<Avalonia.Size>)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.SetCursor(Avalonia.Platform.IPlatformHandle)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.AvaloniaProperty Avalonia.AvaloniaProperty Avalonia.Controls.Notifications.NotificationCard.CloseOnClickProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Notifications.WindowNotificationManager.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.Platform.ITopLevelNativeMenuExporter.SetNativeMenu(Avalonia.Controls.NativeMenu)' is present in the contract but not in the implementation.
+MembersMustExist : Member 'protected void Avalonia.Controls.Presenters.ScrollContentPresenter.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'protected Avalonia.Media.FormattedText Avalonia.Controls.Presenters.TextPresenter.CreateFormattedText()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.Media.FormattedText Avalonia.Controls.Presenters.TextPresenter.FormattedText.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public System.Int32 Avalonia.Controls.Presenters.TextPresenter.GetCaretIndex(Avalonia.Point)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'protected void Avalonia.Controls.Presenters.TextPresenter.InvalidateFormattedText()' does not exist in the implementation but it does exist in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Primitives.PopupRoot' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Primitives.ScrollBar.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Primitives.SelectingItemsControl.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Controls.Primitives.Track.OnPropertyChanged<T>(Avalonia.AvaloniaPropertyChangedEventArgs<T>)' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'Avalonia.Platform.ExportWindowingSubsystemAttribute' does not exist in the implementation but it does exist in the contract.
 EnumValuesMustMatch : Enum value 'Avalonia.Platform.ExtendClientAreaChromeHints Avalonia.Platform.ExtendClientAreaChromeHints.Default' is (System.Int32)2 in the implementation but (System.Int32)1 in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.Screen Avalonia.Platform.IScreenImpl.ScreenFromPoint(Avalonia.PixelPoint)' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.Screen Avalonia.Platform.IScreenImpl.ScreenFromRect(Avalonia.PixelRect)' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.Screen Avalonia.Platform.IScreenImpl.ScreenFromWindow(Avalonia.Platform.IWindowBaseImpl)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Nullable<Avalonia.Size> Avalonia.Platform.ITopLevelImpl.FrameSize' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Nullable<Avalonia.Size> Avalonia.Platform.ITopLevelImpl.FrameSize.get()' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Action<Avalonia.Size, Avalonia.Platform.PlatformResizeReason> Avalonia.Platform.ITopLevelImpl.Resized.get()' is present in the implementation but not in the contract.
@@ -68,4 +109,4 @@ InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platfor
 MembersMustExist : Member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size)' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size, Avalonia.Platform.PlatformResizeReason)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.ITrayIconImpl Avalonia.Platform.IWindowingPlatform.CreateTrayIcon()' is present in the implementation but not in the contract.
-Total Issues: 69
+Total Issues: 110
diff --git a/src/Avalonia.Controls/AppBuilder.cs b/src/Avalonia.Controls/AppBuilder.cs
new file mode 100644
index 0000000000..5bcd87162e
--- /dev/null
+++ b/src/Avalonia.Controls/AppBuilder.cs
@@ -0,0 +1,20 @@
+using Avalonia.Controls;
+using Avalonia.Platform;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Initializes platform-specific services for an <see cref="Application"/>.
+    /// </summary>
+    public sealed class AppBuilder : AppBuilderBase<AppBuilder>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppBuilder"/> class.
+        /// </summary>
+        public AppBuilder()
+            : base(new StandardRuntimePlatform(),
+                builder => StandardRuntimePlatformServices.Register(builder.ApplicationType?.Assembly))
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs
index 8779ae9122..6b7101cd49 100644
--- a/src/Avalonia.Controls/AppBuilderBase.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Linq;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -120,38 +119,8 @@ namespace Avalonia.Controls
             return Self;
         }
 
-        /// <summary>
-        /// Starts the application with an instance of <typeparamref name="TMainWindow"/>.
-        /// </summary>
-        /// <typeparam name="TMainWindow">The window type.</typeparam>
-        /// <param name="dataContextProvider">A delegate that will be called to create a data context for the window (optional).</param>
-        [Obsolete("Use either lifetimes or AppMain overload. See see https://github.com/AvaloniaUI/Avalonia/wiki/Application-lifetimes for details")]
-        public void Start<TMainWindow>(Func<object>? dataContextProvider = null)
-            where TMainWindow : Window, new()
-        {
-            AfterSetup(builder =>
-            {
-                var window = new TMainWindow();
-                if (dataContextProvider != null)
-                    window.DataContext = dataContextProvider();
-                ((IClassicDesktopStyleApplicationLifetime)builder.Instance!.ApplicationLifetime!)
-                    .MainWindow = window;
-            });
-            
-            // Copy-pasted because we can't call extension methods due to generic constraints
-            var lifetime = new ClassicDesktopStyleApplicationLifetime() {ShutdownMode = ShutdownMode.OnMainWindowClose};
-            SetupWithLifetime(lifetime);
-            lifetime.Start(Array.Empty<string>());
-        }
-
         public delegate void AppMainDelegate(Application app, string[] args);
-
-        [Obsolete("Use either lifetimes or AppMain overload. See see https://github.com/AvaloniaUI/Avalonia/wiki/Application-lifetimes for details", true)]
-        public void Start()
-        {
-            throw new NotSupportedException();
-        }
-
+        
         public void Start(AppMainDelegate main, string[] args)
         {
             Setup();
@@ -234,6 +203,9 @@ namespace Avalonia.Controls
 
         protected virtual bool CheckSetup => true;
 
+        /// <summary>
+        /// Searches and initiates modules included with <see cref="ExportAvaloniaModuleAttribute"/> attribute.
+        /// </summary>
         private void SetupAvaloniaModules()
         {
             var moduleInitializers = from assembly in AppDomain.CurrentDomain.GetAssemblies()
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
index 76e2d3a161..c59458311c 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
@@ -65,7 +65,7 @@ namespace Avalonia.Controls.ApplicationLifetimes
         /// <inheritdoc/>
         public Window? MainWindow { get; set; }
 
-        public IReadOnlyList<Window> Windows => _windows.ToList();
+        public IReadOnlyList<Window> Windows => _windows.ToArray();
 
         private void HandleWindowClosed(Window window)
         {
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/IApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/IApplicationLifetime.cs
index 9860d0cb38..b38a539d4a 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/IApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/IApplicationLifetime.cs
@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Controls.ApplicationLifetimes
 {
+    [NotClientImplementable]
     public interface IApplicationLifetime
     {
         
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs
index 2bd5c1238d..4b88f6b537 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.ApplicationLifetimes
 {
     /// <summary>
     /// Controls application lifetime in classic desktop style
     /// </summary>
+    [NotClientImplementable]
     public interface IClassicDesktopStyleApplicationLifetime : IControlledApplicationLifetime
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/IControlledApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/IControlledApplicationLifetime.cs
index 3f61aeb536..d7eda790df 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/IControlledApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/IControlledApplicationLifetime.cs
@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.ApplicationLifetimes
 {
+    [NotClientImplementable]
     public interface IControlledApplicationLifetime : IApplicationLifetime
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ISingleViewApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/ISingleViewApplicationLifetime.cs
index e25815602e..480c65e5ad 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/ISingleViewApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ISingleViewApplicationLifetime.cs
@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Controls.ApplicationLifetimes
 {
+    [NotClientImplementable]
     public interface ISingleViewApplicationLifetime : IApplicationLifetime
     {
         Control? MainView { get; set; }
diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
index 930e250334..5c95932c1f 100644
--- a/src/Avalonia.Controls/AutoCompleteBox.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox.cs
@@ -252,6 +252,10 @@ namespace Avalonia.Controls
     /// drop-down that contains possible matches based on the input in the text
     /// box.
     /// </summary>
+    [TemplatePart(ElementPopup,            typeof(Popup))]
+    [TemplatePart(ElementSelector,         typeof(SelectingItemsControl))]
+    [TemplatePart(ElementSelectionAdapter, typeof(ISelectionAdapter))]
+    [TemplatePart(ElementTextBox,          typeof(TextBox))]
     [PseudoClasses(":dropdownopen")]
     public class AutoCompleteBox : TemplatedControl
     {
@@ -1342,12 +1346,16 @@ namespace Avalonia.Controls
         /// enabled.
         /// </summary>
         /// <param name="property">The property.</param>
-        /// <param name="value">The new binding value for the property.</param>
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        /// <param name="state">The current data binding state.</param>
+        /// <param name="error">The current data binding error, if any.</param>
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
             if (property == TextProperty || property == SelectedItemProperty)
             {
-                DataValidationErrors.SetError(this, value.Error);
+                DataValidationErrors.SetError(this, error);
             }
         }
 
@@ -2180,7 +2188,7 @@ namespace Avalonia.Controls
             }
 
             // Store a local cached copy of the data
-            _items = newValue == null ? null : new List<object>(newValue.Cast<object>().ToList());
+            _items = newValue == null ? null : new List<object>(newValue.Cast<object>());
 
             // Clear and set the view on the selection adapter
             ClearView();
@@ -2239,7 +2247,7 @@ namespace Avalonia.Controls
                 ClearView();
                 if (Items != null)
                 {
-                    _items = new List<object>(Items.Cast<object>().ToList());
+                    _items = new List<object>(Items.Cast<object>());
                 }
             }
 
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 543a513d57..c4587a2d9c 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -3,20 +3,18 @@
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
     <ProjectReference Include="..\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\JetBrains.Annotations.props" />
   <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\NullableEnable.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Controls.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.DesignerSupport, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.LeakTests, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index ee3be1d5b3..bc740c133a 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -1,8 +1,10 @@
+using System;
 using Avalonia.Collections;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Utils;
 using Avalonia.Layout;
 using Avalonia.Media;
+using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
@@ -69,6 +71,8 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Border, PenLineJoin>(nameof(BorderLineJoin), PenLineJoin.Miter);
 
         private readonly BorderRenderHelper _borderRenderHelper = new BorderRenderHelper();
+        private Thickness? _layoutThickness;
+        private double _scale;
 
         /// <summary>
         /// Initializes static members of the <see cref="Border"/> class.
@@ -88,6 +92,18 @@ namespace Avalonia.Controls
             AffectsMeasure<Border>(BorderThicknessProperty);
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            switch (change.Property.Name)
+            {
+                case nameof(UseLayoutRounding):
+                case nameof(BorderThickness):
+                    _layoutThickness = null;
+                    break;
+            }
+        }
+
         /// <summary>
         /// Gets or sets a brush with which to paint the background.
         /// </summary>
@@ -169,13 +185,43 @@ namespace Avalonia.Controls
             set => SetValue(BoxShadowProperty, value);
         }
 
+        private Thickness LayoutThickness
+        {
+            get
+            {
+                VerifyScale();
+
+                if (_layoutThickness == null)
+                {
+                    var borderThickness = BorderThickness;
+
+                    if (UseLayoutRounding)
+                        borderThickness = LayoutHelper.RoundLayoutThickness(borderThickness, _scale, _scale);
+
+                    _layoutThickness = borderThickness;
+                }
+
+                return _layoutThickness.Value;
+            }
+        }
+
+        private void VerifyScale()
+        {
+            var currentScale = LayoutHelper.GetLayoutScale(this);
+            if (MathUtilities.AreClose(currentScale, _scale))
+                return;
+
+            _scale = currentScale;
+            _layoutThickness = null;
+        }
+
         /// <summary>
         /// Renders the control.
         /// </summary>
         /// <param name="context">The drawing context.</param>
         public override void Render(DrawingContext context)
         {
-            _borderRenderHelper.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush,
+            _borderRenderHelper.Render(context, Bounds.Size, LayoutThickness, CornerRadius, Background, BorderBrush,
                 BoxShadow, BorderDashOffset, BorderLineCap, BorderLineJoin, BorderDashArray);
         }
 
diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 72495bdcb3..6dba33516b 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -29,11 +29,14 @@ namespace Avalonia.Controls
     }
 
     /// <summary>
-    /// A button control.
+    /// A standard button control.
     /// </summary>
-    [PseudoClasses(":pressed")]
-    public class Button : ContentControl, ICommandSource
+    [PseudoClasses(pcFlyoutOpen, pcPressed)]
+    public class Button : ContentControl, ICommandSource, IClickableControl
     {
+        protected const string pcPressed    = ":pressed";
+        protected const string pcFlyoutOpen = ":flyout-open";
+
         /// <summary>
         /// Defines the <see cref="ClickMode"/> property.
         /// </summary>
@@ -92,6 +95,7 @@ namespace Avalonia.Controls
         private ICommand? _command;
         private bool _commandCanExecute = true;
         private KeyGesture? _hotkey;
+        private bool _isFlyoutOpen = false;
 
         /// <summary>
         /// Initializes static members of the <see cref="Button"/> class.
@@ -107,7 +111,6 @@ namespace Avalonia.Controls
         /// </summary>
         public Button()
         {
-            UpdatePseudoClasses(IsPressed);
         }
 
         /// <summary>
@@ -229,6 +232,13 @@ namespace Avalonia.Controls
                     StopListeningForDefault(inputElement);
                 }
             }
+            if (IsCancel)
+            {
+                if (e.Root is IInputElement inputElement)
+                {
+                    StopListeningForCancel(inputElement);
+                }
+            }
         }
 
         /// <inheritdoc/>
@@ -306,6 +316,8 @@ namespace Avalonia.Controls
                 IsPressed = false;
                 e.Handled = true;
             }
+
+            base.OnKeyUp(e);
         }
 
         /// <summary>
@@ -328,11 +340,30 @@ namespace Avalonia.Controls
             }
         }
 
+        /// <summary>
+        /// Opens the button's flyout.
+        /// </summary>
         protected virtual void OpenFlyout()
         {
             Flyout?.ShowAt(this);
         }
 
+        /// <summary>
+        /// Invoked when the button's flyout is opened.
+        /// </summary>
+        protected virtual void OnFlyoutOpened()
+        {
+            // Available for derived types
+        }
+
+        /// <summary>
+        /// Invoked when the button's flyout is closed.
+        /// </summary>
+        protected virtual void OnFlyoutClosed()
+        {
+            // Available for derived types
+        }
+
         /// <inheritdoc/>
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
@@ -371,6 +402,8 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
         {
+            base.OnPointerCaptureLost(e);
+
             IsPressed = false;
         }
 
@@ -383,7 +416,17 @@ namespace Avalonia.Controls
         }
 
         /// <inheritdoc/>
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            UnregisterFlyoutEvents(Flyout);
+            RegisterFlyoutEvents(Flyout);
+            UpdatePseudoClasses();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -391,12 +434,13 @@ namespace Avalonia.Controls
             {
                 if (((ILogical)this).IsAttachedToLogicalTree)
                 {
-                    if (change.OldValue.GetValueOrDefault() is ICommand oldCommand)
+                    var (oldValue, newValue) = change.GetOldAndNewValue<ICommand?>();
+                    if (oldValue is ICommand oldCommand)
                     {
                         oldCommand.CanExecuteChanged -= CanExecuteChanged;
                     }
 
-                    if (change.NewValue.GetValueOrDefault() is ICommand newCommand)
+                    if (newValue is ICommand newCommand)
                     {
                         newCommand.CanExecuteChanged += CanExecuteChanged;
                     }
@@ -410,7 +454,7 @@ namespace Avalonia.Controls
             }
             else if (change.Property == IsCancelProperty)
             {
-                var isCancel = change.NewValue.GetValueOrDefault<bool>();
+                var isCancel = change.GetNewValue<bool>();
 
                 if (VisualRoot is IInputElement inputRoot)
                 {
@@ -426,7 +470,7 @@ namespace Avalonia.Controls
             }
             else if (change.Property == IsDefaultProperty)
             {
-                var isDefault = change.NewValue.GetValueOrDefault<bool>();
+                var isDefault = change.GetNewValue<bool>();
 
                 if (VisualRoot is IInputElement inputRoot)
                 {
@@ -442,29 +486,40 @@ namespace Avalonia.Controls
             }
             else if (change.Property == IsPressedProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<bool>());
+                UpdatePseudoClasses();
             }
             else if (change.Property == FlyoutProperty)
             {
+                var (oldFlyout, newFlyout) = change.GetOldAndNewValue<FlyoutBase?>();
+
                 // If flyout is changed while one is already open, make sure we 
                 // close the old one first
-                if (change.OldValue.GetValueOrDefault() is FlyoutBase oldFlyout &&
+                if (oldFlyout != null &&
                     oldFlyout.IsOpen)
                 {
                     oldFlyout.Hide();
                 }
+
+                // Must unregister events here while a reference to the old flyout still exists
+                UnregisterFlyoutEvents(oldFlyout);
+
+                RegisterFlyoutEvents(newFlyout);
+                UpdatePseudoClasses();
             }
         }
 
         protected override AutomationPeer OnCreateAutomationPeer() => new ButtonAutomationPeer(this);
 
         /// <inheritdoc/>
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
-            base.UpdateDataValidation(property, value);
+            base.UpdateDataValidation(property, state, error);
             if (property == CommandProperty)
             {
-                if (value.Type == BindingValueType.BindingError)
+                if (state == BindingValueType.BindingError)
                 {
                     if (_commandCanExecute)
                     {
@@ -493,6 +548,32 @@ namespace Avalonia.Controls
             }
         }
 
+        /// <summary>
+        /// Registers all flyout events.
+        /// </summary>
+        /// <param name="flyout">The flyout to connect events to.</param>
+        private void RegisterFlyoutEvents(FlyoutBase? flyout)
+        {
+            if (flyout != null)
+            {
+                flyout.Opened += Flyout_Opened;
+                flyout.Closed += Flyout_Closed;
+            }
+        }
+
+        /// <summary>
+        /// Explicitly unregisters all flyout events.
+        /// </summary>
+        /// <param name="flyout">The flyout to disconnect events from.</param>
+        private void UnregisterFlyoutEvents(FlyoutBase? flyout)
+        {
+            if (flyout != null)
+            {
+                flyout.Opened -= Flyout_Opened;
+                flyout.Closed -= Flyout_Closed;
+             }
+        }
+
         /// <summary>
         /// Starts listening for the Enter key when the button <see cref="IsDefault"/>.
         /// </summary>
@@ -539,6 +620,7 @@ namespace Avalonia.Controls
             if (e.Key == Key.Enter && IsVisible && IsEnabled)
             {
                 OnClick();
+                e.Handled = true;
             }
         }
 
@@ -552,17 +634,60 @@ namespace Avalonia.Controls
             if (e.Key == Key.Escape && IsVisible && IsEnabled)
             {
                 OnClick();
+                e.Handled = true;
             }
         }
 
         /// <summary>
         /// Updates the visual state of the control by applying latest PseudoClasses.
         /// </summary>
-        private void UpdatePseudoClasses(bool isPressed)
+        private void UpdatePseudoClasses()
         {
-            PseudoClasses.Set(":pressed", isPressed);
+            PseudoClasses.Set(pcFlyoutOpen, _isFlyoutOpen);
+            PseudoClasses.Set(pcPressed, IsPressed);
         }
 
         void ICommandSource.CanExecuteChanged(object sender, EventArgs e) => this.CanExecuteChanged(sender, e);
+
+        void IClickableControl.RaiseClick() => OnClick();
+        
+        /// <summary>
+        /// Event handler for when the button's flyout is opened.
+        /// </summary>
+        private void Flyout_Opened(object? sender, EventArgs e)
+        {
+            var flyout = sender as FlyoutBase;
+
+            // It is possible to share flyouts among multiple controls including Button.
+            // This can cause a problem here since all controls that share a flyout receive
+            // the same Opened/Closed events at the same time.
+            // For Button that means they all would be updating their pseudoclasses accordingly.
+            // In other words, all Buttons with a shared Flyout would have the backgrounds changed together.
+            // To fix this, only continue here if the Flyout target matches this Button instance.
+            if (object.ReferenceEquals(flyout?.Target, this))
+            {
+                _isFlyoutOpen = true;
+                UpdatePseudoClasses();
+
+                OnFlyoutOpened();
+            }
+        }
+
+        /// <summary>
+        /// Event handler for when the button's flyout is closed.
+        /// </summary>
+        private void Flyout_Closed(object? sender, EventArgs e)
+        {
+            var flyout = sender as FlyoutBase;
+
+            // See comments in Flyout_Opened
+            if (object.ReferenceEquals(flyout?.Target, this))
+            {
+                _isFlyoutOpen = false;
+                UpdatePseudoClasses();
+
+                OnFlyoutClosed();
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/ButtonSpinner.cs b/src/Avalonia.Controls/ButtonSpinner.cs
index 31aba024ae..e455c6c6f3 100644
--- a/src/Avalonia.Controls/ButtonSpinner.cs
+++ b/src/Avalonia.Controls/ButtonSpinner.cs
@@ -16,6 +16,8 @@ namespace Avalonia.Controls
     /// <summary>
     /// Represents a spinner control that includes two Buttons.
     /// </summary>
+    [TemplatePart("PART_DecreaseButton", typeof(Button))]
+    [TemplatePart("PART_IncreaseButton", typeof(Button))]
     [PseudoClasses(":left", ":right")]
     public class ButtonSpinner : Spinner
     {
@@ -208,13 +210,13 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == ButtonSpinnerLocationProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Location>());
+                UpdatePseudoClasses(change.GetNewValue<Location>());
             }
         }
 
diff --git a/src/Avalonia.Controls/Calendar/Calendar.cs b/src/Avalonia.Controls/Calendar/Calendar.cs
index 6c83308b39..2dbb5f02f9 100644
--- a/src/Avalonia.Controls/Calendar/Calendar.cs
+++ b/src/Avalonia.Controls/Calendar/Calendar.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Data;
 using Avalonia.Input;
@@ -222,6 +223,8 @@ namespace Avalonia.Controls
     /// element in XAML.
     /// </para>
     /// </remarks>
+    [TemplatePart(PART_ElementMonth, typeof(CalendarItem))]
+    [TemplatePart(PART_ElementRoot,  typeof(Panel))]
     public class Calendar : TemplatedControl
     {
         internal const int RowsPerMonth = 7;
@@ -261,6 +264,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Calendar, DayOfWeek>(
                     nameof(FirstDayOfWeek),
                     defaultValue: DateTimeHelper.GetCurrentDateFormat().FirstDayOfWeek);
+
         /// <summary>
         /// Gets or sets the day that is considered the beginning of the week.
         /// </summary>
@@ -273,6 +277,7 @@ namespace Avalonia.Controls
             get { return GetValue(FirstDayOfWeekProperty); }
             set { SetValue(FirstDayOfWeekProperty, value); }
         }
+
         /// <summary>
         /// FirstDayOfWeekProperty property changed handler.
         /// </summary>
@@ -289,6 +294,7 @@ namespace Avalonia.Controls
                 throw new ArgumentOutOfRangeException("d", "Invalid DayOfWeek");
             }
         }
+
         /// <summary>
         /// Inherited code: Requires comment.
         /// </summary>
@@ -311,6 +317,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Calendar, bool>(
                 nameof(IsTodayHighlighted),
                 defaultValue: true);
+
         /// <summary>
         /// Gets or sets a value indicating whether the current date is
         /// highlighted.
@@ -324,6 +331,7 @@ namespace Avalonia.Controls
             get { return GetValue(IsTodayHighlightedProperty); }
             set { SetValue(IsTodayHighlightedProperty, value); }
         }
+
         /// <summary>
         /// IsTodayHighlightedProperty property changed handler.
         /// </summary>
@@ -343,6 +351,7 @@ namespace Avalonia.Controls
 
         public static readonly StyledProperty<IBrush> HeaderBackgroundProperty =
             AvaloniaProperty.Register<Calendar, IBrush>(nameof(HeaderBackground));
+
         public IBrush HeaderBackground
         {
             get { return GetValue(HeaderBackgroundProperty); }
@@ -367,6 +376,7 @@ namespace Avalonia.Controls
             get { return GetValue(DisplayModeProperty); }
             set { SetValue(DisplayModeProperty, value); }
         }
+
         /// <summary>
         /// DisplayModeProperty property changed handler.
         /// </summary>
@@ -424,6 +434,7 @@ namespace Avalonia.Controls
                 || mode == CalendarMode.Year
                 || mode == CalendarMode.Decade;
         }
+
         private void OnDisplayModeChanged(CalendarModeChangedEventArgs args)
         {
             DisplayModeChanged?.Invoke(this, args);
@@ -433,6 +444,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Calendar, CalendarSelectionMode>(
                 nameof(SelectionMode),
                 defaultValue: CalendarSelectionMode.SingleDate);
+
         /// <summary>
         /// Gets or sets a value that indicates what kind of selections are
         /// allowed.
@@ -457,6 +469,7 @@ namespace Avalonia.Controls
             get { return GetValue(SelectionModeProperty); }
             set { SetValue(SelectionModeProperty, value); }
         }
+
         private void OnSelectionModeChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (IsValidSelectionMode(e.NewValue!))
@@ -471,6 +484,7 @@ namespace Avalonia.Controls
                 throw new ArgumentOutOfRangeException("d", "Invalid SelectionMode");
             }
         }
+
         /// <summary>
         /// Inherited code: Requires comment.
         /// </summary>
@@ -492,6 +506,7 @@ namespace Avalonia.Controls
                 o => o.SelectedDate,
                 (o, v) => o.SelectedDate = v,
                 defaultBindingMode: BindingMode.TwoWay);
+
         /// <summary>
         /// Gets or sets the currently selected date.
         /// </summary>
@@ -720,6 +735,7 @@ namespace Avalonia.Controls
                 o => o.DisplayDate,
                 (o, v) => o.DisplayDate = v,
                 defaultBindingMode: BindingMode.TwoWay);
+
         /// <summary>
         /// Gets or sets the date to display.
         /// </summary>
@@ -1973,6 +1989,7 @@ namespace Avalonia.Controls
                     }
             }
         }
+
         private void Calendar_KeyUp(KeyEventArgs e)
         {
             if (!e.Handled && (e.Key == Key.LeftShift || e.Key == Key.RightShift))
@@ -1980,6 +1997,7 @@ namespace Avalonia.Controls
                 ProcessShiftKeyUp();
             }
         }
+
         internal void ProcessShiftKeyUp()
         {
             if (_isShiftPressed && (SelectionMode == CalendarSelectionMode.SingleRange || SelectionMode == CalendarSelectionMode.MultipleRange))
@@ -2028,6 +2046,7 @@ namespace Avalonia.Controls
                     }
             }
         }
+
         protected override void OnLostFocus(RoutedEventArgs e)
         {
             base.OnLostFocus(e);
@@ -2054,6 +2073,7 @@ namespace Avalonia.Controls
                     }
             }
         }
+
         /// <summary>
         ///  Called when the IsEnabled property changes.
         /// </summary>
@@ -2098,6 +2118,7 @@ namespace Avalonia.Controls
 
         private const string PART_ElementRoot = "Root";
         private const string PART_ElementMonth = "CalendarItem";
+
         /// <summary>
         /// Builds the visual tree for the
         /// <see cref="T:System.Windows.Controls.Calendar" /> when a new
diff --git a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
deleted file mode 100644
index f1c56a7331..0000000000
--- a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
+++ /dev/null
@@ -1,1137 +0,0 @@
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
-
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Globalization;
-using Avalonia.Controls.Primitives;
-using Avalonia.Data;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.Layout;
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Provides data for the
-    /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
-    /// event.
-    /// </summary>
-    public class CalendarDatePickerDateValidationErrorEventArgs : EventArgs
-    {
-        private bool _throwException;
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// <see cref="T:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs" />
-        /// class.
-        /// </summary>
-        /// <param name="exception">
-        /// The initial exception from the
-        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
-        /// event.
-        /// </param>
-        /// <param name="text">
-        /// The text that caused the
-        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
-        /// event.
-        /// </param>
-        public CalendarDatePickerDateValidationErrorEventArgs(Exception exception, string text)
-        {
-            this.Text = text;
-            this.Exception = exception;
-        }
-
-        /// <summary>
-        /// Gets the initial exception associated with the
-        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
-        /// event.
-        /// </summary>
-        /// <value>
-        /// The exception associated with the validation failure.
-        /// </value>
-        public Exception Exception { get; private set; }
-
-        /// <summary>
-        /// Gets the text that caused the
-        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
-        /// event.
-        /// </summary>
-        /// <value>
-        /// The text that caused the validation failure.
-        /// </value>
-        public string Text { get; private set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether
-        /// <see cref="P:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs.Exception" />
-        /// should be thrown.
-        /// </summary>
-        /// <value>
-        /// True if the exception should be thrown; otherwise, false.
-        /// </value>
-        /// <exception cref="T:System.ArgumentException">
-        /// If set to true and
-        /// <see cref="P:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs.Exception" />
-        /// is null.
-        /// </exception>
-        public bool ThrowException
-        {
-            get { return this._throwException; }
-            set
-            {
-                if (value && this.Exception == null)
-                {
-                    throw new ArgumentException("Cannot Throw Null Exception");
-                }
-                this._throwException = value;
-            }
-        }
-    }
-
-    /// <summary>
-    /// Specifies date formats for a
-    /// <see cref="T:Avalonia.Controls.CalendarDatePicker" />.
-    /// </summary>
-    public enum CalendarDatePickerFormat
-    {
-        /// <summary>
-        /// Specifies that the date should be displayed using unabbreviated days
-        /// of the week and month names.
-        /// </summary>
-        Long = 0,
-
-        /// <summary>
-        /// Specifies that the date should be displayed using abbreviated days
-        /// of the week and month names.
-        /// </summary>
-        Short = 1,
-
-        /// <summary>
-        /// Specifies that the date should be displayed using a custom format string.
-        /// </summary>
-        Custom = 2
-    }
-
-    public class CalendarDatePicker : TemplatedControl
-    {
-        private const string ElementTextBox = "PART_TextBox";
-        private const string ElementButton = "PART_Button";
-        private const string ElementPopup = "PART_Popup";
-        private const string ElementCalendar = "PART_Calendar";
-
-        private Calendar? _calendar;
-        private string _defaultText;
-        private Button? _dropDownButton;
-        //private Canvas _outsideCanvas;
-        //private Canvas _outsidePopupCanvas;
-        private Popup? _popUp;
-        private TextBox? _textBox;
-        private IDisposable? _textBoxTextChangedSubscription;
-        private IDisposable? _buttonPointerPressedSubscription;
-
-        private DateTime? _onOpenSelectedDate;
-        private bool _settingSelectedDate;
-
-        private DateTime _displayDate;
-        private DateTime? _displayDateStart;
-        private DateTime? _displayDateEnd;
-        private bool _isDropDownOpen;
-        private DateTime? _selectedDate;
-        private string? _text;
-        private bool _suspendTextChangeHandler = false;
-        private bool _isPopupClosing = false;
-        private bool _ignoreButtonClick = false;
-
-        /// <summary>
-        /// Gets a collection of dates that are marked as not selectable.
-        /// </summary>
-        /// <value>
-        /// A collection of dates that cannot be selected. The default value is
-        /// an empty collection.
-        /// </value>
-        public CalendarBlackoutDatesCollection? BlackoutDates { get; private set; }
-
-        public static readonly DirectProperty<CalendarDatePicker, DateTime> DisplayDateProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime>(
-                nameof(DisplayDate),
-                o => o.DisplayDate,
-                (o, v) => o.DisplayDate = v);
-        public static readonly DirectProperty<CalendarDatePicker, DateTime?> DisplayDateStartProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
-                nameof(DisplayDateStart),
-                o => o.DisplayDateStart,
-                (o, v) => o.DisplayDateStart = v);
-        public static readonly DirectProperty<CalendarDatePicker, DateTime?> DisplayDateEndProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
-                nameof(DisplayDateEnd),
-                o => o.DisplayDateEnd,
-                (o, v) => o.DisplayDateEnd = v);
-        public static readonly StyledProperty<DayOfWeek> FirstDayOfWeekProperty =
-            AvaloniaProperty.Register<CalendarDatePicker, DayOfWeek>(nameof(FirstDayOfWeek));
-
-        public static readonly DirectProperty<CalendarDatePicker, bool> IsDropDownOpenProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, bool>(
-                nameof(IsDropDownOpen),
-                o => o.IsDropDownOpen,
-                (o, v) => o.IsDropDownOpen = v);
-
-        public static readonly StyledProperty<bool> IsTodayHighlightedProperty =
-            AvaloniaProperty.Register<CalendarDatePicker, bool>(nameof(IsTodayHighlighted));
-        public static readonly DirectProperty<CalendarDatePicker, DateTime?> SelectedDateProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
-                nameof(SelectedDate),
-                o => o.SelectedDate,
-                (o, v) => o.SelectedDate = v,
-                enableDataValidation: true, 
-                defaultBindingMode:BindingMode.TwoWay);
-
-        public static readonly StyledProperty<CalendarDatePickerFormat> SelectedDateFormatProperty =
-            AvaloniaProperty.Register<CalendarDatePicker, CalendarDatePickerFormat>(
-                nameof(SelectedDateFormat),
-                defaultValue: CalendarDatePickerFormat.Short,
-                validate: IsValidSelectedDateFormat);
-
-        public static readonly StyledProperty<string> CustomDateFormatStringProperty =
-            AvaloniaProperty.Register<CalendarDatePicker, string>(
-                nameof(CustomDateFormatString),
-                defaultValue: "d",
-                validate: IsValidDateFormatString);
-
-        public static readonly DirectProperty<CalendarDatePicker, string?> TextProperty =
-            AvaloniaProperty.RegisterDirect<CalendarDatePicker, string?>(
-                nameof(Text),
-                o => o.Text,
-                (o, v) => o.Text = v);
-        public static readonly StyledProperty<string?> WatermarkProperty =
-            TextBox.WatermarkProperty.AddOwner<CalendarDatePicker>();
-        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
-            TextBox.UseFloatingWatermarkProperty.AddOwner<CalendarDatePicker>();
-
-
-        /// <summary>
-        /// Defines the <see cref="HorizontalContentAlignment"/> property.
-        /// </summary>
-        public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
-            ContentControl.HorizontalContentAlignmentProperty.AddOwner<CalendarDatePicker>();
-
-        /// <summary>
-        /// Defines the <see cref="VerticalContentAlignment"/> property.
-        /// </summary>
-        public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
-            ContentControl.VerticalContentAlignmentProperty.AddOwner<CalendarDatePicker>();
-
-        /// <summary>
-        /// Gets or sets the date to display.
-        /// </summary>
-        /// <value>
-        /// The date to display. The default 
-        /// <see cref="P:System.DateTime.Today" />.
-        /// </value>
-        /// <exception cref="T:System.ArgumentOutOfRangeException">
-        /// The specified date is not in the range defined by
-        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.DisplayDateStart" />
-        /// and
-        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.DisplayDateEnd" />.
-        /// </exception>
-        public DateTime DisplayDate
-        {
-            get { return _displayDate; }
-            set { SetAndRaise(DisplayDateProperty, ref _displayDate, value); }
-        }
-        
-        /// <summary>
-        /// Gets or sets the first date to be displayed.
-        /// </summary>
-        /// <value>The first date to display.</value>
-        public DateTime? DisplayDateStart
-        {
-            get { return _displayDateStart; }
-            set { SetAndRaise(DisplayDateStartProperty, ref _displayDateStart, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the last date to be displayed.
-        /// </summary>
-        /// <value>The last date to display.</value>
-        public DateTime? DisplayDateEnd
-        {
-            get { return _displayDateEnd; }
-            set { SetAndRaise(DisplayDateEndProperty, ref _displayDateEnd, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the day that is considered the beginning of the week.
-        /// </summary>
-        /// <value>
-        /// A <see cref="T:System.DayOfWeek" /> representing the beginning of
-        /// the week. The default is <see cref="F:System.DayOfWeek.Sunday" />.
-        /// </value>
-        public DayOfWeek FirstDayOfWeek
-        {
-            get { return GetValue(FirstDayOfWeekProperty); }
-            set { SetValue(FirstDayOfWeekProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the drop-down
-        /// <see cref="T:Avalonia.Controls.Calendar" /> is open or closed.
-        /// </summary>
-        /// <value>
-        /// True if the <see cref="T:Avalonia.Controls.Calendar" /> is
-        /// open; otherwise, false. The default is false.
-        /// </value>
-        public bool IsDropDownOpen
-        {
-            get { return _isDropDownOpen; }
-            set { SetAndRaise(IsDropDownOpenProperty, ref _isDropDownOpen, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the current date will be
-        /// highlighted.
-        /// </summary>
-        /// <value>
-        /// True if the current date is highlighted; otherwise, false. The
-        /// default is true.
-        /// </value>
-        public bool IsTodayHighlighted
-        {
-            get { return GetValue(IsTodayHighlightedProperty); }
-            set { SetValue(IsTodayHighlightedProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the currently selected date.
-        /// </summary>
-        /// <value>
-        /// The date currently selected. The default is null.
-        /// </value>
-        /// <exception cref="T:System.ArgumentOutOfRangeException">
-        /// The specified date is not in the range defined by
-        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateStart" />
-        /// and
-        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateEnd" />,
-        /// or the specified date is in the
-        /// <see cref="P:Avalonia.Controls.DatePicker.BlackoutDates" />
-        /// collection.
-        /// </exception>
-        public DateTime? SelectedDate
-        {
-            get { return _selectedDate; }
-            set { SetAndRaise(SelectedDateProperty, ref _selectedDate, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the format that is used to display the selected date.
-        /// </summary>
-        /// <value>
-        /// The format that is used to display the selected date. The default is
-        /// <see cref="F:Avalonia.Controls.DatePickerFormat.Short" />.
-        /// </value>
-        /// <exception cref="T:System.ArgumentOutOfRangeException">
-        /// An specified format is not valid.
-        /// </exception>
-        public CalendarDatePickerFormat SelectedDateFormat
-        {
-            get { return GetValue(SelectedDateFormatProperty); }
-            set { SetValue(SelectedDateFormatProperty, value); }
-        }
-
-        public string CustomDateFormatString
-        {
-            get { return GetValue(CustomDateFormatStringProperty); }
-            set { SetValue(CustomDateFormatStringProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the text that is displayed by the
-        /// <see cref="T:Avalonia.Controls.DatePicker" />.
-        /// </summary>
-        /// <value>
-        /// The text displayed by the
-        /// <see cref="T:Avalonia.Controls.DatePicker" />.
-        /// </value>
-        /// <exception cref="T:System.FormatException">
-        /// The text entered cannot be parsed to a valid date, and the exception
-        /// is not suppressed.
-        /// </exception>
-        /// <exception cref="T:System.ArgumentOutOfRangeException">
-        /// The text entered parses to a date that is not selectable.
-        /// </exception>
-        public string? Text
-        {
-            get { return _text; }
-            set { SetAndRaise(TextProperty, ref _text, value); }
-        }
-
-        public string? Watermark
-        {
-            get { return GetValue(WatermarkProperty); }
-            set { SetValue(WatermarkProperty, value); }
-        }
-        public bool UseFloatingWatermark
-        {
-            get { return GetValue(UseFloatingWatermarkProperty); }
-            set { SetValue(UseFloatingWatermarkProperty, value); }
-        }
-
-
-        /// <summary>
-        /// Gets or sets the horizontal alignment of the content within the control.
-        /// </summary>
-        public HorizontalAlignment HorizontalContentAlignment
-        {
-            get => GetValue(HorizontalContentAlignmentProperty);
-            set => SetValue(HorizontalContentAlignmentProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the vertical alignment of the content within the control.
-        /// </summary>
-        public VerticalAlignment VerticalContentAlignment
-        {
-            get => GetValue(VerticalContentAlignmentProperty);
-            set => SetValue(VerticalContentAlignmentProperty, value);
-        }
-
-        /// <summary>
-        /// Occurs when the drop-down
-        /// <see cref="T:Avalonia.Controls.Calendar" /> is closed.
-        /// </summary>
-        public event EventHandler? CalendarClosed;
-
-        /// <summary>
-        /// Occurs when the drop-down
-        /// <see cref="T:Avalonia.Controls.Calendar" /> is opened.
-        /// </summary>
-        public event EventHandler? CalendarOpened;
-
-        /// <summary>
-        /// Occurs when <see cref="P:Avalonia.Controls.DatePicker.Text" />
-        /// is assigned a value that cannot be interpreted as a date.
-        /// </summary>
-        public event EventHandler<CalendarDatePickerDateValidationErrorEventArgs>? DateValidationError;
-
-        /// <summary>
-        /// Occurs when the
-        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.SelectedDate" />
-        /// property is changed.
-        /// </summary>
-        public event EventHandler<SelectionChangedEventArgs>? SelectedDateChanged;
-
-        static CalendarDatePicker()
-        {
-            FocusableProperty.OverrideDefaultValue<CalendarDatePicker>(true);
-
-            IsDropDownOpenProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnIsDropDownOpenChanged(e));
-            SelectedDateProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnSelectedDateChanged(e));
-            SelectedDateFormatProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnSelectedDateFormatChanged(e));
-            CustomDateFormatStringProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnCustomDateFormatStringChanged(e));
-            TextProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnTextChanged(e));
-        }
-        /// <summary>
-        /// Initializes a new instance of the
-        /// <see cref="T:Avalonia.Controls.DatePicker" /> class.
-        /// </summary>
-        public CalendarDatePicker()
-        {
-            FirstDayOfWeek = DateTimeHelper.GetCurrentDateFormat().FirstDayOfWeek;
-            _defaultText = string.Empty;
-            DisplayDate = DateTime.Today;
-        }
-
-        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
-        {
-            if (_calendar != null)
-            {
-                _calendar.DayButtonMouseUp -= Calendar_DayButtonMouseUp;
-                _calendar.DisplayDateChanged -= Calendar_DisplayDateChanged;
-                _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged;
-                _calendar.PointerReleased -= Calendar_PointerReleased;
-                _calendar.KeyDown -= Calendar_KeyDown;
-            }
-            _calendar = e.NameScope.Find<Calendar>(ElementCalendar);
-            if (_calendar != null)
-            {
-                _calendar.SelectionMode = CalendarSelectionMode.SingleDate;
-
-                _calendar.DayButtonMouseUp += Calendar_DayButtonMouseUp;
-                _calendar.DisplayDateChanged += Calendar_DisplayDateChanged;
-                _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
-                _calendar.PointerReleased += Calendar_PointerReleased;
-                _calendar.KeyDown += Calendar_KeyDown;
-
-                var currentBlackoutDays = BlackoutDates;
-                BlackoutDates = _calendar.BlackoutDates;
-                if(currentBlackoutDays != null)
-                {
-                    foreach (var range in currentBlackoutDays)
-                    {
-                        BlackoutDates.Add(range);
-                    }
-                }
-            }
-
-            if (_popUp != null)
-            {
-                _popUp.Child = null;
-                _popUp.Closed -= PopUp_Closed;
-            }
-            _popUp = e.NameScope.Find<Popup>(ElementPopup);
-            if(_popUp != null)
-            {
-                _popUp.Closed += PopUp_Closed;
-                if (IsDropDownOpen)
-                {
-                    OpenDropDown();
-                }
-            }
-
-            if(_dropDownButton != null)
-            {
-                _dropDownButton.Click -= DropDownButton_Click;
-                _buttonPointerPressedSubscription?.Dispose();
-            }
-            _dropDownButton = e.NameScope.Find<Button>(ElementButton);
-            if(_dropDownButton != null)
-            {
-                _dropDownButton.Click += DropDownButton_Click;
-                _buttonPointerPressedSubscription =
-                    _dropDownButton.AddDisposableHandler(PointerPressedEvent, DropDownButton_PointerPressed, handledEventsToo: true);
-            }
-
-            if (_textBox != null)
-            {
-                _textBox.KeyDown -= TextBox_KeyDown;
-                _textBox.GotFocus -= TextBox_GotFocus;
-                _textBoxTextChangedSubscription?.Dispose();
-            }
-            _textBox = e.NameScope.Find<TextBox>(ElementTextBox);
-
-            if(!SelectedDate.HasValue)
-            {
-                SetWaterMarkText();
-            }
-
-            if(_textBox != null)
-            {
-                _textBox.KeyDown += TextBox_KeyDown;
-                _textBox.GotFocus += TextBox_GotFocus;
-                _textBoxTextChangedSubscription = _textBox.GetObservable(TextBox.TextProperty).Subscribe(txt => TextBox_TextChanged());
-
-                if(SelectedDate.HasValue)
-                {
-                    _textBox.Text = DateTimeToString(SelectedDate.Value);
-                }
-                else if(!String.IsNullOrEmpty(_defaultText))
-                {
-                    _textBox.Text = _defaultText;
-                    SetSelectedDate();
-                }
-            }
-        }
-
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
-        {
-            if (property == SelectedDateProperty)
-            {
-                DataValidationErrors.SetError(this, value.Error);
-            }
-        }
-
-        protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
-        {
-            base.OnPointerWheelChanged(e);
-            if (!e.Handled && SelectedDate.HasValue && _calendar != null)
-            {
-                DateTime selectedDate = this.SelectedDate.Value;
-                DateTime? newDate = DateTimeHelper.AddDays(selectedDate, e.Delta.Y > 0 ? -1 : 1);
-                if (newDate.HasValue && Calendar.IsValidDateSelection(_calendar, newDate.Value))
-                {
-                    SelectedDate = newDate;
-                    e.Handled = true;
-                }
-            }
-        }
-        protected override void OnGotFocus(GotFocusEventArgs e)
-        {
-            base.OnGotFocus(e);
-            if(IsEnabled && _textBox != null && e.NavigationMethod == NavigationMethod.Tab)
-            {
-                _textBox.Focus();
-                var text = _textBox.Text;
-                if(!string.IsNullOrEmpty(text))
-                {
-                    _textBox.SelectionStart = 0;
-                    _textBox.SelectionEnd = text.Length;
-                }
-            }
-        }
-        protected override void OnLostFocus(RoutedEventArgs e)
-        {
-            base.OnLostFocus(e);
-
-            SetSelectedDate();
-        }
-        
-        private void OnIsDropDownOpenChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var oldValue = (bool)e.OldValue!;
-            var value = (bool)e.NewValue!;
-
-            if (_popUp != null && _popUp.Child != null)
-            {
-                if (value != oldValue)
-                {
-                    if (_calendar!.DisplayMode != CalendarMode.Month)
-                    {
-                        _calendar.DisplayMode = CalendarMode.Month;
-                    }
-
-                    if (value)
-                    {
-                        OpenDropDown();
-                    }
-                    else
-                    {
-                        _popUp.IsOpen = false;
-                        OnCalendarClosed(new RoutedEventArgs());
-                    }
-                }
-            }
-        }
-        private void OnSelectedDateChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var addedDate = (DateTime?)e.NewValue;
-            var removedDate = (DateTime?)e.OldValue;
-
-            if (SelectedDate != null)
-            {
-                DateTime day = SelectedDate.Value;
-
-                // When the SelectedDateProperty change is done from
-                // OnTextPropertyChanged method, two-way binding breaks if
-                // BeginInvoke is not used:
-                Threading.Dispatcher.UIThread.InvokeAsync(() =>
-                {
-                    _settingSelectedDate = true;
-                    Text = DateTimeToString(day);
-                    _settingSelectedDate = false;
-                    OnDateSelected(addedDate, removedDate);
-                });
-
-                // When DatePickerDisplayDateFlag is TRUE, the SelectedDate
-                // change is coming from the Calendar UI itself, so, we
-                // shouldn't change the DisplayDate since it will automatically
-                // be changed by the Calendar
-                if ((day.Month != DisplayDate.Month || day.Year != DisplayDate.Year) && (_calendar == null || !_calendar.CalendarDatePickerDisplayDateFlag))
-                {
-                    DisplayDate = day;
-                }
-                if(_calendar != null)
-                    _calendar.CalendarDatePickerDisplayDateFlag = false;
-            }
-            else
-            {
-                _settingSelectedDate = true;
-                SetWaterMarkText();
-                _settingSelectedDate = false;
-                OnDateSelected(addedDate, removedDate);
-            }
-        }
-        private void OnDateFormatChanged()
-        {
-            if (_textBox != null)
-            {
-                if (SelectedDate.HasValue)
-                {
-                    Text = DateTimeToString(SelectedDate.Value);
-                }
-                else if (string.IsNullOrEmpty(_textBox.Text))
-                {
-                    SetWaterMarkText();
-                }
-                else
-                {
-                    DateTime? date = ParseText(_textBox.Text);
-
-                    if (date != null)
-                    {
-                        string? s = DateTimeToString((DateTime)date);
-                        Text = s;
-                    }
-                }
-            }
-        }
-        private void OnSelectedDateFormatChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            OnDateFormatChanged();
-        }
-        private void OnCustomDateFormatStringChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if(SelectedDateFormat == CalendarDatePickerFormat.Custom)
-            {
-                OnDateFormatChanged();
-            }
-        }
-        private void OnTextChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var oldValue = (string?)e.OldValue;
-            var value = (string?)e.NewValue;
-
-            if (!_suspendTextChangeHandler)
-            {
-                if (value != null)
-                {
-                    if (_textBox != null)
-                    {
-                        _textBox.Text = value;
-                    }
-                    else
-                    {
-                        _defaultText = value;
-                    }
-                    if (!_settingSelectedDate)
-                    {
-                        SetSelectedDate();
-                    }
-                }
-                else
-                {
-                    if (!_settingSelectedDate)
-                    {
-                        _settingSelectedDate = true;
-                        SelectedDate = null;
-                        _settingSelectedDate = false;
-                    }
-                }
-            }
-            else
-            {
-                SetWaterMarkText();
-            }
-        }
-
-        /// <summary>
-        /// Raises the
-        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
-        /// event.
-        /// </summary>
-        /// <param name="e">
-        /// A
-        /// <see cref="T:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs" />
-        /// that contains the event data.
-        /// </param>
-        protected virtual void OnDateValidationError(CalendarDatePickerDateValidationErrorEventArgs e)
-        {
-            DateValidationError?.Invoke(this, e);
-        }
-        private void OnDateSelected(DateTime? addedDate, DateTime? removedDate)
-        {
-            EventHandler<SelectionChangedEventArgs>? handler = this.SelectedDateChanged;
-            if (null != handler)
-            {
-                Collection<DateTime> addedItems = new Collection<DateTime>();
-                Collection<DateTime> removedItems = new Collection<DateTime>();
-
-                if (addedDate.HasValue)
-                {
-                    addedItems.Add(addedDate.Value);
-                }
-
-                if (removedDate.HasValue)
-                {
-                    removedItems.Add(removedDate.Value);
-                }
-
-                handler(this, new SelectionChangedEventArgs(SelectingItemsControl.SelectionChangedEvent, removedItems, addedItems));
-            }
-        }
-        private void OnCalendarClosed(EventArgs e)
-        {
-            CalendarClosed?.Invoke(this, e);
-        }
-        private void OnCalendarOpened(EventArgs e)
-        {
-            CalendarOpened?.Invoke(this, e);
-        }
-
-        private void Calendar_DayButtonMouseUp(object? sender, PointerReleasedEventArgs e)
-        {
-            Focus();
-            IsDropDownOpen = false;
-        }      
-        private void Calendar_DisplayDateChanged(object? sender, CalendarDateChangedEventArgs e)
-        {
-            if (e.AddedDate != this.DisplayDate)
-            {
-                SetValue(DisplayDateProperty, (DateTime) e.AddedDate!);
-            }
-        }
-        private void Calendar_SelectedDatesChanged(object? sender, SelectionChangedEventArgs e)
-        {
-            Debug.Assert(e.AddedItems.Count < 2, "There should be less than 2 AddedItems!");
-
-            if (e.AddedItems.Count > 0 && SelectedDate.HasValue && DateTime.Compare((DateTime)e.AddedItems[0]!, SelectedDate.Value) != 0)
-            {
-                SelectedDate = (DateTime?)e.AddedItems[0];
-            }
-            else
-            {
-                if (e.AddedItems.Count == 0)
-                {
-                    SelectedDate = null;
-                    return;
-                }
-
-                if (!SelectedDate.HasValue)
-                {
-                    if (e.AddedItems.Count > 0)
-                    {
-                        SelectedDate = (DateTime?)e.AddedItems[0];
-                    }
-                }
-            }
-        }
-        private void Calendar_PointerReleased(object? sender, PointerReleasedEventArgs e)
-        {
-             
-            if (e.InitialPressMouseButton == MouseButton.Left)
-            {
-                e.Handled = true;
-            }
-        }
-        private void Calendar_KeyDown(object? sender, KeyEventArgs e)
-        {
-            Calendar? c = sender as Calendar ?? throw new ArgumentException("Sender must be Calendar.", nameof(sender));
-
-            if (!e.Handled && (e.Key == Key.Enter || e.Key == Key.Space || e.Key == Key.Escape) && c.DisplayMode == CalendarMode.Month)
-            {
-                Focus();
-                IsDropDownOpen = false;
-
-                if (e.Key == Key.Escape)
-                {
-                    SelectedDate = _onOpenSelectedDate;
-                }
-            }
-        }
-        private void TextBox_GotFocus(object? sender, RoutedEventArgs e)
-        {
-            IsDropDownOpen = false;
-        }
-        private void TextBox_KeyDown(object? sender, KeyEventArgs e)
-        {
-            if (!e.Handled)
-            {
-                e.Handled = ProcessDatePickerKey(e);
-            }
-        }
-        private void TextBox_TextChanged()
-        {
-            if (_textBox != null)
-            {
-                _suspendTextChangeHandler = true;
-                Text = _textBox.Text;
-                _suspendTextChangeHandler = false;
-            }
-        }
-        private void DropDownButton_PointerPressed(object? sender, PointerPressedEventArgs e)
-        {
-            _ignoreButtonClick = _isPopupClosing;
-        }
-        private void DropDownButton_Click(object? sender, RoutedEventArgs e)
-        {
-            if (!_ignoreButtonClick)
-            {
-                HandlePopUp();
-            }
-            else
-            {
-                _ignoreButtonClick = false;
-            }
-        }
-        private void PopUp_Closed(object? sender, EventArgs e)
-        {
-            IsDropDownOpen = false;
-
-            if(!_isPopupClosing)
-            {
-                _isPopupClosing = true;
-                Threading.Dispatcher.UIThread.InvokeAsync(() => _isPopupClosing = false);
-            }
-        }
-
-        private void HandlePopUp()
-        {
-            if (IsDropDownOpen)
-            {
-                Focus();
-                IsDropDownOpen = false;
-            }
-            else
-            {
-                ProcessTextBox();
-            }
-        }
-        private void OpenDropDown()
-        {
-            if (_calendar != null)
-            {
-                _calendar.Focus();
-                OpenPopUp();
-                _calendar.ResetStates();
-                OnCalendarOpened(new RoutedEventArgs());
-            }
-        }
-        private void OpenPopUp()
-        {
-            _onOpenSelectedDate = SelectedDate;
-            _popUp!.IsOpen = true;
-        }
-
-        /// <summary>
-        /// Input text is parsed in the correct format and changed into a
-        /// DateTime object.  If the text can not be parsed TextParseError Event
-        /// is thrown.
-        /// </summary>
-        /// <param name="text">Inherited code: Requires comment.</param>
-        /// <returns>
-        /// IT SHOULD RETURN NULL IF THE STRING IS NOT VALID, RETURN THE
-        /// DATETIME VALUE IF IT IS VALID.
-        /// </returns>
-        private DateTime? ParseText(string text)
-        {
-            DateTime newSelectedDate;
-
-            // TryParse is not used in order to be able to pass the exception to
-            // the TextParseError event
-            try
-            {
-                newSelectedDate = DateTime.Parse(text, DateTimeHelper.GetCurrentDateFormat());
-
-                if (Calendar.IsValidDateSelection(this._calendar!, newSelectedDate))
-                {
-                    return newSelectedDate;
-                }
-                else
-                {
-                    var dateValidationError = new CalendarDatePickerDateValidationErrorEventArgs(new ArgumentOutOfRangeException(nameof(text), "SelectedDate value is not valid."), text);
-                    OnDateValidationError(dateValidationError);
-
-                    if (dateValidationError.ThrowException)
-                    {
-                        throw dateValidationError.Exception;
-                    }
-                }
-            }
-            catch (FormatException ex)
-            {
-                CalendarDatePickerDateValidationErrorEventArgs textParseError = new CalendarDatePickerDateValidationErrorEventArgs(ex, text);
-                OnDateValidationError(textParseError);
-
-                if (textParseError.ThrowException)
-                {
-                    throw textParseError.Exception;
-                }
-            }
-            return null;
-        }
-        private string? DateTimeToString(DateTime d)
-        {
-            DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
-
-            switch (SelectedDateFormat)
-            {
-                case CalendarDatePickerFormat.Short:
-                    return string.Format(CultureInfo.CurrentCulture, d.ToString(dtfi.ShortDatePattern, dtfi));
-                case CalendarDatePickerFormat.Long:
-                    return string.Format(CultureInfo.CurrentCulture, d.ToString(dtfi.LongDatePattern, dtfi));
-                case CalendarDatePickerFormat.Custom:
-                    return string.Format(CultureInfo.CurrentCulture, d.ToString(CustomDateFormatString, dtfi));
-            }
-            return null;
-        }
-        private bool ProcessDatePickerKey(KeyEventArgs e)
-        {
-            
-            switch (e.Key)
-            {
-                case Key.Enter:
-                    {
-                        SetSelectedDate();
-                        return true;
-                    }
-                case Key.Down:
-                    { 
-                        if ((e.KeyModifiers & KeyModifiers.Control) == KeyModifiers.Control)
-                        {
-                            HandlePopUp();
-                            return true;
-                        }
-                        break;
-                    }
-            }
-            return false;
-        }
-        private void ProcessTextBox()
-        {
-            SetSelectedDate();
-            IsDropDownOpen = true;
-            _calendar!.Focus();
-        }
-        private void SetSelectedDate()
-        {
-            if (_textBox != null)
-            {
-                if (!string.IsNullOrEmpty(_textBox.Text))
-                {
-                    string s = _textBox.Text;
-
-                    if (SelectedDate != null)
-                    {
-                        // If the string value of the SelectedDate and the
-                        // TextBox string value are equal, we do not parse the
-                        // string again if we do an extra parse, we lose data in
-                        // M/d/yy format.
-                        // ex: SelectedDate = DateTime(1008,12,19) but when
-                        // "12/19/08" is parsed it is interpreted as
-                        // DateTime(2008,12,19)
-                        string? selectedDate = DateTimeToString(SelectedDate.Value);
-                        if (selectedDate == s)
-                        {
-                            return;
-                        }
-                    }
-                    DateTime? d = SetTextBoxValue(s);
-                    
-                    if (SelectedDate != d)
-                    {
-                        SelectedDate = d;
-                    }
-                }
-                else
-                {
-                    if (SelectedDate != null)
-                    {
-                        SelectedDate = null;
-                    }
-                }
-            }
-            else
-            {
-                DateTime? d = SetTextBoxValue(_defaultText);
-
-                if (SelectedDate != d)
-                {
-                    SelectedDate = d;
-                }
-            }
-        }
-        private DateTime? SetTextBoxValue(string s)
-        {
-            if (string.IsNullOrEmpty(s))
-            {
-                SetValue(TextProperty, s);
-                return SelectedDate;
-            }
-            else
-            {
-                DateTime? d = ParseText(s);
-                if (d != null)
-                {
-                    SetValue(TextProperty, s);
-                    return d;
-                }
-                else
-                {
-                    // If parse error: TextBox should have the latest valid
-                    // SelectedDate value:
-                    if (SelectedDate != null)
-                    {
-                        string? newtext = this.DateTimeToString(SelectedDate.Value);
-                        SetValue(TextProperty, newtext);
-                        return SelectedDate;
-                    }
-                    else
-                    {
-                        SetWaterMarkText();
-                        return null;
-                    }
-                }
-            }
-        }
-        private void SetWaterMarkText()
-        {
-            if (_textBox != null)
-            {
-                if (string.IsNullOrEmpty(Watermark) && !UseFloatingWatermark)
-                {
-                    DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
-                    Text = string.Empty;
-                    _defaultText = string.Empty;
-                    var watermarkFormat = "<{0}>";
-                    string watermarkText;
-
-                    switch (SelectedDateFormat)
-                    {
-                        case CalendarDatePickerFormat.Long:
-                            {
-                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.LongDatePattern.ToString());
-                                break;
-                            }
-                        case CalendarDatePickerFormat.Short:
-                        default:
-                            {
-                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.ShortDatePattern.ToString());
-                                break;
-                            }
-                    }
-                    _textBox.Watermark = watermarkText;
-                }
-                else
-                {
-                    _textBox.ClearValue(TextBox.WatermarkProperty);
-                }
-            }
-        }
-
-        private static bool IsValidSelectedDateFormat(CalendarDatePickerFormat value)
-        {
-            return value == CalendarDatePickerFormat.Long
-                || value == CalendarDatePickerFormat.Short
-                || value == CalendarDatePickerFormat.Custom;
-        }
-        private static bool IsValidDateFormatString(string formatString)
-        {
-            return !string.IsNullOrWhiteSpace(formatString);
-        }
-        private static DateTime DiscardDayTime(DateTime d)
-        {
-            int year = d.Year;
-            int month = d.Month;
-            DateTime newD = new DateTime(year, month, 1, 0, 0, 0);
-            return newD;
-        }
-        private static DateTime? DiscardTime(DateTime? d)
-        {
-            if (d == null)
-            {
-                return null;
-            }
-            else
-            {
-                DateTime discarded = (DateTime) d;
-                int year = discarded.Year;
-                int month = discarded.Month;
-                int day = discarded.Day;
-                DateTime newD = new DateTime(year, month, day, 0, 0, 0);
-                return newD;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Controls/Calendar/CalendarItem.cs b/src/Avalonia.Controls/Calendar/CalendarItem.cs
index 616b9083ff..bcac6324ba 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.Collections.Pooled;
 using Avalonia.Controls.Metadata;
 using Avalonia.Data;
 using Avalonia.Input;
@@ -19,6 +20,11 @@ namespace Avalonia.Controls.Primitives
     /// Represents the currently displayed month or year on a
     /// <see cref="T:Avalonia.Controls.Calendar" />.
     /// </summary>
+    [TemplatePart(PART_ElementHeaderButton,   typeof(Button))]
+    [TemplatePart(PART_ElementMonthView,      typeof(Grid))]
+    [TemplatePart(PART_ElementNextButton,     typeof(Button))]
+    [TemplatePart(PART_ElementPreviousButton, typeof(Button))]
+    [TemplatePart(PART_ElementYearView,       typeof(Grid))]
     [PseudoClasses(":calendardisabled")]
     public sealed class CalendarItem : TemplatedControl
     {
@@ -167,13 +173,13 @@ namespace Avalonia.Controls.Primitives
             if (MonthView != null)
             {
                 var childCount = Calendar.RowsPerMonth + Calendar.RowsPerMonth * Calendar.ColumnsPerMonth;
-                var children = new List<IControl>(childCount);
+                using var children = new PooledList<IControl>(childCount);
 
                 for (int i = 0; i < Calendar.RowsPerMonth; i++)
                 {
                     if (_dayTitleTemplate != null)
                     {
-                        var cell = _dayTitleTemplate.Build();
+                        var cell = (Control) _dayTitleTemplate.Build();
                         cell.DataContext = string.Empty;
                         cell.SetValue(Grid.RowProperty, 0);
                         cell.SetValue(Grid.ColumnProperty, i);
@@ -181,11 +187,16 @@ namespace Avalonia.Controls.Primitives
                     }
                 }
 
+                EventHandler<PointerPressedEventArgs> cellMouseLeftButtonDown = Cell_MouseLeftButtonDown;
+                EventHandler<PointerReleasedEventArgs> cellMouseLeftButtonUp = Cell_MouseLeftButtonUp;
+                EventHandler<PointerEventArgs> cellMouseEnter = Cell_MouseEnter;
+                EventHandler<RoutedEventArgs> cellClick = Cell_Click;
+
                 for (int i = 1; i < Calendar.RowsPerMonth; i++)
                 {
                     for (int j = 0; j < Calendar.ColumnsPerMonth; j++)
                     {
-                        CalendarDayButton cell = new CalendarDayButton();
+                        var cell = new CalendarDayButton();
 
                         if (Owner != null)
                         {
@@ -193,10 +204,10 @@ namespace Avalonia.Controls.Primitives
                         }
                         cell.SetValue(Grid.RowProperty, i);
                         cell.SetValue(Grid.ColumnProperty, j);
-                        cell.CalendarDayButtonMouseDown += Cell_MouseLeftButtonDown;
-                        cell.CalendarDayButtonMouseUp += Cell_MouseLeftButtonUp;
-                        cell.PointerEnter += Cell_MouseEnter;
-                        cell.Click += Cell_Click;
+                        cell.CalendarDayButtonMouseDown += cellMouseLeftButtonDown;
+                        cell.CalendarDayButtonMouseUp += cellMouseLeftButtonUp;
+                        cell.PointerEnter += cellMouseEnter;
+                        cell.Click += cellClick;
                         children.Add(cell);
                     }
                 }
@@ -207,14 +218,17 @@ namespace Avalonia.Controls.Primitives
             if (YearView != null)
             {
                 var childCount = Calendar.RowsPerYear * Calendar.ColumnsPerYear;
-                var children = new List<IControl>(childCount);
+                using var children = new PooledList<IControl>(childCount);
+
+                EventHandler<PointerPressedEventArgs> monthCalendarButtonMouseDown = Month_CalendarButtonMouseDown;
+                EventHandler<PointerReleasedEventArgs> monthCalendarButtonMouseUp = Month_CalendarButtonMouseUp;
+                EventHandler<PointerEventArgs> monthMouseEnter = Month_MouseEnter;
 
-                CalendarButton month;
                 for (int i = 0; i < Calendar.RowsPerYear; i++)
                 {
                     for (int j = 0; j < Calendar.ColumnsPerYear; j++)
                     {
-                        month = new CalendarButton();
+                        var month = new CalendarButton();
 
                         if (Owner != null)
                         {
@@ -222,9 +236,9 @@ namespace Avalonia.Controls.Primitives
                         }
                         month.SetValue(Grid.RowProperty, i);
                         month.SetValue(Grid.ColumnProperty, j);
-                        month.CalendarLeftMouseButtonDown += Month_CalendarButtonMouseDown;
-                        month.CalendarLeftMouseButtonUp += Month_CalendarButtonMouseUp;
-                        month.PointerEnter += Month_MouseEnter;
+                        month.CalendarLeftMouseButtonDown += monthCalendarButtonMouseDown;
+                        month.CalendarLeftMouseButtonUp += monthCalendarButtonMouseUp;
+                        month.PointerEnter += monthMouseEnter;
                         children.Add(month);
                     }
                 }
diff --git a/src/Avalonia.Controls/Calendar/DateTimeHelper.cs b/src/Avalonia.Controls/Calendar/DateTimeHelper.cs
index eb90f6c399..7a5c74a51b 100644
--- a/src/Avalonia.Controls/Calendar/DateTimeHelper.cs
+++ b/src/Avalonia.Controls/Calendar/DateTimeHelper.cs
@@ -68,10 +68,7 @@ namespace Avalonia.Controls
 
         public static DateTime DiscardDayTime(DateTime d)
         {
-            int year = d.Year;
-            int month = d.Month;
-            DateTime newD = new DateTime(year, month, 1, 0, 0, 0);
-            return newD;
+            return new DateTime(d.Year, d.Month, 1, 0, 0, 0);
         }
 
         [return: NotNullIfNotNull("d")]
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
new file mode 100644
index 0000000000..6c2356b411
--- /dev/null
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
@@ -0,0 +1,303 @@
+using System;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Layout;
+
+namespace Avalonia.Controls
+{
+    /// <inheritdoc/>
+    public partial class CalendarDatePicker
+    {
+        /// <summary>
+        /// Defines the <see cref="DisplayDate"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, DateTime> DisplayDateProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime>(
+                nameof(DisplayDate),
+                o => o.DisplayDate,
+                (o, v) => o.DisplayDate = v);
+
+        /// <summary>
+        /// Defines the <see cref="DisplayDateStart"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, DateTime?> DisplayDateStartProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
+                nameof(DisplayDateStart),
+                o => o.DisplayDateStart,
+                (o, v) => o.DisplayDateStart = v);
+
+        /// <summary>
+        /// Defines the <see cref="DisplayDateEnd"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, DateTime?> DisplayDateEndProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
+                nameof(DisplayDateEnd),
+                o => o.DisplayDateEnd,
+                (o, v) => o.DisplayDateEnd = v);
+
+        /// <summary>
+        /// Defines the <see cref="FirstDayOfWeek"/> property.
+        /// </summary>
+        public static readonly StyledProperty<DayOfWeek> FirstDayOfWeekProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, DayOfWeek>(nameof(FirstDayOfWeek));
+
+        /// <summary>
+        /// Defines the <see cref="IsDropDownOpen"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, bool> IsDropDownOpenProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, bool>(
+                nameof(IsDropDownOpen),
+                o => o.IsDropDownOpen,
+                (o, v) => o.IsDropDownOpen = v);
+
+        /// <summary>
+        /// Defines the <see cref="IsTodayHighlighted"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsTodayHighlightedProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, bool>(nameof(IsTodayHighlighted));
+
+        /// <summary>
+        /// Defines the <see cref="SelectedDate"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, DateTime?> SelectedDateProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
+                nameof(SelectedDate),
+                o => o.SelectedDate,
+                (o, v) => o.SelectedDate = v,
+                enableDataValidation: true, 
+                defaultBindingMode:BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="SelectedDateFormat"/> property.
+        /// </summary>
+        public static readonly StyledProperty<CalendarDatePickerFormat> SelectedDateFormatProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, CalendarDatePickerFormat>(
+                nameof(SelectedDateFormat),
+                defaultValue: CalendarDatePickerFormat.Short,
+                validate: IsValidSelectedDateFormat);
+
+        /// <summary>
+        /// Defines the <see cref="CustomDateFormatString"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string> CustomDateFormatStringProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, string>(
+                nameof(CustomDateFormatString),
+                defaultValue: "d",
+                validate: IsValidDateFormatString);
+
+        /// <summary>
+        /// Defines the <see cref="Text"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CalendarDatePicker, string?> TextProperty =
+            AvaloniaProperty.RegisterDirect<CalendarDatePicker, string?>(
+                nameof(Text),
+                o => o.Text,
+                (o, v) => o.Text = v);
+
+        /// <summary>
+        /// Defines the <see cref="Watermark"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string?> WatermarkProperty =
+            TextBox.WatermarkProperty.AddOwner<CalendarDatePicker>();
+
+        /// <summary>
+        /// Defines the <see cref="UseFloatingWatermark"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
+            TextBox.UseFloatingWatermarkProperty.AddOwner<CalendarDatePicker>();
+
+        /// <summary>
+        /// Defines the <see cref="HorizontalContentAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
+            ContentControl.HorizontalContentAlignmentProperty.AddOwner<CalendarDatePicker>();
+
+        /// <summary>
+        /// Defines the <see cref="VerticalContentAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
+            ContentControl.VerticalContentAlignmentProperty.AddOwner<CalendarDatePicker>();
+
+        /// <summary>
+        /// Gets a collection of dates that are marked as not selectable.
+        /// </summary>
+        /// <value>
+        /// A collection of dates that cannot be selected. The default value is
+        /// an empty collection.
+        /// </value>
+        public CalendarBlackoutDatesCollection? BlackoutDates { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the date to display.
+        /// </summary>
+        /// <value>
+        /// The date to display. The default is <see cref="DateTime.Today" />.
+        /// </value>
+        /// <exception cref="System.ArgumentOutOfRangeException">
+        /// The specified date is not in the range defined by
+        /// <see cref="CalendarDatePicker.DisplayDateStart" />
+        /// and
+        /// <see cref="CalendarDatePicker.DisplayDateEnd" />.
+        /// </exception>
+        public DateTime DisplayDate
+        {
+            get => _displayDate;
+            set => SetAndRaise(DisplayDateProperty, ref _displayDate, value);
+        }
+        
+        /// <summary>
+        /// Gets or sets the first date to be displayed.
+        /// </summary>
+        /// <value>The first date to display.</value>
+        public DateTime? DisplayDateStart
+        {
+            get => _displayDateStart;
+            set => SetAndRaise(DisplayDateStartProperty, ref _displayDateStart, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the last date to be displayed.
+        /// </summary>
+        /// <value>The last date to display.</value>
+        public DateTime? DisplayDateEnd
+        {
+            get => _displayDateEnd;
+            set => SetAndRaise(DisplayDateEndProperty, ref _displayDateEnd, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the day that is considered the beginning of the week.
+        /// </summary>
+        /// <value>
+        /// A <see cref="T:System.DayOfWeek" /> representing the beginning of
+        /// the week. The default is <see cref="F:System.DayOfWeek.Sunday" />.
+        /// </value>
+        public DayOfWeek FirstDayOfWeek
+        {
+            get => GetValue(FirstDayOfWeekProperty);
+            set => SetValue(FirstDayOfWeekProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the drop-down
+        /// <see cref="T:Avalonia.Controls.Calendar" /> is open or closed.
+        /// </summary>
+        /// <value>
+        /// True if the <see cref="T:Avalonia.Controls.Calendar" /> is
+        /// open; otherwise, false. The default is false.
+        /// </value>
+        public bool IsDropDownOpen
+        {
+            get => _isDropDownOpen;
+            set => SetAndRaise(IsDropDownOpenProperty, ref _isDropDownOpen, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the current date will be
+        /// highlighted.
+        /// </summary>
+        /// <value>
+        /// True if the current date is highlighted; otherwise, false. The
+        /// default is true.
+        /// </value>
+        public bool IsTodayHighlighted
+        {
+            get => GetValue(IsTodayHighlightedProperty);
+            set => SetValue(IsTodayHighlightedProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the currently selected date.
+        /// </summary>
+        /// <value>
+        /// The date currently selected. The default is null.
+        /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// The specified date is not in the range defined by
+        /// <see cref="CalendarDatePicker.DisplayDateStart" />
+        /// and
+        /// <see cref="CalendarDatePicker.DisplayDateEnd" />,
+        /// or the specified date is in the
+        /// <see cref="CalendarDatePicker.BlackoutDates" />
+        /// collection.
+        /// </exception>
+        public DateTime? SelectedDate
+        {
+            get => _selectedDate;
+            set => SetAndRaise(SelectedDateProperty, ref _selectedDate, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the format that is used to display the selected date.
+        /// </summary>
+        /// <value>
+        /// The format that is used to display the selected date. The default is
+        /// <see cref="CalendarDatePickerFormat.Short" />.
+        /// </value>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// An specified format is not valid.
+        /// </exception>
+        public CalendarDatePickerFormat SelectedDateFormat
+        {
+            get => GetValue(SelectedDateFormatProperty);
+            set => SetValue(SelectedDateFormatProperty, value);
+        }
+
+        public string CustomDateFormatString
+        {
+            get => GetValue(CustomDateFormatStringProperty);
+            set => SetValue(CustomDateFormatStringProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is displayed by the <see cref="CalendarDatePicker" />.
+        /// </summary>
+        /// <value>
+        /// The text displayed by the <see cref="CalendarDatePicker" />.
+        /// </value>
+        /// <exception cref="FormatException">
+        /// The text entered cannot be parsed to a valid date, and the exception
+        /// is not suppressed.
+        /// </exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// The text entered parses to a date that is not selectable.
+        /// </exception>
+        public string? Text
+        {
+            get => _text;
+            set => SetAndRaise(TextProperty, ref _text, value);
+        }
+
+        /// <inheritdoc cref="TextBox.Watermark"/>
+        public string? Watermark
+        {
+            get => GetValue(WatermarkProperty);
+            set => SetValue(WatermarkProperty, value);
+        }
+
+        /// <inheritdoc cref="TextBox.UseFloatingWatermark"/>
+        public bool UseFloatingWatermark
+        {
+            get => GetValue(UseFloatingWatermarkProperty);
+            set => SetValue(UseFloatingWatermarkProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the horizontal alignment of the content within the control.
+        /// </summary>
+        public HorizontalAlignment HorizontalContentAlignment
+        {
+            get => GetValue(HorizontalContentAlignmentProperty);
+            set => SetValue(HorizontalContentAlignmentProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the vertical alignment of the content within the control.
+        /// </summary>
+        public VerticalAlignment VerticalContentAlignment
+        {
+            get => GetValue(VerticalContentAlignmentProperty);
+            set => SetValue(VerticalContentAlignmentProperty, value);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
new file mode 100644
index 0000000000..3d592e9ab5
--- /dev/null
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
@@ -0,0 +1,927 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.Reactive.Disposables;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// A date selection control that allows the user to select dates from a drop down calendar.
+    /// </summary>
+    [TemplatePart(ElementButton,   typeof(Button))]
+    [TemplatePart(ElementCalendar, typeof(Calendar))]
+    [TemplatePart(ElementPopup,    typeof(Popup))]
+    [TemplatePart(ElementTextBox,  typeof(TextBox))]
+    [PseudoClasses(pcFlyoutOpen, pcPressed)]
+    public partial class CalendarDatePicker : TemplatedControl
+    {
+        protected const string pcPressed    = ":pressed";
+        protected const string pcFlyoutOpen = ":flyout-open";
+
+        private const string ElementTextBox = "PART_TextBox";
+        private const string ElementButton = "PART_Button";
+        private const string ElementPopup = "PART_Popup";
+        private const string ElementCalendar = "PART_Calendar";
+
+        private Calendar? _calendar;
+        private string _defaultText;
+        private Button? _dropDownButton;
+        private Popup? _popUp;
+        private TextBox? _textBox;
+        private IDisposable? _textBoxTextChangedSubscription;
+        private IDisposable? _buttonPointerPressedSubscription;
+
+        private DateTime? _onOpenSelectedDate;
+        private bool _settingSelectedDate;
+
+        private DateTime _displayDate;
+        private DateTime? _displayDateStart;
+        private DateTime? _displayDateEnd;
+        private bool _isDropDownOpen;
+        private DateTime? _selectedDate;
+        private string? _text;
+        private bool _suspendTextChangeHandler = false;
+        private bool _isPopupClosing = false;
+        private bool _ignoreButtonClick = false;
+        private bool _isFlyoutOpen = false;
+        private bool _isPressed = false;
+
+        /// <summary>
+        /// Occurs when the drop-down
+        /// <see cref="T:Avalonia.Controls.Calendar" /> is closed.
+        /// </summary>
+        public event EventHandler? CalendarClosed;
+
+        /// <summary>
+        /// Occurs when the drop-down
+        /// <see cref="T:Avalonia.Controls.Calendar" /> is opened.
+        /// </summary>
+        public event EventHandler? CalendarOpened;
+
+        /// <summary>
+        /// Occurs when <see cref="P:Avalonia.Controls.DatePicker.Text" />
+        /// is assigned a value that cannot be interpreted as a date.
+        /// </summary>
+        public event EventHandler<CalendarDatePickerDateValidationErrorEventArgs>? DateValidationError;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.SelectedDate" />
+        /// property is changed.
+        /// </summary>
+        public event EventHandler<SelectionChangedEventArgs>? SelectedDateChanged;
+
+        static CalendarDatePicker()
+        {
+            FocusableProperty.OverrideDefaultValue<CalendarDatePicker>(true);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CalendarDatePicker" /> class.
+        /// </summary>
+        public CalendarDatePicker()
+        {
+            FirstDayOfWeek = DateTimeHelper.GetCurrentDateFormat().FirstDayOfWeek;
+            _defaultText = string.Empty;
+            DisplayDate = DateTime.Today;
+        }
+
+        /// <summary>
+        /// Updates the visual state of the control by applying latest PseudoClasses.
+        /// </summary>
+        protected void UpdatePseudoClasses()
+        {
+            PseudoClasses.Set(pcFlyoutOpen, _isFlyoutOpen);
+            PseudoClasses.Set(pcPressed, _isPressed);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            if (_calendar != null)
+            {
+                _calendar.DayButtonMouseUp -= Calendar_DayButtonMouseUp;
+                _calendar.DisplayDateChanged -= Calendar_DisplayDateChanged;
+                _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged;
+                _calendar.PointerReleased -= Calendar_PointerReleased;
+                _calendar.KeyDown -= Calendar_KeyDown;
+            }
+            _calendar = e.NameScope.Find<Calendar>(ElementCalendar);
+            if (_calendar != null)
+            {
+                _calendar.SelectionMode = CalendarSelectionMode.SingleDate;
+
+                _calendar.DayButtonMouseUp += Calendar_DayButtonMouseUp;
+                _calendar.DisplayDateChanged += Calendar_DisplayDateChanged;
+                _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
+                _calendar.PointerReleased += Calendar_PointerReleased;
+                _calendar.KeyDown += Calendar_KeyDown;
+
+                var currentBlackoutDays = BlackoutDates;
+                BlackoutDates = _calendar.BlackoutDates;
+                if(currentBlackoutDays != null)
+                {
+                    foreach (var range in currentBlackoutDays)
+                    {
+                        BlackoutDates.Add(range);
+                    }
+                }
+            }
+
+            if (_popUp != null)
+            {
+                _popUp.Child = null;
+                _popUp.Closed -= PopUp_Closed;
+            }
+            _popUp = e.NameScope.Find<Popup>(ElementPopup);
+            if(_popUp != null)
+            {
+                _popUp.Closed += PopUp_Closed;
+                if (IsDropDownOpen)
+                {
+                    OpenDropDown();
+                }
+            }
+
+            if(_dropDownButton != null)
+            {
+                _dropDownButton.Click -= DropDownButton_Click;
+                _buttonPointerPressedSubscription?.Dispose();
+            }
+            _dropDownButton = e.NameScope.Find<Button>(ElementButton);
+            if(_dropDownButton != null)
+            {
+                _dropDownButton.Click += DropDownButton_Click;
+                _buttonPointerPressedSubscription = new CompositeDisposable(
+                    _dropDownButton.AddDisposableHandler(PointerPressedEvent, DropDownButton_PointerPressed, handledEventsToo: true),
+                    _dropDownButton.AddDisposableHandler(PointerReleasedEvent, DropDownButton_PointerReleased, handledEventsToo: true));
+            }
+
+            if (_textBox != null)
+            {
+                _textBox.KeyDown -= TextBox_KeyDown;
+                _textBox.GotFocus -= TextBox_GotFocus;
+                _textBoxTextChangedSubscription?.Dispose();
+            }
+            _textBox = e.NameScope.Find<TextBox>(ElementTextBox);
+
+            if(!SelectedDate.HasValue)
+            {
+                SetWaterMarkText();
+            }
+
+            if(_textBox != null)
+            {
+                _textBox.KeyDown += TextBox_KeyDown;
+                _textBox.GotFocus += TextBox_GotFocus;
+                _textBoxTextChangedSubscription = _textBox.GetObservable(TextBox.TextProperty).Subscribe(txt => TextBox_TextChanged());
+
+                if(SelectedDate.HasValue)
+                {
+                    _textBox.Text = DateTimeToString(SelectedDate.Value);
+                }
+                else if(!String.IsNullOrEmpty(_defaultText))
+                {
+                    _textBox.Text = _defaultText;
+                    SetSelectedDate();
+                }
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            // CustomDateFormatString
+            if (change.Property == CustomDateFormatStringProperty)
+            {
+                if (SelectedDateFormat == CalendarDatePickerFormat.Custom)
+                {
+                    OnDateFormatChanged();
+                }
+            }
+            // IsDropDownOpen
+            else if (change.Property == IsDropDownOpenProperty)
+            {
+                var (oldValue, newValue) = change.GetOldAndNewValue<bool>();
+
+                if (_popUp != null && _popUp.Child != null)
+                {
+                    if (newValue != oldValue)
+                    {
+                        if (_calendar!.DisplayMode != CalendarMode.Month)
+                        {
+                            _calendar.DisplayMode = CalendarMode.Month;
+                        }
+
+                        if (newValue)
+                        {
+                            OpenDropDown();
+                        }
+                        else
+                        {
+                            _popUp.IsOpen = false;
+                            _isFlyoutOpen = _popUp.IsOpen;
+                            _isPressed = false;
+
+                            UpdatePseudoClasses();
+                            OnCalendarClosed(new RoutedEventArgs());
+                        }
+                    }
+                }
+            }
+            // SelectedDate
+            else if (change.Property == SelectedDateProperty)
+            {
+                var (removedDate, addedDate) = change.GetOldAndNewValue<DateTime?>();
+
+                if (SelectedDate != null)
+                {
+                    DateTime day = SelectedDate.Value;
+
+                    // When the SelectedDateProperty change is done from
+                    // OnTextPropertyChanged method, two-way binding breaks if
+                    // BeginInvoke is not used:
+                    Threading.Dispatcher.UIThread.InvokeAsync(() =>
+                    {
+                        _settingSelectedDate = true;
+                        Text = DateTimeToString(day);
+                        _settingSelectedDate = false;
+                        OnDateSelected(addedDate, removedDate);
+                    });
+
+                    // When DatePickerDisplayDateFlag is TRUE, the SelectedDate
+                    // change is coming from the Calendar UI itself, so, we
+                    // shouldn't change the DisplayDate since it will automatically
+                    // be changed by the Calendar
+                    if ((day.Month != DisplayDate.Month || day.Year != DisplayDate.Year) && (_calendar == null || !_calendar.CalendarDatePickerDisplayDateFlag))
+                    {
+                        DisplayDate = day;
+                    }
+
+                    if(_calendar != null)
+                    {
+                        _calendar.CalendarDatePickerDisplayDateFlag = false;
+                    }
+                }
+                else
+                {
+                    _settingSelectedDate = true;
+                    SetWaterMarkText();
+                    _settingSelectedDate = false;
+                    OnDateSelected(addedDate, removedDate);
+                }
+            }
+            // SelectedDateFormat
+            else if (change.Property == SelectedDateFormatProperty)
+            {
+                OnDateFormatChanged();
+            }
+            // Text
+            else if (change.Property == TextProperty)
+            {
+                var (oldValue, newValue) = change.GetOldAndNewValue<string>();
+
+                if (!_suspendTextChangeHandler)
+                {
+                    if (newValue != null)
+                    {
+                        if (_textBox != null)
+                        {
+                            _textBox.Text = newValue;
+                        }
+                        else
+                        {
+                            _defaultText = newValue;
+                        }
+
+                        if (!_settingSelectedDate)
+                        {
+                            SetSelectedDate();
+                        }
+                    }
+                    else
+                    {
+                        if (!_settingSelectedDate)
+                        {
+                            _settingSelectedDate = true;
+                            SelectedDate = null;
+                            _settingSelectedDate = false;
+                        }
+                    }
+                }
+                else
+                {
+                    SetWaterMarkText();
+                }
+            }
+
+            base.OnPropertyChanged(change);
+        }
+
+        /// <inheritdoc/>
+        protected override void UpdateDataValidation(AvaloniaProperty property, BindingValueType state, Exception? error)
+        {
+            if (property == SelectedDateProperty)
+            {
+                DataValidationErrors.SetError(this, error);
+            }
+
+            base.UpdateDataValidation(property, state, error);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
+        {
+            base.OnPointerPressed(e);
+
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            {
+                e.Handled = true;
+
+                _ignoreButtonClick = _isPopupClosing;
+
+                _isPressed = true;
+                UpdatePseudoClasses();
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPointerReleased(PointerReleasedEventArgs e)
+        {
+            base.OnPointerReleased(e);
+
+            if (_isPressed && e.InitialPressMouseButton == MouseButton.Left)
+            {
+                e.Handled = true;
+
+                if (!_ignoreButtonClick)
+                {
+                    TogglePopUp();
+                }
+                else
+                {
+                    _ignoreButtonClick = false;
+                }
+
+                _isPressed = false;
+                UpdatePseudoClasses();
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
+        {
+            base.OnPointerCaptureLost(e);
+
+            _isPressed = false;
+            UpdatePseudoClasses();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
+        {
+            base.OnPointerWheelChanged(e);
+            if (!e.Handled && SelectedDate.HasValue && _calendar != null)
+            {
+                DateTime selectedDate = this.SelectedDate.Value;
+                DateTime? newDate = DateTimeHelper.AddDays(selectedDate, e.Delta.Y > 0 ? -1 : 1);
+                if (newDate.HasValue && Calendar.IsValidDateSelection(_calendar, newDate.Value))
+                {
+                    SelectedDate = newDate;
+                    e.Handled = true;
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnGotFocus(GotFocusEventArgs e)
+        {
+            base.OnGotFocus(e);
+            if(IsEnabled && _textBox != null && e.NavigationMethod == NavigationMethod.Tab)
+            {
+                _textBox.Focus();
+                var text = _textBox.Text;
+                if(!string.IsNullOrEmpty(text))
+                {
+                    _textBox.SelectionStart = 0;
+                    _textBox.SelectionEnd = text.Length;
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnLostFocus(RoutedEventArgs e)
+        {
+            base.OnLostFocus(e);
+
+            _isPressed = false;
+            UpdatePseudoClasses();
+
+            SetSelectedDate();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnKeyUp(KeyEventArgs e)
+        {
+            var key = e.Key;
+
+            if ((key == Key.Space || key == Key.Enter) && IsEffectivelyEnabled) // Key.GamepadA is not currently supported
+            {
+                // Since the TextBox is used for direct date entry,
+                // it isn't supported to open the popup/flyout using these keys.
+                // Other controls open the popup/flyout here.
+            }
+            else if (key == Key.Down && e.KeyModifiers.HasAllFlags(KeyModifiers.Alt) && IsEffectivelyEnabled)
+            {
+                // It is only possible to open the popup using these keys.
+                // This is important as the down key is handled by calendar.
+                // If down also closed the popup, the date would move 1 week
+                // and then close the popup. This isn't user friendly at all.
+                // (calendar doesn't mark as handled either).
+                // The Escape key will still close the popup.
+                if (IsDropDownOpen == false)
+                {
+                    e.Handled = true;
+
+                    if (!_ignoreButtonClick)
+                    {
+                        TogglePopUp();
+                    }
+                    else
+                    {
+                        _ignoreButtonClick = false;
+                    }
+
+                    UpdatePseudoClasses();
+                }
+            }
+
+            base.OnKeyUp(e);
+        }
+
+        private void OnDateFormatChanged()
+        {
+            if (_textBox != null)
+            {
+                if (SelectedDate.HasValue)
+                {
+                    Text = DateTimeToString(SelectedDate.Value);
+                }
+                else if (string.IsNullOrEmpty(_textBox.Text))
+                {
+                    SetWaterMarkText();
+                }
+                else
+                {
+                    DateTime? date = ParseText(_textBox.Text);
+
+                    if (date != null)
+                    {
+                        string? s = DateTimeToString((DateTime)date);
+                        Text = s;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
+        /// event.
+        /// </summary>
+        /// <param name="e">
+        /// A
+        /// <see cref="T:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs" />
+        /// that contains the event data.
+        /// </param>
+        protected virtual void OnDateValidationError(CalendarDatePickerDateValidationErrorEventArgs e)
+        {
+            DateValidationError?.Invoke(this, e);
+        }
+
+        private void OnDateSelected(DateTime? addedDate, DateTime? removedDate)
+        {
+            EventHandler<SelectionChangedEventArgs>? handler = this.SelectedDateChanged;
+            if (null != handler)
+            {
+                Collection<DateTime> addedItems = new Collection<DateTime>();
+                Collection<DateTime> removedItems = new Collection<DateTime>();
+
+                if (addedDate.HasValue)
+                {
+                    addedItems.Add(addedDate.Value);
+                }
+
+                if (removedDate.HasValue)
+                {
+                    removedItems.Add(removedDate.Value);
+                }
+
+                handler(this, new SelectionChangedEventArgs(SelectingItemsControl.SelectionChangedEvent, removedItems, addedItems));
+            }
+        }
+
+        private void OnCalendarClosed(EventArgs e)
+        {
+            CalendarClosed?.Invoke(this, e);
+        }
+
+        private void OnCalendarOpened(EventArgs e)
+        {
+            CalendarOpened?.Invoke(this, e);
+        }
+
+        private void Calendar_DayButtonMouseUp(object? sender, PointerReleasedEventArgs e)
+        {
+            Focus();
+            IsDropDownOpen = false;
+        }
+
+        private void Calendar_DisplayDateChanged(object? sender, CalendarDateChangedEventArgs e)
+        {
+            if (e.AddedDate != this.DisplayDate)
+            {
+                SetValue(DisplayDateProperty, (DateTime) e.AddedDate!);
+            }
+        }
+
+        private void Calendar_SelectedDatesChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            Debug.Assert(e.AddedItems.Count < 2, "There should be less than 2 AddedItems!");
+
+            if (e.AddedItems.Count > 0 && SelectedDate.HasValue && DateTime.Compare((DateTime)e.AddedItems[0]!, SelectedDate.Value) != 0)
+            {
+                SelectedDate = (DateTime?)e.AddedItems[0];
+            }
+            else
+            {
+                if (e.AddedItems.Count == 0)
+                {
+                    SelectedDate = null;
+                    return;
+                }
+
+                if (!SelectedDate.HasValue)
+                {
+                    if (e.AddedItems.Count > 0)
+                    {
+                        SelectedDate = (DateTime?)e.AddedItems[0];
+                    }
+                }
+            }
+        }
+
+        private void Calendar_PointerReleased(object? sender, PointerReleasedEventArgs e)
+        {
+             
+            if (e.InitialPressMouseButton == MouseButton.Left)
+            {
+                e.Handled = true;
+            }
+        }
+
+        private void Calendar_KeyDown(object? sender, KeyEventArgs e)
+        {
+            Calendar? c = sender as Calendar ?? throw new ArgumentException("Sender must be Calendar.", nameof(sender));
+
+            if (!e.Handled && (e.Key == Key.Enter || e.Key == Key.Space || e.Key == Key.Escape) && c.DisplayMode == CalendarMode.Month)
+            {
+                Focus();
+                IsDropDownOpen = false;
+
+                if (e.Key == Key.Escape)
+                {
+                    SelectedDate = _onOpenSelectedDate;
+                }
+            }
+        }
+
+        private void TextBox_GotFocus(object? sender, RoutedEventArgs e)
+        {
+            IsDropDownOpen = false;
+        }
+
+        private void TextBox_KeyDown(object? sender, KeyEventArgs e)
+        {
+            if (!e.Handled)
+            {
+                e.Handled = ProcessDatePickerKey(e);
+            }
+        }
+
+        private void TextBox_TextChanged()
+        {
+            if (_textBox != null)
+            {
+                _suspendTextChangeHandler = true;
+                Text = _textBox.Text;
+                _suspendTextChangeHandler = false;
+            }
+        }
+
+        private void DropDownButton_PointerPressed(object? sender, PointerPressedEventArgs e)
+        {
+            _ignoreButtonClick = _isPopupClosing;
+
+            _isPressed = true;
+            UpdatePseudoClasses();
+        }
+
+        private void DropDownButton_PointerReleased(object? sender, PointerReleasedEventArgs e)
+        {
+            _isPressed = false;
+            UpdatePseudoClasses();
+        }
+
+        private void DropDownButton_Click(object? sender, RoutedEventArgs e)
+        {
+            if (!_ignoreButtonClick)
+            {
+                TogglePopUp();
+            }
+            else
+            {
+                _ignoreButtonClick = false;
+            }
+        }
+
+        private void PopUp_Closed(object? sender, EventArgs e)
+        {
+            IsDropDownOpen = false;
+
+            if(!_isPopupClosing)
+            {
+                _isPopupClosing = true;
+                Threading.Dispatcher.UIThread.InvokeAsync(() => _isPopupClosing = false);
+            }
+        }
+
+        /// <summary>
+        /// Toggles the <see cref="IsDropDownOpen"/> property to open/close the calendar popup.
+        /// This will automatically adjust control focus as well.
+        /// </summary>
+        private void TogglePopUp()
+        {
+            if (IsDropDownOpen)
+            {
+                Focus();
+                IsDropDownOpen = false;
+            }
+            else
+            {
+                SetSelectedDate();
+                IsDropDownOpen = true;
+                _calendar!.Focus();
+            }
+        }
+
+        private void OpenDropDown()
+        {
+            if (_calendar != null)
+            {
+                _calendar.Focus();
+
+                // Open the PopUp
+                _onOpenSelectedDate = SelectedDate;
+                _popUp!.IsOpen = true;
+                _isFlyoutOpen = _popUp!.IsOpen;
+
+                UpdatePseudoClasses();
+                _calendar.ResetStates();
+                OnCalendarOpened(new RoutedEventArgs());
+            }
+        }
+
+        /// <summary>
+        /// Input text is parsed in the correct format and changed into a
+        /// DateTime object.  If the text can not be parsed TextParseError Event
+        /// is thrown.
+        /// </summary>
+        /// <param name="text">Inherited code: Requires comment.</param>
+        /// <returns>
+        /// IT SHOULD RETURN NULL IF THE STRING IS NOT VALID, RETURN THE
+        /// DATETIME VALUE IF IT IS VALID.
+        /// </returns>
+        private DateTime? ParseText(string text)
+        {
+            DateTime newSelectedDate;
+
+            // TryParse is not used in order to be able to pass the exception to
+            // the TextParseError event
+            try
+            {
+                newSelectedDate = DateTime.Parse(text, DateTimeHelper.GetCurrentDateFormat());
+
+                if (Calendar.IsValidDateSelection(this._calendar!, newSelectedDate))
+                {
+                    return newSelectedDate;
+                }
+                else
+                {
+                    var dateValidationError = new CalendarDatePickerDateValidationErrorEventArgs(new ArgumentOutOfRangeException(nameof(text), "SelectedDate value is not valid."), text);
+                    OnDateValidationError(dateValidationError);
+
+                    if (dateValidationError.ThrowException)
+                    {
+                        throw dateValidationError.Exception;
+                    }
+                }
+            }
+            catch (FormatException ex)
+            {
+                CalendarDatePickerDateValidationErrorEventArgs textParseError = new CalendarDatePickerDateValidationErrorEventArgs(ex, text);
+                OnDateValidationError(textParseError);
+
+                if (textParseError.ThrowException)
+                {
+                    throw textParseError.Exception;
+                }
+            }
+
+            return null;
+        }
+
+        private string? DateTimeToString(DateTime d)
+        {
+            DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
+
+            switch (SelectedDateFormat)
+            {
+                case CalendarDatePickerFormat.Short:
+                    return string.Format(CultureInfo.CurrentCulture, d.ToString(dtfi.ShortDatePattern, dtfi));
+                case CalendarDatePickerFormat.Long:
+                    return string.Format(CultureInfo.CurrentCulture, d.ToString(dtfi.LongDatePattern, dtfi));
+                case CalendarDatePickerFormat.Custom:
+                    return string.Format(CultureInfo.CurrentCulture, d.ToString(CustomDateFormatString, dtfi));
+            }
+
+            return null;
+        }
+
+        private bool ProcessDatePickerKey(KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Enter:
+                    {
+                        SetSelectedDate();
+                        return true;
+                    }
+                case Key.Down:
+                    { 
+                        if ((e.KeyModifiers & KeyModifiers.Control) == KeyModifiers.Control)
+                        {
+                            TogglePopUp();
+                            return true;
+                        }
+                        break;
+                    }
+            }
+
+            return false;
+        }
+
+        private void SetSelectedDate()
+        {
+            if (_textBox != null)
+            {
+                if (!string.IsNullOrEmpty(_textBox.Text))
+                {
+                    string s = _textBox.Text;
+
+                    if (SelectedDate != null)
+                    {
+                        // If the string value of the SelectedDate and the
+                        // TextBox string value are equal, we do not parse the
+                        // string again if we do an extra parse, we lose data in
+                        // M/d/yy format.
+                        // ex: SelectedDate = DateTime(1008,12,19) but when
+                        // "12/19/08" is parsed it is interpreted as
+                        // DateTime(2008,12,19)
+                        string? selectedDate = DateTimeToString(SelectedDate.Value);
+                        if (selectedDate == s)
+                        {
+                            return;
+                        }
+                    }
+                    DateTime? d = SetTextBoxValue(s);
+                    
+                    if (SelectedDate != d)
+                    {
+                        SelectedDate = d;
+                    }
+                }
+                else
+                {
+                    if (SelectedDate != null)
+                    {
+                        SelectedDate = null;
+                    }
+                }
+            }
+            else
+            {
+                DateTime? d = SetTextBoxValue(_defaultText);
+
+                if (SelectedDate != d)
+                {
+                    SelectedDate = d;
+                }
+            }
+        }
+
+        private DateTime? SetTextBoxValue(string s)
+        {
+            if (string.IsNullOrEmpty(s))
+            {
+                SetValue(TextProperty, s);
+                return SelectedDate;
+            }
+            else
+            {
+                DateTime? d = ParseText(s);
+                if (d != null)
+                {
+                    SetValue(TextProperty, s);
+                    return d;
+                }
+                else
+                {
+                    // If parse error: TextBox should have the latest valid
+                    // SelectedDate value:
+                    if (SelectedDate != null)
+                    {
+                        string? newtext = this.DateTimeToString(SelectedDate.Value);
+                        SetValue(TextProperty, newtext);
+                        return SelectedDate;
+                    }
+                    else
+                    {
+                        SetWaterMarkText();
+                        return null;
+                    }
+                }
+            }
+        }
+
+        private void SetWaterMarkText()
+        {
+            if (_textBox != null)
+            {
+                if (string.IsNullOrEmpty(Watermark) && !UseFloatingWatermark)
+                {
+                    DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
+                    Text = string.Empty;
+                    _defaultText = string.Empty;
+                    var watermarkFormat = "<{0}>";
+                    string watermarkText;
+
+                    switch (SelectedDateFormat)
+                    {
+                        case CalendarDatePickerFormat.Long:
+                            {
+                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.LongDatePattern.ToString());
+                                break;
+                            }
+                        case CalendarDatePickerFormat.Short:
+                        default:
+                            {
+                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.ShortDatePattern.ToString());
+                                break;
+                            }
+                    }
+                    _textBox.Watermark = watermarkText;
+                }
+                else
+                {
+                    _textBox.ClearValue(TextBox.WatermarkProperty);
+                }
+            }
+        }
+
+        private static bool IsValidSelectedDateFormat(CalendarDatePickerFormat value)
+        {
+            return value == CalendarDatePickerFormat.Long
+                || value == CalendarDatePickerFormat.Short
+                || value == CalendarDatePickerFormat.Custom;
+        }
+
+        private static bool IsValidDateFormatString(string formatString)
+        {
+            return !string.IsNullOrWhiteSpace(formatString);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerDateValidationErrorEventArgs.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerDateValidationErrorEventArgs.cs
new file mode 100644
index 0000000000..647910cb6b
--- /dev/null
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerDateValidationErrorEventArgs.cs
@@ -0,0 +1,87 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Provides data for the
+    /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
+    /// event.
+    /// </summary>
+    public class CalendarDatePickerDateValidationErrorEventArgs : EventArgs
+    {
+        private bool _throwException;
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs" />
+        /// class.
+        /// </summary>
+        /// <param name="exception">
+        /// The initial exception from the
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
+        /// event.
+        /// </param>
+        /// <param name="text">
+        /// The text that caused the
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
+        /// event.
+        /// </param>
+        public CalendarDatePickerDateValidationErrorEventArgs(Exception exception, string text)
+        {
+            Text = text;
+            Exception = exception;
+        }
+
+        /// <summary>
+        /// Gets the initial exception associated with the
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
+        /// event.
+        /// </summary>
+        /// <value>
+        /// The exception associated with the validation failure.
+        /// </value>
+        public Exception Exception { get; private set; }
+
+        /// <summary>
+        /// Gets the text that caused the
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
+        /// event.
+        /// </summary>
+        /// <value>
+        /// The text that caused the validation failure.
+        /// </value>
+        public string Text { get; private set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether
+        /// <see cref="P:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs.Exception" />
+        /// should be thrown.
+        /// </summary>
+        /// <value>
+        /// True if the exception should be thrown; otherwise, false.
+        /// </value>
+        /// <exception cref="T:System.ArgumentException">
+        /// If set to true and
+        /// <see cref="P:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs.Exception" />
+        /// is null.
+        /// </exception>
+        public bool ThrowException
+        {
+            get => _throwException;
+            set
+            {
+                if (value && Exception == null)
+                {
+                    throw new ArgumentException("Cannot Throw Null Exception");
+                }
+
+                _throwException = value;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerFormat.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerFormat.cs
new file mode 100644
index 0000000000..4d96859d75
--- /dev/null
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerFormat.cs
@@ -0,0 +1,31 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Specifies date formats for a
+    /// <see cref="T:Avalonia.Controls.CalendarDatePicker" />.
+    /// </summary>
+    public enum CalendarDatePickerFormat
+    {
+        /// <summary>
+        /// Specifies that the date should be displayed using unabbreviated days
+        /// of the week and month names.
+        /// </summary>
+        Long = 0,
+
+        /// <summary>
+        /// Specifies that the date should be displayed using abbreviated days
+        /// of the week and month names.
+        /// </summary>
+        Short = 1,
+
+        /// <summary>
+        /// Specifies that the date should be displayed using a custom format string.
+        /// </summary>
+        Custom = 2
+    }
+}
diff --git a/src/Avalonia.Controls/Canvas.cs b/src/Avalonia.Controls/Canvas.cs
index fabf8978c7..adee7d4d90 100644
--- a/src/Avalonia.Controls/Canvas.cs
+++ b/src/Avalonia.Controls/Canvas.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reactive.Concurrency;
 using Avalonia.Input;
 using Avalonia.Layout;
 
@@ -159,47 +160,57 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Arranges the control's children.
+        /// Arranges a single child.
         /// </summary>
-        /// <param name="finalSize">The size allocated to the control.</param>
-        /// <returns>The space taken.</returns>
-        protected override Size ArrangeOverride(Size finalSize)
+        /// <param name="child">The child to arrange.</param>
+        /// <param name="finalSize">The size allocated to the canvas.</param>
+        protected virtual void ArrangeChild(Control child, Size finalSize)
         {
-            foreach (Control child in Children)
-            {
-                double x = 0.0;
-                double y = 0.0;
-                double elementLeft = GetLeft(child);
+            double x = 0.0;
+            double y = 0.0;
+            double elementLeft = GetLeft(child);
 
-                if (!double.IsNaN(elementLeft))
-                {
-                    x = elementLeft;
-                }
-                else
+            if (!double.IsNaN(elementLeft))
+            {
+                x = elementLeft;
+            }
+            else
+            {
+                // Arrange with right.
+                double elementRight = GetRight(child);
+                if (!double.IsNaN(elementRight))
                 {
-                    // Arrange with right.
-                    double elementRight = GetRight(child);
-                    if (!double.IsNaN(elementRight))
-                    {
-                        x = finalSize.Width - child.DesiredSize.Width - elementRight;
-                    }
+                    x = finalSize.Width - child.DesiredSize.Width - elementRight;
                 }
+            }
 
-                double elementTop = GetTop(child);
-                if (!double.IsNaN(elementTop) )
-                {
-                    y = elementTop;
-                }
-                else
+            double elementTop = GetTop(child);
+            if (!double.IsNaN(elementTop))
+            {
+                y = elementTop;
+            }
+            else
+            {
+                double elementBottom = GetBottom(child);
+                if (!double.IsNaN(elementBottom))
                 {
-                    double elementBottom = GetBottom(child);
-                    if (!double.IsNaN(elementBottom))
-                    {
-                        y = finalSize.Height - child.DesiredSize.Height - elementBottom;
-                    }
+                    y = finalSize.Height - child.DesiredSize.Height - elementBottom;
                 }
+            }
 
-                child.Arrange(new Rect(new Point(x, y), child.DesiredSize));
+            child.Arrange(new Rect(new Point(x, y), child.DesiredSize));
+        }
+
+        /// <summary>
+        /// Arranges the control's children.
+        /// </summary>
+        /// <param name="finalSize">The size allocated to the control.</param>
+        /// <returns>The space taken.</returns>
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            foreach (Control child in Children)
+            {
+                ArrangeChild(child, finalSize);
             }
 
             return finalSize;
diff --git a/src/Avalonia.Controls/Carousel.cs b/src/Avalonia.Controls/Carousel.cs
index 4cacf51fa1..28a4aa6436 100644
--- a/src/Avalonia.Controls/Carousel.cs
+++ b/src/Avalonia.Controls/Carousel.cs
@@ -20,8 +20,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="PageTransition"/> property.
         /// </summary>
-        public static readonly StyledProperty<IPageTransition> PageTransitionProperty =
-            AvaloniaProperty.Register<Carousel, IPageTransition>(nameof(PageTransition));
+        public static readonly StyledProperty<IPageTransition?> PageTransitionProperty =
+            AvaloniaProperty.Register<Carousel, IPageTransition?>(nameof(PageTransition));
 
         /// <summary>
         /// The default value of <see cref="ItemsControl.ItemsPanelProperty"/> for 
@@ -54,7 +54,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the transition to use when moving between pages.
         /// </summary>
-        public IPageTransition PageTransition
+        public IPageTransition? PageTransition
         {
             get { return GetValue(PageTransitionProperty); }
             set { SetValue(PageTransitionProperty, value); }
diff --git a/src/Avalonia.Controls/Chrome/CaptionButtons.cs b/src/Avalonia.Controls/Chrome/CaptionButtons.cs
index 1cad1a4c69..d5923a8b37 100644
--- a/src/Avalonia.Controls/Chrome/CaptionButtons.cs
+++ b/src/Avalonia.Controls/Chrome/CaptionButtons.cs
@@ -8,6 +8,10 @@ namespace Avalonia.Controls.Chrome
     /// <summary>
     /// Draws window minimize / maximize / close buttons in a <see cref="TitleBar"/> when managed client decorations are enabled.
     /// </summary>
+    [TemplatePart("PART_CloseButton",      typeof(Panel))]
+    [TemplatePart("PART_RestoreButton",    typeof(Panel))]
+    [TemplatePart("PART_MinimiseButton",   typeof(Panel))]
+    [TemplatePart("PART_FullScreenButton", typeof(Panel))]
     [PseudoClasses(":minimized", ":normal", ":maximized", ":fullscreen")]
     public class CaptionButtons : TemplatedControl
     {
diff --git a/src/Avalonia.Controls/Chrome/TitleBar.cs b/src/Avalonia.Controls/Chrome/TitleBar.cs
index 4da50e7220..b152a31587 100644
--- a/src/Avalonia.Controls/Chrome/TitleBar.cs
+++ b/src/Avalonia.Controls/Chrome/TitleBar.cs
@@ -8,6 +8,7 @@ namespace Avalonia.Controls.Chrome
     /// <summary>
     /// Draws a titlebar when managed client decorations are enabled.
     /// </summary>
+    [TemplatePart("PART_CaptionButtons", typeof(CaptionButtons))]
     [PseudoClasses(":minimized", ":normal", ":maximized", ":fullscreen")]
     public class TitleBar : TemplatedControl
     {
diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs
index c5410ae9b0..cbf9b35a05 100644
--- a/src/Avalonia.Controls/ComboBox.cs
+++ b/src/Avalonia.Controls/ComboBox.cs
@@ -13,12 +13,14 @@ using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.VisualTree;
+using Avalonia.Controls.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// A drop-down list control.
     /// </summary>
+    [TemplatePart("PART_Popup", typeof(Popup))]
     public class ComboBox : SelectingItemsControl
     {
         /// <summary>
@@ -182,6 +184,25 @@ namespace Avalonia.Controls
             this.UpdateSelectionBoxItem(SelectedItem);
         }
 
+        // Because the SelectedItem isn't connected to the visual tree
+        public override void InvalidateMirrorTransform()
+        {
+            base.InvalidateMirrorTransform();
+
+            if (SelectedItem is Control selectedControl)
+            {
+                selectedControl.InvalidateMirrorTransform();
+
+                foreach (var visual in selectedControl.GetVisualDescendants())
+                {
+                    if (visual is Control childControl)
+                    {
+                        childControl.InvalidateMirrorTransform();
+                    }
+                }
+            }
+        }
+
         /// <inheritdoc/>
         protected override void OnKeyDown(KeyEventArgs e)
         {
@@ -432,42 +453,18 @@ namespace Avalonia.Controls
 
         private void SelectNext()
         {
-            int next = SelectedIndex + 1;
-
-            if (next >= ItemCount)
+            if (ItemCount >= 1)
             {
-                if (WrapSelection == true)
-                {
-                    next = 0;
-                }
-                else
-                {
-                    return;
-                }
+                MoveSelection(NavigationDirection.Next, WrapSelection);
             }
-
-
-
-            SelectedIndex = next;
         }
 
         private void SelectPrev()
         {
-            int prev = SelectedIndex - 1;
-
-            if (prev < 0)
+            if (ItemCount >= 1)
             {
-                if (WrapSelection == true)
-                {
-                    prev = ItemCount - 1;
-                }
-                else
-                {
-                    return;
-                }
+                MoveSelection(NavigationDirection.Previous, WrapSelection);
             }
-
-            SelectedIndex = prev;
         }
     }
 }
diff --git a/src/Avalonia.Controls/ContentControl.cs b/src/Avalonia.Controls/ContentControl.cs
index ac7d24be92..b8a45e102f 100644
--- a/src/Avalonia.Controls/ContentControl.cs
+++ b/src/Avalonia.Controls/ContentControl.cs
@@ -1,4 +1,5 @@
 using Avalonia.Collections;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
@@ -12,6 +13,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Displays <see cref="Content"/> according to a <see cref="FuncDataTemplate"/>.
     /// </summary>
+    [TemplatePart("PART_ContentPresenter", typeof(IContentPresenter))]
     public class ContentControl : TemplatedControl, IContentControl, IContentPresenterHost
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs
index 7a8438f1c3..7b35e35278 100644
--- a/src/Avalonia.Controls/ContextMenu.cs
+++ b/src/Avalonia.Controls/ContextMenu.cs
@@ -63,7 +63,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="PlacementRect"/> property.
         /// </summary>
         public static readonly StyledProperty<Rect?> PlacementRectProperty =
-            AvaloniaProperty.Register<Popup, Rect?>(nameof(PlacementRect));
+            Popup.PlacementRectProperty.AddOwner<ContextMenu>();
 
         /// <summary>
         /// Defines the <see cref="WindowManagerAddShadowHint"/> property.
@@ -241,13 +241,13 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == WindowManagerAddShadowHintProperty && _popup != null)
             {
-                _popup.WindowManagerAddShadowHint = change.NewValue.GetValueOrDefault<bool>();
+                _popup.WindowManagerAddShadowHint = change.GetNewValue<bool>();
             }
         }
 
@@ -351,6 +351,11 @@ namespace Avalonia.Controls
                 ? PlacementMode.Bottom
                 : PlacementMode;
 
+            //Position of the line below is really important. 
+            //All styles are being applied only when control has logical parent.
+            //Line below will add ContextMenu as child to the Popup and this will trigger styles and they would be applied.
+            //If you will move line below somewhere else it may cause that ContextMenu will behave differently from what you are expecting.
+            _popup.Child = this;
             _popup.PlacementTarget = placementTarget;
             _popup.HorizontalOffset = HorizontalOffset;
             _popup.VerticalOffset = VerticalOffset;
@@ -359,7 +364,6 @@ namespace Avalonia.Controls
             _popup.PlacementGravity = PlacementGravity;
             _popup.PlacementRect = PlacementRect;
             _popup.WindowManagerAddShadowHint = WindowManagerAddShadowHint;
-            _popup.Child = this;
             IsOpen = true;
             _popup.IsOpen = true;
 
@@ -446,6 +450,11 @@ namespace Avalonia.Controls
             if (sender is Control control
                 && control.ContextMenu is ContextMenu contextMenu)
             {
+                if (contextMenu._popup?.Parent == control)
+                {
+                    ((ISetLogicalParent)contextMenu._popup).SetParent(null);
+                }
+
                 contextMenu.Close();
             }
         }
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index cec662aad8..d6a5fa0727 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel;
-using System.Runtime.CompilerServices;
 using Avalonia.Automation.Peers;
+using Avalonia.Controls.Documents;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
@@ -67,7 +67,7 @@ namespace Avalonia.Controls
         /// </summary>
         public static readonly AttachedProperty<FlowDirection> FlowDirectionProperty =
             AvaloniaProperty.RegisterAttached<Control, Control, FlowDirection>(nameof(FlowDirection), inherits: true);
-        
+
         private DataTemplates? _dataTemplates;
         private IControl? _focusAdorner;
         private AutomationPeer? _automationPeer;
@@ -137,9 +137,39 @@ namespace Avalonia.Controls
 
         public new IControl? Parent => (IControl?)base.Parent;
 
+        /// <summary>
+        /// Gets the value of the attached <see cref="FlowDirectionProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The flow direction.</returns>
+        public static FlowDirection GetFlowDirection(Control control)
+        {
+            return control.GetValue(FlowDirectionProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="FlowDirectionProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetFlowDirection(Control control, FlowDirection value)
+        {
+            control.SetValue(FlowDirectionProperty, value);
+        }
+
         /// <inheritdoc/>
         bool IDataTemplateHost.IsDataTemplatesInitialized => _dataTemplates != null;
 
+        /// <summary>
+        /// Gets a value indicating whether control bypass FlowDirecton policies.
+        /// </summary>
+        /// <remarks>
+        /// Related to FlowDirection system and returns false as default, so if 
+        /// <see cref="FlowDirection"/> is RTL then control will get a mirror presentation. 
+        /// For controls that want to avoid this behavior, override this property and return true.
+        /// </remarks>
+        protected virtual bool BypassFlowDirectionPolicies => false;
+
         /// <inheritdoc/>
         void ISetterValue.Initialize(ISetter setter)
         {
@@ -199,6 +229,14 @@ namespace Avalonia.Controls
             base.OnDetachedFromVisualTreeCore(e);
         }
 
+        /// <inheritdoc/>
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            InvalidateMirrorTransform();
+        }
+
         /// <inheritdoc/>
         protected override void OnGotFocus(GotFocusEventArgs e)
         {
@@ -309,5 +347,55 @@ namespace Avalonia.Controls
                 }
             }
         }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == FlowDirectionProperty)
+            {
+                InvalidateMirrorTransform();
+                
+                foreach (var visual in VisualChildren)
+                {
+                    if (visual is Control child)
+                    {
+                        child.InvalidateMirrorTransform();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Computes the <see cref="IVisual.HasMirrorTransform"/> value according to the 
+        /// <see cref="FlowDirection"/> and <see cref="BypassFlowDirectionPolicies"/>
+        /// </summary>
+        public virtual void InvalidateMirrorTransform()
+        {
+            var flowDirection = this.FlowDirection;
+            var parentFlowDirection = FlowDirection.LeftToRight;
+
+            bool bypassFlowDirectionPolicies = BypassFlowDirectionPolicies;
+            bool parentBypassFlowDirectionPolicies = false;
+
+            var parent = this.FindAncestorOfType<Control>();
+            if (parent != null)
+            {
+                parentFlowDirection = parent.FlowDirection;
+                parentBypassFlowDirectionPolicies = parent.BypassFlowDirectionPolicies;
+            }
+            else if (Parent is Control logicalParent)
+            {
+                parentFlowDirection = logicalParent.FlowDirection;
+                parentBypassFlowDirectionPolicies = logicalParent.BypassFlowDirectionPolicies;
+            }
+
+            bool thisShouldBeMirrored = flowDirection == FlowDirection.RightToLeft && !bypassFlowDirectionPolicies;
+            bool parentShouldBeMirrored = parentFlowDirection == FlowDirection.RightToLeft && !parentBypassFlowDirectionPolicies;
+
+            bool shouldApplyMirrorTransform = thisShouldBeMirrored != parentShouldBeMirrored;
+
+            HasMirrorTransform = shouldApplyMirrorTransform;
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs b/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs
index 643c30178e..a91f143019 100644
--- a/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs
+++ b/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs
@@ -1,27 +1,32 @@
 using System;
 using System.Globalization;
-
 using Avalonia.Data.Converters;
 
 namespace Avalonia.Controls.Converters
 {
     /// <summary>
     /// Converts an existing CornerRadius struct to a new CornerRadius struct,
-    /// with filters applied to extract only the specified fields, leaving the others set to 0.
+    /// with filters applied to extract only the specified corners, leaving the others set to 0.
     /// </summary>
     public class CornerRadiusFilterConverter : IValueConverter
     {
         /// <summary>
-        /// Gets or sets the type of the filter applied to the <see cref="CornerRadiusFilterConverter"/>.
+        /// Gets or sets the corners to filter by.
+        /// Only the specified corners will be included in the converted <see cref="CornerRadius"/>.
         /// </summary>
-        public CornerRadiusFilterKinds Filter { get; set; }
+        public Corners Filter { get; set; }
 
         /// <summary>
-        /// Gets or sets the scale multiplier applied to the <see cref="CornerRadiusFilterConverter"/>.
+        /// Gets or sets the scale multiplier applied uniformly to each corner.
         /// </summary>
         public double Scale { get; set; } = 1;
 
-        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        /// <inheritdoc/>
+        public object? Convert(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
         {
             if (!(value is CornerRadius radius))
             {
@@ -29,13 +34,18 @@ namespace Avalonia.Controls.Converters
             }
 
             return new CornerRadius(
-                Filter.HasAllFlags(CornerRadiusFilterKinds.TopLeft) ? radius.TopLeft * Scale : 0,
-                Filter.HasAllFlags(CornerRadiusFilterKinds.TopRight) ? radius.TopRight * Scale : 0,
-                Filter.HasAllFlags(CornerRadiusFilterKinds.BottomRight) ? radius.BottomRight * Scale : 0,
-                Filter.HasAllFlags(CornerRadiusFilterKinds.BottomLeft) ? radius.BottomLeft * Scale : 0);
+                Filter.HasAllFlags(Corners.TopLeft) ? radius.TopLeft * Scale : 0,
+                Filter.HasAllFlags(Corners.TopRight) ? radius.TopRight * Scale : 0,
+                Filter.HasAllFlags(Corners.BottomRight) ? radius.BottomRight * Scale : 0,
+                Filter.HasAllFlags(Corners.BottomLeft) ? radius.BottomLeft * Scale : 0);
         }
 
-        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        /// <inheritdoc/>
+        public object? ConvertBack(
+            object? value,
+            Type targetType,
+            object? parameter,
+            CultureInfo culture)
         {
             throw new NotImplementedException();
         }
diff --git a/src/Avalonia.Controls/Converters/CornerRadiusFilterKind.cs b/src/Avalonia.Controls/Converters/CornerRadiusFilterKind.cs
deleted file mode 100644
index 6a9d0596be..0000000000
--- a/src/Avalonia.Controls/Converters/CornerRadiusFilterKind.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-
-namespace Avalonia.Controls.Converters
-{
-    /// <summary>
-    /// Defines constants that specify the filter type for a <see cref="CornerRadiusFilterConverter"/> instance.
-    /// </summary>
-    [Flags]
-    public enum CornerRadiusFilterKinds
-    {
-        /// <summary>
-        /// No filter applied.
-        /// </summary>
-        None,
-        /// <summary>
-        /// Filters TopLeft value.
-        /// </summary>
-        TopLeft = 1,
-        /// <summary>
-        /// Filters TopRight value.
-        /// </summary>
-        TopRight = 2,
-        /// <summary>
-        /// Filters BottomLeft value.
-        /// </summary>
-        BottomLeft = 4,
-        /// <summary>
-        /// Filters BottomRight value.
-        /// </summary>
-        BottomRight = 8
-    }
-}
diff --git a/src/Avalonia.Controls/Converters/CornerRadiusToDoubleConverter.cs b/src/Avalonia.Controls/Converters/CornerRadiusToDoubleConverter.cs
new file mode 100644
index 0000000000..6da15b61e6
--- /dev/null
+++ b/src/Avalonia.Controls/Converters/CornerRadiusToDoubleConverter.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Converts one corner of a <see cref="CornerRadius"/> to its double value.
+    /// </summary>
+    public class CornerRadiusToDoubleConverter : IValueConverter
+    {
+        /// <summary>
+        /// Gets or sets the specific corner of the <see cref="CornerRadius"/> to convert to double.
+        /// </summary>
+        public Corners Corner { get; set; }
+
+        /// <inheritdoc/>
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (!(value is CornerRadius cornerRadius))
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            switch (Corner)
+            {
+                case Corners.TopLeft:
+                    return cornerRadius.TopLeft;
+                case Corners.TopRight:
+                    return cornerRadius.TopRight;
+                case Corners.BottomRight:
+                    return cornerRadius.BottomRight;
+                case Corners.BottomLeft:
+                    return cornerRadius.BottomLeft;
+                default:
+                    return 0.0;
+            }
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Converters/Corners.cs b/src/Avalonia.Controls/Converters/Corners.cs
new file mode 100644
index 0000000000..22ac4cb5f9
--- /dev/null
+++ b/src/Avalonia.Controls/Converters/Corners.cs
@@ -0,0 +1,36 @@
+using System;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Defines constants that specify one or more corners of a <see cref="CornerRadius"/>.
+    /// </summary>
+    [Flags]
+    public enum Corners
+    {
+        /// <summary>
+        /// No corner.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// The TopLeft corner.
+        /// </summary>
+        TopLeft = 1,
+
+        /// <summary>
+        /// The TopRight corner.
+        /// </summary>
+        TopRight = 2,
+
+        /// <summary>
+        /// The BottomLeft corner.
+        /// </summary>
+        BottomLeft = 4,
+
+        /// <summary>
+        /// The BottomRight corner.
+        /// </summary>
+        BottomRight = 8
+    }
+}
diff --git a/src/Avalonia.Controls/Converters/EnumValueEqualsConverter.cs b/src/Avalonia.Controls/Converters/EnumValueEqualsConverter.cs
new file mode 100644
index 0000000000..1a33a82ca4
--- /dev/null
+++ b/src/Avalonia.Controls/Converters/EnumValueEqualsConverter.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Converter that checks if an enum value is equal to the given parameter enum value.
+    /// </summary>
+    public class EnumValueEqualsConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            // Note: Unlike string comparisons, null/empty is not supported
+            // Both 'value' and 'parameter' must exist and if both are missing they are not considered equal
+            if (value != null &&
+                parameter != null)
+            {
+                Type type = value.GetType();
+
+                if (type.IsEnum)
+                {
+                    var valueStr = value?.ToString();
+                    var paramStr = parameter?.ToString();
+
+                    if (string.Equals(valueStr, paramStr, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return true;
+                    }
+                }
+
+                /*
+                // TODO: When .net Standard 2.0 is no longer supported the code can be changed to below
+                // This is a little more type safe
+                if (type.IsEnum &&
+                    Enum.TryParse(type, value?.ToString(), true, out object? valueEnum) &&
+                    Enum.TryParse(type, parameter?.ToString(), true, out object? paramEnum))
+                {
+                    return valueEnum == paramEnum;
+                }
+                */
+            }
+
+            return false;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs b/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs
index b0c30ea11f..7931b63d8e 100644
--- a/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs
+++ b/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs
@@ -35,7 +35,6 @@ namespace Avalonia.Controls.Converters
                     Bottom ? Indent * thicknessDepth.Bottom : 0);
             }
             return new Thickness(0);
-            
         }
 
         public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
diff --git a/src/Avalonia.Controls/DateTimePickers/DatePicker.cs b/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
index 6c74eb6b91..f2b808fe0d 100644
--- a/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
@@ -14,6 +14,15 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control to allow the user to select a date
     /// </summary>
+    [TemplatePart("ButtonContentGrid", typeof(Grid))]
+    [TemplatePart("DayText",           typeof(TextBlock))]
+    [TemplatePart("FirstSpacer",       typeof(Rectangle))]
+    [TemplatePart("FlyoutButton",      typeof(Button))]
+    [TemplatePart("MonthText",         typeof(TextBlock))]
+    [TemplatePart("PickerPresenter",   typeof(DatePickerPresenter))]
+    [TemplatePart("Popup",             typeof(Popup))]
+    [TemplatePart("SecondSpacer",      typeof(Rectangle))]
+    [TemplatePart("YearText",          typeof(TextBlock))]
     [PseudoClasses(":hasnodate")]
     public class DatePicker : TemplatedControl
     {
diff --git a/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs b/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
index 0caba64758..0612efe14d 100644
--- a/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -12,6 +13,23 @@ namespace Avalonia.Controls
     /// Defines the presenter used for selecting a date for a 
     /// <see cref="DatePicker"/>
     /// </summary>
+    [TemplatePart("AcceptButton",    typeof(Button))]
+    [TemplatePart("DayDownButton",   typeof(RepeatButton))]
+    [TemplatePart("DayHost",         typeof(Panel))]
+    [TemplatePart("DaySelector",     typeof(DateTimePickerPanel))]
+    [TemplatePart("DayUpButton",     typeof(RepeatButton))]
+    [TemplatePart("DismissButton",   typeof(Button))]
+    [TemplatePart("FirstSpacer",     typeof(Rectangle))]
+    [TemplatePart("MonthDownButton", typeof(RepeatButton))]
+    [TemplatePart("MonthHost",       typeof(Panel))]
+    [TemplatePart("MonthSelector",   typeof(DateTimePickerPanel))]
+    [TemplatePart("MonthUpButton",   typeof(RepeatButton))]
+    [TemplatePart("PickerContainer", typeof(Grid))]
+    [TemplatePart("SecondSpacer",    typeof(Rectangle))]
+    [TemplatePart("YearDownButton",  typeof(RepeatButton))]
+    [TemplatePart("YearHost",        typeof(Panel))]
+    [TemplatePart("YearSelector",    typeof(DateTimePickerPanel))]
+    [TemplatePart("YearUpButton",    typeof(RepeatButton))]
     public class DatePickerPresenter : PickerPresenterBase
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
index 5948d81810..667f994a1d 100644
--- a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
@@ -1,7 +1,11 @@
 using System;
 using System.Globalization;
 using System.Linq;
+using Avalonia.Controls.Presenters;
 using Avalonia.Input;
+using Avalonia.Input.GestureRecognizers;
+using Avalonia.Interactivity;
+using Avalonia.Media;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
@@ -58,18 +62,18 @@ namespace Avalonia.Controls.Primitives
         private Vector _offset;
         private bool _hasInit;
         private bool _suppressUpdateOffset;
-        private ListBoxItem? _pressedItem;
+        private ScrollContentPresenter? _parentScroller;
 
         public DateTimePickerPanel()
         {
             FormatDate = DateTime.Now;
-            AddHandler(ListBoxItem.PointerPressedEvent, OnItemPointerDown, Avalonia.Interactivity.RoutingStrategies.Bubble);
-            AddHandler(ListBoxItem.PointerReleasedEvent, OnItemPointerUp, Avalonia.Interactivity.RoutingStrategies.Bubble);
+            AddHandler(TappedEvent, OnItemTapped, RoutingStrategies.Bubble);
         }
 
         static DateTimePickerPanel()
         {
             FocusableProperty.OverrideDefaultValue<DateTimePickerPanel>(true);
+            BackgroundProperty.OverrideDefaultValue<DateTimePickerPanel>(Brushes.Transparent);
             AffectsMeasure<DateTimePickerPanel>(ItemHeightProperty);
         }
 
@@ -254,6 +258,8 @@ namespace Avalonia.Controls.Primitives
                 _suppressUpdateOffset = true;
                 SelectedValue = (int)newSel * Increment + MinimumValue;
                 _suppressUpdateOffset = false;
+
+                System.Diagnostics.Debug.WriteLine($"Offset: {_offset} ItemHeight: {ItemHeight}");
             }
         }
 
@@ -269,7 +275,7 @@ namespace Avalonia.Controls.Primitives
 
         public Size Extent => _extent;
 
-        public Size Viewport => new Size(0, ItemHeight);
+        public Size Viewport => Bounds.Size;
 
         public event EventHandler? ScrollInvalidated;
 
@@ -340,6 +346,20 @@ namespace Avalonia.Controls.Primitives
             return finalSize;
         }
 
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            _parentScroller = this.GetVisualParent() as ScrollContentPresenter;
+            _parentScroller?.AddHandler(Gestures.ScrollGestureEndedEvent, OnScrollGestureEnded);
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+            _parentScroller?.RemoveHandler(Gestures.ScrollGestureEndedEvent, OnScrollGestureEnded);
+            _parentScroller = null;
+        }
+
         protected override void OnKeyDown(KeyEventArgs e)
         {
             switch (e.Key)
@@ -523,26 +543,13 @@ namespace Avalonia.Controls.Primitives
             return newValue;
         }
 
-        private void OnItemPointerDown(object? sender, PointerPressedEventArgs e)
+        private void OnItemTapped(object? sender, TappedEventArgs e)
         {
-            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed &&
-                e.Source is IVisual source)
-            {
-                _pressedItem = GetItemFromSource(source);
-                e.Handled = true;
-            }
-        }
-
-        private void OnItemPointerUp(object? sender, PointerReleasedEventArgs e)
-        {
-            if (e.GetCurrentPoint(this).Properties.PointerUpdateKind == PointerUpdateKind.LeftButtonReleased &&
-                _pressedItem != null &&
-                e.Source is IVisual source &&
-                GetItemFromSource(source) is ListBoxItem item &&
-                item.Tag is int tag)
+            if (e.Source is IVisual source && 
+                GetItemFromSource(source) is ListBoxItem listBoxItem &&
+                listBoxItem.Tag is int tag)
             {
                 SelectedValue = tag;
-                _pressedItem = null;
                 e.Handled = true;
             }
         }
@@ -566,5 +573,15 @@ namespace Avalonia.Controls.Primitives
         {
             ScrollInvalidated?.Invoke(this, e);
         }
+
+        private void OnScrollGestureEnded(object? sender, ScrollGestureEndedEventArgs e)
+        {
+            var snapY = Math.Round(Offset.Y / ItemHeight) * ItemHeight;
+
+            if (snapY != Offset.Y)
+            {
+                Offset = Offset.WithY(snapY);
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
index 3aab49d556..047667567d 100644
--- a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
+++ b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
@@ -12,6 +12,18 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control to allow the user to select a time.
     /// </summary>
+    [TemplatePart("FirstColumnDivider",      typeof(Rectangle))]
+    [TemplatePart("FirstPickerHost",         typeof(Border))]
+    [TemplatePart("FlyoutButton",            typeof(Button))]
+    [TemplatePart("FlyoutButtonContentGrid", typeof(Grid))]
+    [TemplatePart("HourTextBlock",           typeof(TextBlock))]
+    [TemplatePart("MinuteTextBlock",         typeof(TextBlock))]
+    [TemplatePart("PeriodTextBlock",         typeof(TextBlock))]
+    [TemplatePart("PickerPresenter",         typeof(TimePickerPresenter))]
+    [TemplatePart("Popup",                   typeof(Popup))]
+    [TemplatePart("SecondColumnDivider",     typeof(Rectangle))]
+    [TemplatePart("SecondPickerHost",        typeof(Border))]
+    [TemplatePart("ThirdPickerHost",         typeof(Border))]
     [PseudoClasses(":hasnotime")]
     public class TimePicker : TemplatedControl
     {
@@ -26,13 +38,13 @@ namespace Avalonia.Controls
         /// Defines the <see cref="Header"/> property
         /// </summary>
         public static readonly StyledProperty<object> HeaderProperty =
-            AvaloniaProperty.Register<DatePicker, object>(nameof(Header));
+            AvaloniaProperty.Register<TimePicker, object>(nameof(Header));
 
         /// <summary>
         /// Defines the <see cref="HeaderTemplate"/> property
         /// </summary>
         public static readonly StyledProperty<IDataTemplate> HeaderTemplateProperty =
-            AvaloniaProperty.Register<DatePicker, IDataTemplate>(nameof(HeaderTemplate));
+            AvaloniaProperty.Register<TimePicker, IDataTemplate>(nameof(HeaderTemplate));
 
         /// <summary>
         /// Defines the <see cref="ClockIdentifier"/> property
diff --git a/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs b/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs
index 30b6144388..7f2abb7e98 100644
--- a/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs
+++ b/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -10,6 +11,20 @@ namespace Avalonia.Controls
     /// Defines the presenter used for selecting a time. Intended for use with
     /// <see cref="TimePicker"/> but can be used independently
     /// </summary>
+    [TemplatePart("AcceptButton",     typeof(Button))]
+    [TemplatePart("DismissButton",    typeof(Button))]
+    [TemplatePart("HourDownButton",   typeof(RepeatButton))]
+    [TemplatePart("HourSelector",     typeof(DateTimePickerPanel))]
+    [TemplatePart("HourUpButton",     typeof(RepeatButton))]
+    [TemplatePart("MinuteDownButton", typeof(RepeatButton))]
+    [TemplatePart("MinuteSelector",   typeof(DateTimePickerPanel))]
+    [TemplatePart("MinuteUpButton",   typeof(RepeatButton))]
+    [TemplatePart("PeriodDownButton", typeof(RepeatButton))]
+    [TemplatePart("PeriodHost",       typeof(Panel))]
+    [TemplatePart("PeriodSelector",   typeof(DateTimePickerPanel))]
+    [TemplatePart("PeriodUpButton",   typeof(RepeatButton))]
+    [TemplatePart("PickerContainer",  typeof(Grid))]
+    [TemplatePart("SecondSpacer",     typeof(Rectangle))]
     public class TimePickerPresenter : PickerPresenterBase
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs b/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs
index 45cd1d727e..64978248e5 100644
--- a/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs
+++ b/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs
@@ -1,11 +1,13 @@
 using System;
 using Avalonia.Controls.Primitives;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Diagnostics
 {
     /// <summary>
     /// Diagnostics interface to retrieve an associated <see cref="IPopupHost"/>.
     /// </summary>
+    [NotClientImplementable]
     public interface IPopupHostProvider
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/DockPanel.cs b/src/Avalonia.Controls/DockPanel.cs
index 8e23555c2d..3e3ed509b5 100644
--- a/src/Avalonia.Controls/DockPanel.cs
+++ b/src/Avalonia.Controls/DockPanel.cs
@@ -34,7 +34,7 @@ namespace Avalonia.Controls
         /// </summary>
         public static readonly StyledProperty<bool> LastChildFillProperty =
             AvaloniaProperty.Register<DockPanel, bool>(
-                nameof(LastChildFillProperty),
+                nameof(LastChildFill),
                 defaultValue: true);
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Documents/IInlineHost.cs b/src/Avalonia.Controls/Documents/IInlineHost.cs
new file mode 100644
index 0000000000..da72c207be
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/IInlineHost.cs
@@ -0,0 +1,11 @@
+using Avalonia.LogicalTree;
+
+namespace Avalonia.Controls.Documents
+{
+    internal interface IInlineHost : ILogical
+    {
+        void AddVisualChild(IControl child);
+
+        void Invalidate();
+    }
+}
diff --git a/src/Avalonia.Controls/Documents/Inline.cs b/src/Avalonia.Controls/Documents/Inline.cs
index 5b63f95432..b400625903 100644
--- a/src/Avalonia.Controls/Documents/Inline.cs
+++ b/src/Avalonia.Controls/Documents/Inline.cs
@@ -2,9 +2,8 @@ using System.Collections.Generic;
 using System.Text;
 using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
-using Avalonia.Utilities;
 
-namespace Avalonia.Controls.Documents 
+namespace Avalonia.Controls.Documents
 {
     /// <summary>
     /// Inline element.
@@ -45,9 +44,9 @@ namespace Avalonia.Controls.Documents
             set { SetValue(BaselineAlignmentProperty, value); }
         }
 
-        internal abstract int BuildRun(StringBuilder stringBuilder, IList<ValueSpan<TextRunProperties>> textStyleOverrides, int firstCharacterIndex);
+        internal abstract void BuildTextRun(IList<TextRun> textRuns);
 
-        internal abstract int AppendText(StringBuilder stringBuilder);
+        internal abstract void AppendText(StringBuilder stringBuilder);
 
         protected TextRunProperties CreateTextRunProperties()
         {
@@ -55,7 +54,7 @@ namespace Avalonia.Controls.Documents
                 TextDecorations, Foreground, Background, BaselineAlignment);
         }
         
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -63,7 +62,7 @@ namespace Avalonia.Controls.Documents
             {
                 case nameof(TextDecorations):
                 case nameof(BaselineAlignment):
-                    Invalidate();
+                    InlineHost?.Invalidate();
                     break;
             }
         }
diff --git a/src/Avalonia.Controls/Documents/InlineCollection.cs b/src/Avalonia.Controls/Documents/InlineCollection.cs
index 45c715c13a..a76222385e 100644
--- a/src/Avalonia.Controls/Documents/InlineCollection.cs
+++ b/src/Avalonia.Controls/Documents/InlineCollection.cs
@@ -12,29 +12,37 @@ namespace Avalonia.Controls.Documents
     [WhitespaceSignificantCollection]
     public class InlineCollection : AvaloniaList<Inline>
     {
+        private readonly IInlineHost? _host;
         private string? _text = string.Empty;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="InlineCollection"/> class.
         /// </summary>
-        public InlineCollection(ILogical parent) : base(0)
+        public InlineCollection(ILogical parent) : this(parent, null) { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InlineCollection"/> class.
+        /// </summary>
+        internal InlineCollection(ILogical parent, IInlineHost? host = null) : base(0)
         {
+            _host = host;
+
             ResetBehavior = ResetBehavior.Remove;
             
             this.ForEachItem(
                 x =>
                 {
                     ((ISetLogicalParent)x).SetParent(parent);
-                    x.Invalidated += Invalidate;
-                    Invalidate();
+                    x.InlineHost = host;
+                    host?.Invalidate();
                 },
                 x =>
                 {
                     ((ISetLogicalParent)x).SetParent(null);
-                    x.Invalidated -= Invalidate;
-                    Invalidate();
+                    x.InlineHost = host;
+                    host?.Invalidate();
                 },
-                () => throw new NotSupportedException());
+                () => throw new NotSupportedException());         
         }
 
         public bool HasComplexContent => Count > 0;
@@ -96,12 +104,22 @@ namespace Avalonia.Controls.Documents
             }
         }
 
+        public void Add(IControl child)
+        {
+            var implicitRun = new InlineUIContainer(child);
+
+            Add(implicitRun);
+        }
+
         public override void Add(Inline item)
         {
             if (!HasComplexContent)
             {
-                base.Add(new Run(_text));
-                
+                if (!string.IsNullOrEmpty(_text))
+                {
+                    base.Add(new Run(_text));
+                }
+                             
                 _text = string.Empty;
             }
             
@@ -112,11 +130,19 @@ namespace Avalonia.Controls.Documents
         /// Raised when an inline in the collection changes.
         /// </summary>
         public event EventHandler? Invalidated;
-        
+
         /// <summary>
         /// Raises the <see cref="Invalidated"/> event.
         /// </summary>
-        protected void Invalidate() => Invalidated?.Invoke(this, EventArgs.Empty);
+        protected void Invalidate()
+        {
+            if(_host != null)
+            {
+                _host.Invalidate();
+            }
+
+            Invalidated?.Invoke(this, EventArgs.Empty);
+        }
 
         private void Invalidate(object? sender, EventArgs e) => Invalidate();
     }
diff --git a/src/Avalonia.Controls/Documents/InlineUIContainer.cs b/src/Avalonia.Controls/Documents/InlineUIContainer.cs
new file mode 100644
index 0000000000..5f08c23099
--- /dev/null
+++ b/src/Avalonia.Controls/Documents/InlineUIContainer.cs
@@ -0,0 +1,125 @@
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Metadata;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Documents
+{
+    /// <summary>
+    /// InlineUIContainer - a wrapper for embedded UIElements in text 
+    /// flow content inline collections
+    /// </summary>
+    public class InlineUIContainer : Inline
+    {
+        /// <summary>
+        /// Defines the <see cref="Child"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IControl> ChildProperty =
+            AvaloniaProperty.Register<InlineUIContainer, IControl>(nameof(Child));
+
+        static InlineUIContainer()
+        {
+            BaselineAlignmentProperty.OverrideDefaultValue<InlineUIContainer>(BaselineAlignment.Top);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of InlineUIContainer element.
+        /// </summary>
+        /// <remarks>
+        /// The purpose of this element is to be a wrapper for UIElements
+        /// when they are embedded into text flow - as items of
+        /// InlineCollections.
+        /// </remarks>
+        public InlineUIContainer()
+        {
+        }
+
+        /// <summary>
+        /// Initializes an InlineBox specifying its child UIElement
+        /// </summary>
+        /// <param name="child">
+        /// UIElement set as a child of this inline item
+        /// </param>
+        public InlineUIContainer(IControl child)
+        {
+            Child = child;
+        }
+
+        /// <summary>
+        /// The content spanned by this TextElement.
+        /// </summary>
+        [Content]
+        public IControl Child
+        {
+            get => GetValue(ChildProperty);
+            set => SetValue(ChildProperty, value);
+        }
+
+        internal override void BuildTextRun(IList<TextRun> textRuns)
+        {
+            if(InlineHost == null)
+            {
+                return;
+            }
+
+            ((ISetLogicalParent)Child).SetParent(InlineHost);
+
+            InlineHost.AddVisualChild(Child);
+
+            textRuns.Add(new InlineRun(Child, CreateTextRunProperties()));
+        }
+
+        internal override void AppendText(StringBuilder stringBuilder)
+        {
+        }
+
+        private class InlineRun : DrawableTextRun
+        {
+            public InlineRun(IControl control, TextRunProperties properties)
+            {
+                Control = control;
+                Properties = properties;
+            }
+
+            public IControl Control { get; }
+
+            public override TextRunProperties? Properties { get; }
+
+            public override Size Size
+            {
+                get
+                {
+                    if (!Control.IsMeasureValid)
+                    {
+                        Control.Measure(Size.Infinity);
+                    }
+
+                    return Control.DesiredSize;
+                }
+            }
+
+            public override double Baseline
+            {
+                get
+                {
+                    double baseline = Size.Height;
+                    double baselineOffsetValue = Control.GetValue<double>(TextBlock.BaselineOffsetProperty);
+
+                    if (!MathUtilities.IsZero(baselineOffsetValue))
+                    {
+                        baseline = baselineOffsetValue;
+                    }
+
+                    return -baseline;
+                }
+            }
+
+            public override void Draw(DrawingContext drawingContext, Point origin)
+            {             
+                Control.Arrange(new Rect(origin, Size));                
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Documents/LineBreak.cs b/src/Avalonia.Controls/Documents/LineBreak.cs
index 5e0cd1d387..aeb81f7313 100644
--- a/src/Avalonia.Controls/Documents/LineBreak.cs
+++ b/src/Avalonia.Controls/Documents/LineBreak.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Avalonia.LogicalTree;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Metadata;
-using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Documents 
 {
@@ -20,24 +20,14 @@ namespace Avalonia.Controls.Documents
         {
         }
 
-        internal override int BuildRun(StringBuilder stringBuilder,
-            IList<ValueSpan<TextRunProperties>> textStyleOverrides, int firstCharacterIndex)
+        internal override void BuildTextRun(IList<TextRun> textRuns)
         {
-            var length = AppendText(stringBuilder);
-
-            textStyleOverrides.Add(new ValueSpan<TextRunProperties>(firstCharacterIndex, length,
-                CreateTextRunProperties()));
-
-            return length;
+            textRuns.Add(new TextEndOfLine());
         }
 
-        internal override int AppendText(StringBuilder stringBuilder)
+        internal override void AppendText(StringBuilder stringBuilder)
         {
-            var text = Environment.NewLine;
-
-            stringBuilder.Append(text);
-
-            return text.Length;
+            stringBuilder.Append(Environment.NewLine);
         }
     }
 }
diff --git a/src/Avalonia.Controls/Documents/Run.cs b/src/Avalonia.Controls/Documents/Run.cs
index a7dd5fd94f..2bd66b8a64 100644
--- a/src/Avalonia.Controls/Documents/Run.cs
+++ b/src/Avalonia.Controls/Documents/Run.cs
@@ -4,7 +4,6 @@ using System.Text;
 using Avalonia.Data;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Metadata;
-using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Documents
 {
@@ -51,34 +50,32 @@ namespace Avalonia.Controls.Documents
             set { SetValue (TextProperty, value); }
         }
 
-        internal override int BuildRun(StringBuilder stringBuilder,
-            IList<ValueSpan<TextRunProperties>> textStyleOverrides, int firstCharacterIndex)
+        internal override void BuildTextRun(IList<TextRun> textRuns)
         {
-            var length = AppendText(stringBuilder);
+            var text = (Text ?? "").AsMemory();
 
-            textStyleOverrides.Add(new ValueSpan<TextRunProperties>(firstCharacterIndex, length,
-                CreateTextRunProperties()));
+            var textRunProperties = CreateTextRunProperties();           
 
-            return length;
+            var textCharacters = new TextCharacters(text, textRunProperties);
+
+            textRuns.Add(textCharacters);
         }
 
-        internal override int AppendText(StringBuilder stringBuilder)
+        internal override void AppendText(StringBuilder stringBuilder)
         {
             var text = Text ?? "";
 
             stringBuilder.Append(text);
-
-            return text.Length;
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             switch (change.Property.Name)
             {
                 case nameof(Text):
-                    Invalidate();
+                    InlineHost?.Invalidate();
                     break;
             }
         }
diff --git a/src/Avalonia.Controls/Documents/Span.cs b/src/Avalonia.Controls/Documents/Span.cs
index c086997b07..bd1b4fc5e1 100644
--- a/src/Avalonia.Controls/Documents/Span.cs
+++ b/src/Avalonia.Controls/Documents/Span.cs
@@ -1,8 +1,8 @@
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Metadata;
-using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Documents
 {
@@ -25,8 +25,7 @@ namespace Avalonia.Controls.Documents
         public Span()
         {
             Inlines = new InlineCollection(this);
-
-            Inlines.Invalidated += (s, e) => Invalidate();
+            Inlines.Invalidated += (s, e) => InlineHost?.Invalidate();
         }
 
         /// <summary>
@@ -35,61 +34,42 @@ namespace Avalonia.Controls.Documents
         [Content]
         public InlineCollection Inlines { get; }
 
-        internal override int BuildRun(StringBuilder stringBuilder, IList<ValueSpan<TextRunProperties>> textStyleOverrides, int firstCharacterIndex)
+        internal override void BuildTextRun(IList<TextRun> textRuns)
         {
-            var length = 0;
-
             if (Inlines.HasComplexContent)
             {
                 foreach (var inline in Inlines)
                 {
-                    var inlineLength = inline.BuildRun(stringBuilder, textStyleOverrides, firstCharacterIndex);
-
-                    firstCharacterIndex += inlineLength;
-
-                    length += inlineLength;
+                    inline.BuildTextRun(textRuns);
                 }
             }
             else
             {
-                if (Inlines.Text == null)
+                if (Inlines.Text is string text)
                 {
-                    return length;
-                }
-                
-                stringBuilder.Append(Inlines.Text);
+                    var textRunProperties = CreateTextRunProperties();
 
-                length = Inlines.Text.Length;
+                    var textCharacters = new TextCharacters(text.AsMemory(), textRunProperties);
 
-                textStyleOverrides.Add(new ValueSpan<TextRunProperties>(firstCharacterIndex, length,
-                    CreateTextRunProperties()));
+                    textRuns.Add(textCharacters);
+                }          
             }
-
-            return length;
         }
 
-        internal override int AppendText(StringBuilder stringBuilder)
+        internal override void AppendText(StringBuilder stringBuilder)
         {
             if (Inlines.HasComplexContent)
             {
-                var length = 0;
-
                 foreach (var inline in Inlines)
                 {
-                    length += inline.AppendText(stringBuilder);
+                    inline.AppendText(stringBuilder);
                 }
-
-                return length;
             }
 
-            if (Inlines.Text == null)
+            if (Inlines.Text is string text)
             {
-                return 0;
+                stringBuilder.Append(text);
             }
-         
-            stringBuilder.Append(Inlines.Text);
-
-            return Inlines.Text.Length;
         }
     }
 }
diff --git a/src/Avalonia.Controls/Documents/TextElement.cs b/src/Avalonia.Controls/Documents/TextElement.cs
index 4083524881..f228519e60 100644
--- a/src/Avalonia.Controls/Documents/TextElement.cs
+++ b/src/Avalonia.Controls/Documents/TextElement.cs
@@ -1,5 +1,4 @@
-using System;
-using Avalonia.Media;
+using Avalonia.Media;
 
 namespace Avalonia.Controls.Documents
 {
@@ -13,37 +12,60 @@ namespace Avalonia.Controls.Documents
         /// Defines the <see cref="Background"/> property.
         /// </summary>
         public static readonly StyledProperty<IBrush?> BackgroundProperty =
-            AvaloniaProperty.Register<TextElement, IBrush?>(nameof(Background), inherits: true);
+            Border.BackgroundProperty.AddOwner<TextElement>();
 
         /// <summary>
         /// Defines the <see cref="FontFamily"/> property.
         /// </summary>
         public static readonly AttachedProperty<FontFamily> FontFamilyProperty =
-            TextBlock.FontFamilyProperty.AddOwner<TextElement>();
+            AvaloniaProperty.RegisterAttached<TextElement, Control, FontFamily>(
+                nameof(FontFamily),
+                defaultValue: FontFamily.Default,
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="FontSize"/> property.
         /// </summary>
         public static readonly AttachedProperty<double> FontSizeProperty =
-            TextBlock.FontSizeProperty.AddOwner<TextElement>();
+            AvaloniaProperty.RegisterAttached<TextElement, Control, double>(
+                nameof(FontSize),
+                defaultValue: 12,
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="FontStyle"/> property.
         /// </summary>
         public static readonly AttachedProperty<FontStyle> FontStyleProperty =
-            TextBlock.FontStyleProperty.AddOwner<TextElement>();
+            AvaloniaProperty.RegisterAttached<TextElement, Control, FontStyle>(
+                nameof(FontStyle),
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="FontWeight"/> property.
         /// </summary>
         public static readonly AttachedProperty<FontWeight> FontWeightProperty =
-            TextBlock.FontWeightProperty.AddOwner<TextElement>();
+            AvaloniaProperty.RegisterAttached<TextElement, Control, FontWeight>(
+                nameof(FontWeight),
+                inherits: true,
+                defaultValue: FontWeight.Normal);
+
+        /// <summary>
+        /// Defines the <see cref="FontStretch"/> property.
+        /// </summary>
+        public static readonly AttachedProperty<FontStretch> FontStretchProperty =
+            AvaloniaProperty.RegisterAttached<TextElement, Control, FontStretch>(
+                nameof(FontStretch),
+                inherits: true,
+                defaultValue: FontStretch.Normal);
 
         /// <summary>
         /// Defines the <see cref="Foreground"/> property.
         /// </summary>
         public static readonly AttachedProperty<IBrush?> ForegroundProperty =
-            TextBlock.ForegroundProperty.AddOwner<TextElement>();
+            AvaloniaProperty.RegisterAttached<TextElement, Control, IBrush?>(
+                nameof(Foreground),
+                Brushes.Black,
+                inherits: true);
 
         /// <summary>
         /// Gets or sets a brush used to paint the control's background.
@@ -90,6 +112,15 @@ namespace Avalonia.Controls.Documents
             set { SetValue(FontWeightProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the font stretch.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get { return GetValue(FontStretchProperty); }
+            set { SetValue(FontStretchProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets a brush used to paint the text.
         /// </summary>
@@ -98,13 +129,130 @@ namespace Avalonia.Controls.Documents
             get { return GetValue(ForegroundProperty); }
             set { SetValue(ForegroundProperty, value); }
         }
-        
+
+        /// <summary>
+        /// Gets the value of the attached <see cref="FontFamilyProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The font family.</returns>
+        public static FontFamily GetFontFamily(Control control)
+        {
+            return control.GetValue(FontFamilyProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="FontFamilyProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetFontFamily(Control control, FontFamily value)
+        {
+            control.SetValue(FontFamilyProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the attached <see cref="FontSizeProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The font size.</returns>
+        public static double GetFontSize(Control control)
+        {
+            return control.GetValue(FontSizeProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="FontSizeProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetFontSize(Control control, double value)
+        {
+            control.SetValue(FontSizeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the attached <see cref="FontStyleProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The font style.</returns>
+        public static FontStyle GetFontStyle(Control control)
+        {
+            return control.GetValue(FontStyleProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="FontStyleProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetFontStyle(Control control, FontStyle value)
+        {
+            control.SetValue(FontStyleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the attached <see cref="FontWeightProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The font weight.</returns>
+        public static FontWeight GetFontWeight(Control control)
+        {
+            return control.GetValue(FontWeightProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="FontWeightProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetFontWeight(Control control, FontWeight value)
+        {
+            control.SetValue(FontWeightProperty, value);
+        }
+
         /// <summary>
-        /// Raised when the visual representation of the text element changes.
+        /// Gets the value of the attached <see cref="FontStretchProperty"/> on a control.
         /// </summary>
-        public event EventHandler? Invalidated;
+        /// <param name="control">The control.</param>
+        /// <returns>The font stretch.</returns>
+        public static FontStretch GetFontStretch(Control control)
+        {
+            return control.GetValue(FontStretchProperty);
+        }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        /// <summary>
+        /// Sets the value of the attached <see cref="FontStretchProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetFontStretch(Control control, FontStretch value)
+        {
+            control.SetValue(FontStretchProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the attached <see cref="ForegroundProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The foreground.</returns>
+        public static IBrush? GetForeground(Control control)
+        {
+            return control.GetValue(ForegroundProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the attached <see cref="ForegroundProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetForeground(Control control, IBrush? value)
+        {
+            control.SetValue(ForegroundProperty, value);
+        }
+
+        internal IInlineHost? InlineHost { get; set; }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -115,15 +263,11 @@ namespace Avalonia.Controls.Documents
                 case nameof(FontSize):
                 case nameof(FontStyle):
                 case nameof(FontWeight):
+                case nameof(FontStretch):
                 case nameof(Foreground):
-                    Invalidate();
+                    InlineHost?.Invalidate();
                     break;
             }
         }
-
-        /// <summary>
-        /// Raises the <see cref="Invalidate"/> event.
-        /// </summary>
-        protected void Invalidate() => Invalidated?.Invoke(this, EventArgs.Empty);
     }
 }
diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
deleted file mode 100644
index 4e17f5bff5..0000000000
--- a/src/Avalonia.Controls/DropDown.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using Avalonia.Logging;
-using Avalonia.Styling;
-
-namespace Avalonia.Controls
-{
-    [Obsolete("Use ComboBox")]
-    public class DropDown : ComboBox, IStyleable
-    {
-        public DropDown()
-        {
-            Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(this, "DropDown is deprecated: Use ComboBox");
-        }
-
-        Type IStyleable.StyleKey => typeof(ComboBox);
-    }
-
-    [Obsolete("Use ComboBoxItem")]
-    public class DropDownItem : ComboBoxItem, IStyleable
-    {
-        public DropDownItem()
-        {
-            Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(this, "DropDownItem is deprecated: Use ComboBoxItem");
-        }
-
-        Type IStyleable.StyleKey => typeof(ComboBoxItem);
-    }
-}
diff --git a/src/Avalonia.Controls/DropDownButton.cs b/src/Avalonia.Controls/DropDownButton.cs
new file mode 100644
index 0000000000..8dc40f42af
--- /dev/null
+++ b/src/Avalonia.Controls/DropDownButton.cs
@@ -0,0 +1,15 @@
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// A button with an added drop-down chevron to visually indicate it has a flyout with additional actions.
+    /// </summary>
+    public class DropDownButton : Button
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DropDownButton"/> class.
+        /// </summary>
+        public DropDownButton()
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
index 08d559a5c1..1c7bdb9b37 100644
--- a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
+++ b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
@@ -2,11 +2,13 @@
 using System.Collections.Generic;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 
 namespace Avalonia.Controls.Embedding.Offscreen
 {
+    [Unstable]
     public abstract class OffscreenTopLevelImplBase : ITopLevelImpl
     {
         private double _scaling = 1;
diff --git a/src/Avalonia.Controls/Expander.cs b/src/Avalonia.Controls/Expander.cs
index 020b162864..3ba99d8a67 100644
--- a/src/Avalonia.Controls/Expander.cs
+++ b/src/Avalonia.Controls/Expander.cs
@@ -106,13 +106,13 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == ExpandDirectionProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<ExpandDirection>());
+                UpdatePseudoClasses(change.GetNewValue<ExpandDirection>());
             }
         }
 
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index d024f86b32..4801fa69f0 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -175,7 +175,8 @@ namespace Avalonia.Controls.Primitives
 
             IsOpen = false;
             Popup.IsOpen = false;
-
+            ((ISetLogicalParent)Popup).SetParent(null);
+            
             // Ensure this isn't active
             _transientDisposable?.Dispose();
             _transientDisposable = null;
@@ -218,7 +219,7 @@ namespace Avalonia.Controls.Primitives
                 ((ISetLogicalParent)Popup).SetParent(null);
             }
 
-            if (Popup.PlacementTarget != placementTarget)
+            if (Popup.Parent == null || Popup.PlacementTarget != placementTarget)
             {
                 Popup.PlacementTarget = Target = placementTarget;
                 ((ISetLogicalParent)Popup).SetParent(placementTarget);
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
index bcd859100a..6a7da87387 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -8,15 +8,6 @@ namespace Avalonia.Controls
 {
     public class MenuFlyoutPresenter : MenuBase
     {
-        public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
-            Border.CornerRadiusProperty.AddOwner<FlyoutPresenter>();
-
-        public CornerRadius CornerRadius
-        {
-            get => GetValue(CornerRadiusProperty);
-            set => SetValue(CornerRadiusProperty, value);
-        }
-
         public MenuFlyoutPresenter()
             :base(new DefaultMenuInteractionHandler(true))
         {
diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
index 79a9e16879..a76dcbe9c8 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
@@ -82,7 +82,7 @@ namespace Avalonia.Controls.Generators
             {
                 var toMove = _containers.Where(x => x.Key >= index)
                     .OrderByDescending(x => x.Key)
-                    .ToList();
+                    .ToArray();
 
                 foreach (var i in toMove)
                 {
@@ -111,7 +111,7 @@ namespace Avalonia.Controls.Generators
                 }
 
                 var toMove = _containers.Where(x => x.Key >= startingIndex)
-                                        .OrderBy(x => x.Key).ToList();
+                                        .OrderBy(x => x.Key).ToArray();
 
                 foreach (var i in toMove)
                 {
@@ -122,9 +122,9 @@ namespace Avalonia.Controls.Generators
 
                 Dematerialized?.Invoke(this, new ItemContainerEventArgs(startingIndex, result));
 
-                if (toMove.Count > 0)
+                if (toMove.Length > 0)
                 {
-                    var containers = toMove.Select(x => x.Value).ToList();
+                    var containers = toMove.Select(x => x.Value).ToArray();
                     Recycled?.Invoke(this, new ItemContainerEventArgs(containers[0].Index, containers));
                 }
             }
@@ -138,10 +138,10 @@ namespace Avalonia.Controls.Generators
         /// <inheritdoc/>
         public virtual IEnumerable<ItemContainerInfo> Clear()
         {
-            var result = Containers.ToList();
+            var result = Containers.ToArray();
             _containers.Clear();
 
-            if (result.Count > 0)
+            if (result.Length > 0)
             {
                 Dematerialized?.Invoke(this, new ItemContainerEventArgs(0, result));
             }
diff --git a/src/Avalonia.Controls/Generators/TreeContainerIndex.cs b/src/Avalonia.Controls/Generators/TreeContainerIndex.cs
index da13416700..eb60fca367 100644
--- a/src/Avalonia.Controls/Generators/TreeContainerIndex.cs
+++ b/src/Avalonia.Controls/Generators/TreeContainerIndex.cs
@@ -15,6 +15,7 @@ namespace Avalonia.Controls.Generators
     /// </remarks>
     public class TreeContainerIndex
     {
+        private readonly Dictionary<object, HashSet<IControl>> _itemToContainerSet = new Dictionary<object, HashSet<IControl>>();
         private readonly Dictionary<object, IControl> _itemToContainer = new Dictionary<object, IControl>();
         private readonly Dictionary<IControl, object> _containerToItem = new Dictionary<IControl, object>();
 
@@ -45,14 +46,45 @@ namespace Avalonia.Controls.Generators
         /// <param name="container">The item container.</param>
         public void Add(object item, IControl container)
         {
-            _itemToContainer.Add(item, container);
+            _itemToContainer[item] = container;
+            if (_itemToContainerSet.TryGetValue(item, out var set))
+            {
+                set.Add(container);
+            }
+            else
+            {
+                _itemToContainerSet.Add(item, new HashSet<IControl> { container });
+            }
+
             _containerToItem.Add(container, item);
 
             Materialized?.Invoke(
-                this, 
+                this,
                 new ItemContainerEventArgs(new ItemContainerInfo(container, item, 0)));
         }
 
+        /// <summary>
+        /// Removes a container from private collections.
+        /// </summary>
+        /// <param name="container">The item container.</param>
+        /// <param name="item">The DataContext object</param>
+        private void RemoveContainer(IControl container, object item)
+        {
+            if (_itemToContainerSet.TryGetValue(item, out var set))
+            {
+                set.Remove(container);
+                if (set.Count == 0)
+                {
+                    _itemToContainerSet.Remove(item);
+                    _itemToContainer.Remove(item);
+                }
+                else
+                {
+                    _itemToContainer[item] = set.First();
+                }
+            }
+        }
+        
         /// <summary>
         /// Removes a container from the index.
         /// </summary>
@@ -61,10 +93,10 @@ namespace Avalonia.Controls.Generators
         {
             var item = _containerToItem[container];
             _containerToItem.Remove(container);
-            _itemToContainer.Remove(item);
+            RemoveContainer(container, item);
 
             Dematerialized?.Invoke(
-                this, 
+                this,
                 new ItemContainerEventArgs(new ItemContainerInfo(container, item, 0)));
         }
 
@@ -79,7 +111,7 @@ namespace Avalonia.Controls.Generators
             {
                 var item = _containerToItem[container.ContainerControl];
                 _containerToItem.Remove(container.ContainerControl);
-                _itemToContainer.Remove(item);
+                RemoveContainer(container.ContainerControl, item);
             }
 
             Dematerialized?.Invoke(
@@ -97,6 +129,14 @@ namespace Avalonia.Controls.Generators
             if (item != null)
             {
                 _itemToContainer.TryGetValue(item, out var result);
+                if (result == null)
+                {
+                    _itemToContainerSet.TryGetValue(item, out var set);
+                    if (set?.Count > 0)
+                    {
+                        return set.FirstOrDefault();
+                    }
+                }
                 return result;
             }
 
@@ -113,6 +153,10 @@ namespace Avalonia.Controls.Generators
             if (container != null)
             {
                 _containerToItem.TryGetValue(container, out var result);
+                if (result != null)
+                {
+                    _itemToContainer[result] = container;
+                }
                 return result;
             }
 
diff --git a/src/Avalonia.Controls/GridSplitter.cs b/src/Avalonia.Controls/GridSplitter.cs
index 216e43e1f0..784d33ed58 100644
--- a/src/Avalonia.Controls/GridSplitter.cs
+++ b/src/Avalonia.Controls/GridSplitter.cs
@@ -221,7 +221,8 @@ namespace Avalonia.Controls
                     ShowsPreview = showsPreview,
                     ResizeDirection = resizeDirection,
                     SplitterLength = Math.Min(Bounds.Width, Bounds.Height),
-                    ResizeBehavior = GetEffectiveResizeBehavior(resizeDirection)
+                    ResizeBehavior = GetEffectiveResizeBehavior(resizeDirection),
+                    Scaling = (VisualRoot as ILayoutRoot)?.LayoutScaling ?? 1,
                 };
 
                 // Store the rows and columns to resize on drag events.
@@ -630,13 +631,17 @@ namespace Avalonia.Controls
             {
                 double actualLength1 = GetActualLength(definition1);
                 double actualLength2 = GetActualLength(definition2);
+                double pixelLength = 1 / _resizeData.Scaling;
+                double epsilon = pixelLength + LayoutHelper.LayoutEpsilon;
 
                 // When splitting, Check to see if the total pixels spanned by the definitions 
-                // is the same as before starting resize. If not cancel the drag.
+                // is the same as before starting resize. If not cancel the drag. We need to account for
+                // layout rounding here, so ignore differences of less than a device pixel to avoid problems
+                // that WPF has, such as https://stackoverflow.com/questions/28464843.
                 if (_resizeData.SplitBehavior == SplitBehavior.Split &&
                     !MathUtilities.AreClose(
                         actualLength1 + actualLength2,
-                        _resizeData.OriginalDefinition1ActualLength + _resizeData.OriginalDefinition2ActualLength, LayoutHelper.LayoutEpsilon))
+                        _resizeData.OriginalDefinition1ActualLength + _resizeData.OriginalDefinition2ActualLength, epsilon))
                 {
                     CancelResize();
 
@@ -798,6 +803,9 @@ namespace Avalonia.Controls
             // The minimum of Width/Height of Splitter.  Used to ensure splitter 
             // isn't hidden by resizing a row/column smaller than the splitter.
             public double SplitterLength;
+
+            // The current layout scaling factor.
+            public double Scaling;
         }
     }
 
diff --git a/src/Avalonia.Controls/HotkeyManager.cs b/src/Avalonia.Controls/HotkeyManager.cs
index d83b996aa0..bde1da509b 100644
--- a/src/Avalonia.Controls/HotkeyManager.cs
+++ b/src/Avalonia.Controls/HotkeyManager.cs
@@ -12,21 +12,61 @@ namespace Avalonia.Controls
 
         class HotkeyCommandWrapper : ICommand
         {
-            public HotkeyCommandWrapper(ICommandSource? control)
+            readonly WeakReference reference;
+
+            public HotkeyCommandWrapper(IControl control)
             {
-                CommandSource = control;
+                reference = new WeakReference(control);
             }
 
-            public readonly ICommandSource? CommandSource;
+            public ICommand? GetCommand()
+            {
+                if (reference.Target is { } target)
+                {
+                    if (target is ICommandSource commandSource && commandSource.Command is { } command)
+                    {
+                        return command;
+                    }
+                    else if (target is IClickableControl { })
+                    {
+                        return this;
+                    }
+                }
+                return null;
+            }
 
-            private ICommand? GetCommand() => CommandSource?.Command;
+            public bool CanExecute(object? parameter)
+            {
+                if (reference.Target is { } target)
+                {
+                    if (target is ICommandSource commandSource && commandSource.Command is { } command)
+                    {
+                        return commandSource.IsEffectivelyEnabled
+                            && command.CanExecute(commandSource.CommandParameter) == true;
+                    }
+                    else if (target is IClickableControl clickable)
+                    {
+                        return clickable.IsEffectivelyEnabled;
+                    }
+                }
+                return false;
+            }
 
-            public bool CanExecute(object? parameter) =>
-                CommandSource?.Command?.CanExecute(CommandSource.CommandParameter) == true
-                && CommandSource.IsEffectivelyEnabled;
+            public void Execute(object? parameter)
+            {
+                if (reference.Target is { } target)
+                {
+                    if (target is ICommandSource commandSource && commandSource.Command is { } command)
+                    {
+                        command.Execute(commandSource.CommandParameter);
+                    }
+                    else if (target is IClickableControl { IsEffectivelyEnabled: true } clickable)
+                    {
+                        clickable.RaiseClick();
+                    }
+                }
+            }
 
-            public void Execute(object? parameter) =>
-                GetCommand()?.Execute(CommandSource?.CommandParameter);
 
 #pragma warning disable 67 // Event not used
             public event EventHandler? CanExecuteChanged;
@@ -47,7 +87,7 @@ namespace Avalonia.Controls
             public Manager(IControl control)
             {
                 _control = control;
-                _wrapper = new HotkeyCommandWrapper(_control as ICommandSource);
+                _wrapper = new HotkeyCommandWrapper(_control);
             }
 
             public void Init()
@@ -104,13 +144,14 @@ namespace Avalonia.Controls
         {
             HotKeyProperty.Changed.Subscribe(args =>
             {
-                if (args.NewValue.Value is null) return;
+                if (args.NewValue.Value is null)
+                    return;
 
                 var control = args.Sender as IControl;
-                if (control is not ICommandSource)
+                if (control is not IClickableControl)
                 {
                     Logging.Logger.TryGet(Logging.LogEventLevel.Warning, Logging.LogArea.Control)?.Log(control,
-                        $"The element {args.Sender.GetType().Name} does not implement ICommandSource and does not support binding a HotKey ({args.NewValue}).");
+                        $"The element {args.Sender.GetType().Name} does not implement IClickableControl and does not support binding a HotKey ({args.NewValue}).");
                     return;
                 }
 
diff --git a/src/Avalonia.Controls/IContentControl.cs b/src/Avalonia.Controls/IContentControl.cs
index d28b0afb25..b4d8d0f574 100644
--- a/src/Avalonia.Controls/IContentControl.cs
+++ b/src/Avalonia.Controls/IContentControl.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls.Templates;
 using Avalonia.Layout;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls
 {
@@ -7,6 +8,7 @@ namespace Avalonia.Controls
     /// Defines a control that displays <see cref="Content"/> according to a
     /// <see cref="Avalonia.Controls.Templates.FuncDataTemplate"/>.
     /// </summary>
+    [NotClientImplementable]
     public interface IContentControl : IControl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/IControl.cs b/src/Avalonia.Controls/IControl.cs
index b501bc15a7..3395fc1059 100644
--- a/src/Avalonia.Controls/IControl.cs
+++ b/src/Avalonia.Controls/IControl.cs
@@ -1,6 +1,7 @@
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Layout;
+using Avalonia.Metadata;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
@@ -8,6 +9,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Interface for Avalonia controls.
     /// </summary>
+    [NotClientImplementable]
     public interface IControl : IVisual,
         IDataTemplateHost,
         ILayoutable,
diff --git a/src/Avalonia.Controls/IGlobalDataTemplates.cs b/src/Avalonia.Controls/IGlobalDataTemplates.cs
index 92dcd2c189..f4499ddb5e 100644
--- a/src/Avalonia.Controls/IGlobalDataTemplates.cs
+++ b/src/Avalonia.Controls/IGlobalDataTemplates.cs
@@ -1,10 +1,12 @@
 using Avalonia.Controls.Templates;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Defines the application-global data templates.
     /// </summary>
+    [NotClientImplementable]
     public interface IGlobalDataTemplates : IDataTemplateHost
     {
     }
diff --git a/src/Avalonia.Controls/IMenu.cs b/src/Avalonia.Controls/IMenu.cs
index 0722a22f08..d90c5ea7a8 100644
--- a/src/Avalonia.Controls/IMenu.cs
+++ b/src/Avalonia.Controls/IMenu.cs
@@ -1,10 +1,12 @@
 using Avalonia.Controls.Platform;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Represents a <see cref="Menu"/> or <see cref="ContextMenu"/>.
     /// </summary>
+    [NotClientImplementable]
     public interface IMenu : IMenuElement
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/IMenuElement.cs b/src/Avalonia.Controls/IMenuElement.cs
index a3200d2b1b..c13c20b639 100644
--- a/src/Avalonia.Controls/IMenuElement.cs
+++ b/src/Avalonia.Controls/IMenuElement.cs
@@ -1,11 +1,13 @@
 using System.Collections.Generic;
 using Avalonia.Input;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Represents an <see cref="IMenu"/> or <see cref="IMenuItem"/>.
     /// </summary>
+    [NotClientImplementable]
     public interface IMenuElement : IControl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/IMenuItem.cs b/src/Avalonia.Controls/IMenuItem.cs
index 35e36eb0f4..9d7ef3c18d 100644
--- a/src/Avalonia.Controls/IMenuItem.cs
+++ b/src/Avalonia.Controls/IMenuItem.cs
@@ -1,8 +1,11 @@
-namespace Avalonia.Controls
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls
 {
     /// <summary>
     /// Represents a <see cref="MenuItem"/>.
     /// </summary>
+    [NotClientImplementable]
     public interface IMenuItem : IMenuElement
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/INativeMenuExporterEventsImplBridge.cs b/src/Avalonia.Controls/INativeMenuExporterEventsImplBridge.cs
index f492e6ca0f..29963e4821 100644
--- a/src/Avalonia.Controls/INativeMenuExporterEventsImplBridge.cs
+++ b/src/Avalonia.Controls/INativeMenuExporterEventsImplBridge.cs
@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Controls
 {
+    [Unstable]
     public interface INativeMenuExporterEventsImplBridge
     {
         void RaiseNeedsUpdate ();
diff --git a/src/Avalonia.Controls/INativeMenuItemExporterEventsImplBridge.cs b/src/Avalonia.Controls/INativeMenuItemExporterEventsImplBridge.cs
index 6cb68d8ddd..a6c7489971 100644
--- a/src/Avalonia.Controls/INativeMenuItemExporterEventsImplBridge.cs
+++ b/src/Avalonia.Controls/INativeMenuItemExporterEventsImplBridge.cs
@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Controls
 {
+    [Unstable]
     public interface INativeMenuItemExporterEventsImplBridge
     {
         void RaiseClicked ();
diff --git a/src/Avalonia.Controls/IPanel.cs b/src/Avalonia.Controls/IPanel.cs
index 7b9e2c2074..8f2564ec74 100644
--- a/src/Avalonia.Controls/IPanel.cs
+++ b/src/Avalonia.Controls/IPanel.cs
@@ -1,8 +1,11 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Interface for controls that can contain multiple children.
     /// </summary>
+    [NotClientImplementable]
     public interface IPanel : IControl
     {
         /// <summary>
@@ -10,4 +13,4 @@ namespace Avalonia.Controls
         /// </summary>
         Controls Children { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls/IScrollable.cs b/src/Avalonia.Controls/IScrollable.cs
index 2a98b3910a..680088290c 100644
--- a/src/Avalonia.Controls/IScrollable.cs
+++ b/src/Avalonia.Controls/IScrollable.cs
@@ -1,4 +1,3 @@
-
 namespace Avalonia.Controls.Primitives
 {
     /// <summary>
diff --git a/src/Avalonia.Controls/Image.cs b/src/Avalonia.Controls/Image.cs
index 3d67880638..7408bff902 100644
--- a/src/Avalonia.Controls/Image.cs
+++ b/src/Avalonia.Controls/Image.cs
@@ -66,6 +66,8 @@ namespace Avalonia.Controls
             set { SetValue(StretchDirectionProperty, value); }
         }
 
+        protected override bool BypassFlowDirectionPolicies => true;
+        
         /// <summary>
         /// Renders the control.
         /// </summary>
diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 0cd72dc91c..56b0014c05 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -166,7 +166,7 @@ namespace Avalonia.Controls
             if (Presenter is IChildIndexProvider innerProvider)
             {
                 innerProvider.ChildIndexChanged += PresenterChildIndexChanged;
-                _childIndexChanged?.Invoke(this, new ChildIndexChangedEventArgs());
+                _childIndexChanged?.Invoke(this, ChildIndexChangedEventArgs.Empty);
             }
         }
 
@@ -341,13 +341,13 @@ namespace Avalonia.Controls
             return new ItemsControlAutomationPeer(this);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == ItemCountProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<int>());
+                UpdatePseudoClasses(change.GetNewValue<int>());
             }
         }
 
@@ -508,7 +508,6 @@ namespace Avalonia.Controls
             do
             {
                 result = container.GetControl(direction, c, wrap);
-                from = from ?? result;
 
                 if (result != null &&
                     result.Focusable &&
@@ -519,7 +518,7 @@ namespace Avalonia.Controls
                 }
 
                 c = result;
-            } while (c != null && c != from);
+            } while (c != null && c != from && direction != NavigationDirection.First && direction != NavigationDirection.Last);
 
             return null;
         }
diff --git a/src/Avalonia.Controls/ListBox.cs b/src/Avalonia.Controls/ListBox.cs
index 9b7ae0d324..79285bb86b 100644
--- a/src/Avalonia.Controls/ListBox.cs
+++ b/src/Avalonia.Controls/ListBox.cs
@@ -1,5 +1,6 @@
 using System.Collections;
 using Avalonia.Controls.Generators;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Selection;
@@ -12,6 +13,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// An <see cref="ItemsControl"/> in which individual items can be selected.
     /// </summary>
+    [TemplatePart("PART_ScrollViewer", typeof(IScrollable))]
     public class ListBox : SelectingItemsControl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/MaskedTextBox.cs b/src/Avalonia.Controls/MaskedTextBox.cs
index ad64c61ebe..080326606e 100644
--- a/src/Avalonia.Controls/MaskedTextBox.cs
+++ b/src/Avalonia.Controls/MaskedTextBox.cs
@@ -32,7 +32,7 @@ namespace Avalonia.Controls
              AvaloniaProperty.Register<MaskedTextBox, string?>(nameof(Mask), string.Empty);
 
         public static new readonly StyledProperty<char> PasswordCharProperty =
-             AvaloniaProperty.Register<TextBox, char>(nameof(PasswordChar), '\0');
+             AvaloniaProperty.Register<MaskedTextBox, char>(nameof(PasswordChar), '\0');
 
         public static readonly StyledProperty<char> PromptCharProperty =
              AvaloniaProperty.Register<MaskedTextBox, char>(nameof(PromptChar), '_');
@@ -280,7 +280,7 @@ namespace Avalonia.Controls
             base.OnLostFocus(e);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             void UpdateMaskProvider()
             {
diff --git a/src/Avalonia.Controls/MenuBase.cs b/src/Avalonia.Controls/MenuBase.cs
index bdcff5cd09..122d45d033 100644
--- a/src/Avalonia.Controls/MenuBase.cs
+++ b/src/Avalonia.Controls/MenuBase.cs
@@ -18,8 +18,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="IsOpen"/> property.
         /// </summary>
-        public static readonly DirectProperty<Menu, bool> IsOpenProperty =
-            AvaloniaProperty.RegisterDirect<Menu, bool>(
+        public static readonly DirectProperty<MenuBase, bool> IsOpenProperty =
+            AvaloniaProperty.RegisterDirect<MenuBase, bool>(
                 nameof(IsOpen),
                 o => o.IsOpen);
 
diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index 34215e9713..58229a1772 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -20,8 +20,9 @@ namespace Avalonia.Controls
     /// <summary>
     /// A menu item control.
     /// </summary>
+    [TemplatePart("PART_Popup", typeof(Popup))]
     [PseudoClasses(":separator", ":icon", ":open", ":pressed", ":selected")]
-    public class MenuItem : HeaderedSelectingItemsControl, IMenuItem, ISelectable, ICommandSource
+    public class MenuItem : HeaderedSelectingItemsControl, IMenuItem, ISelectable, ICommandSource, IClickableControl
     {
         /// <summary>
         /// Defines the <see cref="Command"/> property.
@@ -84,13 +85,13 @@ namespace Avalonia.Controls
         /// Defines the <see cref="PointerEnterItem"/> event.
         /// </summary>
         public static readonly RoutedEvent<PointerEventArgs> PointerEnterItemEvent =
-            RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerEnterItem), RoutingStrategies.Bubble);
+            RoutedEvent.Register<MenuItem, PointerEventArgs>(nameof(PointerEnterItem), RoutingStrategies.Bubble);
 
         /// <summary>
         /// Defines the <see cref="PointerLeaveItem"/> event.
         /// </summary>
         public static readonly RoutedEvent<PointerEventArgs> PointerLeaveItemEvent =
-            RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerLeaveItem), RoutingStrategies.Bubble);
+            RoutedEvent.Register<MenuItem, PointerEventArgs>(nameof(PointerLeaveItem), RoutingStrategies.Bubble);
 
         /// <summary>
         /// Defines the <see cref="SubmenuOpened"/> event.
@@ -500,12 +501,15 @@ namespace Avalonia.Controls
             return new MenuItemAutomationPeer(this);
         }
 
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
-            base.UpdateDataValidation(property, value);
+            base.UpdateDataValidation(property, state, error);
             if (property == CommandProperty)
             {
-                _commandBindingError = value.Type == BindingValueType.BindingError;
+                _commandBindingError = state == BindingValueType.BindingError;
                 if (_commandBindingError && _commandCanExecute)
                 {
                     _commandCanExecute = false;
@@ -643,7 +647,9 @@ namespace Avalonia.Controls
         /// <param name="e">The property change event.</param>
         private void IsSelectedChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            if ((bool)e.NewValue!)
+            var parentMenu = Parent as Menu;
+
+            if ((bool)e.NewValue! && (parentMenu is null || parentMenu.IsOpen))
             {
                 Focus();
             }
@@ -704,6 +710,14 @@ namespace Avalonia.Controls
 
         void ICommandSource.CanExecuteChanged(object sender, EventArgs e) => this.CanExecuteChanged(sender, e);
 
+        void IClickableControl.RaiseClick()
+        {
+            if (IsEffectivelyEnabled)
+            {
+                RaiseEvent(new RoutedEventArgs(ClickEvent));
+            }
+        }
+
         /// <summary>
         /// A dependency resolver which returns a <see cref="MenuItemAccessKeyHandler"/>.
         /// </summary>
diff --git a/src/Avalonia.Controls/NativeMenuItemBase.cs b/src/Avalonia.Controls/NativeMenuItemBase.cs
index a5e3308e3b..4946d16f01 100644
--- a/src/Avalonia.Controls/NativeMenuItemBase.cs
+++ b/src/Avalonia.Controls/NativeMenuItemBase.cs
@@ -11,8 +11,8 @@ namespace Avalonia.Controls
 
         }
 
-        public static readonly DirectProperty<NativeMenuItem, NativeMenu?> ParentProperty =
-            AvaloniaProperty.RegisterDirect<NativeMenuItem, NativeMenu?>("Parent", o => o.Parent, (o, v) => o.Parent = v);
+        public static readonly DirectProperty<NativeMenuItemBase, NativeMenu?> ParentProperty =
+            AvaloniaProperty.RegisterDirect<NativeMenuItemBase, NativeMenu?>("Parent", o => o.Parent, (o, v) => o.Parent = v);
 
         public NativeMenu? Parent
         {
diff --git a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
index 977544674d..b2e6e9e80b 100644
--- a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
@@ -1,4 +1,6 @@
-namespace Avalonia.Controls.Notifications
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Notifications
 {
     /// <summary>
     /// Represents a notification manager that can show arbitrary content.
@@ -9,6 +11,7 @@
     /// can display arbitrary content, as opposed to notification managers which display notifications
     /// using the host operating system's notification mechanism.
     /// </remarks>
+    [NotClientImplementable]
     public interface IManagedNotificationManager : INotificationManager
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Notifications/INotification.cs b/src/Avalonia.Controls/Notifications/INotification.cs
index fa08233097..9ccce5b2c4 100644
--- a/src/Avalonia.Controls/Notifications/INotification.cs
+++ b/src/Avalonia.Controls/Notifications/INotification.cs
@@ -1,10 +1,12 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Notifications
 {
     /// <summary>
     /// Represents a notification that can be shown in a window or by the host operating system.
     /// </summary>
+    [NotClientImplementable]
     public interface INotification
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Notifications/INotificationManager.cs b/src/Avalonia.Controls/Notifications/INotificationManager.cs
index 72fb8e6c08..5fa479f2c3 100644
--- a/src/Avalonia.Controls/Notifications/INotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/INotificationManager.cs
@@ -1,9 +1,12 @@
-namespace Avalonia.Controls.Notifications
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Notifications
 {
     /// <summary>
     /// Represents a notification manager that can be used to show notifications in a window or using
 	/// the host operating system.
     /// </summary>
+    [NotClientImplementable]
     public interface INotificationManager
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 9499995da3..2449f4c15c 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -14,6 +14,7 @@ namespace Avalonia.Controls.Notifications
     /// <summary>
     /// An <see cref="INotificationManager"/> that displays notifications in a <see cref="Window"/>.
     /// </summary>
+    [TemplatePart("PART_Items", typeof(Panel))]
     [PseudoClasses(":topleft", ":topright", ":bottomleft", ":bottomright")]
     public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager, ICustomSimpleHitTest
     {
@@ -138,13 +139,13 @@ namespace Avalonia.Controls.Notifications
             notificationControl.Close();
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == PositionProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<NotificationPosition>());
+                UpdatePseudoClasses(change.GetNewValue<NotificationPosition>());
             }
         }
 
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
index f67377b310..705e68e3ea 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Data;
 using Avalonia.Input;
@@ -15,6 +16,8 @@ namespace Avalonia.Controls
     /// <summary>
     /// Control that represents a TextBox with button spinners that allow incrementing and decrementing numeric values.
     /// </summary>
+    [TemplatePart("PART_Spinner", typeof(Spinner))]
+    [TemplatePart("PART_TextBox", typeof(TextBox))]
     public class NumericUpDown : TemplatedControl
     {
         /// <summary>
@@ -104,8 +107,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="Value"/> property.
         /// </summary>
-        public static readonly DirectProperty<NumericUpDown, decimal> ValueProperty =
-            AvaloniaProperty.RegisterDirect<NumericUpDown, decimal>(nameof(Value), updown => updown.Value,
+        public static readonly DirectProperty<NumericUpDown, decimal?> ValueProperty =
+            AvaloniaProperty.RegisterDirect<NumericUpDown, decimal?>(nameof(Value), updown => updown.Value,
                 (updown, v) => updown.Value = v, defaultBindingMode: BindingMode.TwoWay, enableDataValidation: true);
 
         /// <summary>
@@ -128,7 +131,7 @@ namespace Avalonia.Controls
 
         private IDisposable? _textBoxTextChangedSubscription;
 
-        private decimal _value;
+        private decimal? _value;
         private string? _text;
         private bool _internalValueSet;
         private bool _clipValueToMinMax;
@@ -274,7 +277,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the value.
         /// </summary>
-        public decimal Value
+        public decimal? Value
         {
             get { return _value; }
             set
@@ -348,7 +351,7 @@ namespace Avalonia.Controls
         /// <inheritdoc />
         protected override void OnLostFocus(RoutedEventArgs e)
         {
-            CommitInput();
+            CommitInput(true);
             base.OnLostFocus(e);
         }
 
@@ -400,12 +403,16 @@ namespace Avalonia.Controls
         /// enabled.
         /// </summary>
         /// <param name="property">The property.</param>
-        /// <param name="value">The new binding value for the property.</param>
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        /// <param name="state">The current data binding state.</param>
+        /// <param name="error">The current data binding error, if any.</param>
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
             if (property == TextProperty || property == ValueProperty)
             {
-                DataValidationErrors.SetError(this, value.Error);
+                DataValidationErrors.SetError(this, error);
             }
         }
 
@@ -482,9 +489,9 @@ namespace Avalonia.Controls
             {
                 SetValidSpinDirection();
             }
-            if (ClipValueToMinMax)
+            if (ClipValueToMinMax && Value.HasValue)
             {
-                Value = MathUtilities.Clamp(Value, Minimum, Maximum);
+                Value = MathUtilities.Clamp(Value.Value, Minimum, Maximum);
             }
         }
 
@@ -499,9 +506,9 @@ namespace Avalonia.Controls
             {
                 SetValidSpinDirection();
             }
-            if (ClipValueToMinMax)
+            if (ClipValueToMinMax && Value.HasValue)
             {
-                Value = MathUtilities.Clamp(Value, Minimum, Maximum);
+                Value = MathUtilities.Clamp(Value.Value, Minimum, Maximum);
             }
         }
 
@@ -523,7 +530,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="oldValue">The old value.</param>
         /// <param name="newValue">The new value.</param>
-        protected virtual void OnValueChanged(decimal oldValue, decimal newValue)
+        protected virtual void OnValueChanged(decimal? oldValue, decimal? newValue)
         {
             if (!_internalValueSet && IsInitialized)
             {
@@ -566,7 +573,7 @@ namespace Avalonia.Controls
         /// Called when the <see cref="Value"/> property has to be coerced.
         /// </summary>
         /// <param name="baseValue">The value.</param>
-        protected virtual decimal OnCoerceValue(decimal baseValue)
+        protected virtual decimal? OnCoerceValue(decimal? baseValue)
         {
             return baseValue;
         }
@@ -600,7 +607,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="oldValue">The old value.</param>
         /// <param name="newValue">The new value.</param>
-        protected virtual void RaiseValueChangedEvent(decimal oldValue, decimal newValue)
+        protected virtual void RaiseValueChangedEvent(decimal? oldValue, decimal? newValue)
         {
             var e = new NumericUpDownValueChangedEventArgs(ValueChangedEvent, oldValue, newValue);
             RaiseEvent(e);
@@ -609,9 +616,9 @@ namespace Avalonia.Controls
         /// <summary>
         /// Converts the formatted text to a value.
         /// </summary>
-        private decimal ConvertTextToValue(string text)
+        private decimal? ConvertTextToValue(string? text)
         {
-            decimal result = 0;
+            decimal? result = null;
 
             if (string.IsNullOrEmpty(text))
             {
@@ -628,9 +635,9 @@ namespace Avalonia.Controls
 
             result = ConvertTextToValueCore(currentValueText, text);
 
-            if (ClipValueToMinMax)
+            if (ClipValueToMinMax && result.HasValue)
             {
-                return MathUtilities.Clamp(result, Minimum, Maximum);
+                return MathUtilities.Clamp(result.Value, Minimum, Maximum);
             }
 
             ValidateMinMax(result);
@@ -642,7 +649,7 @@ namespace Avalonia.Controls
         /// Converts the value to formatted text.
         /// </summary>
         /// <returns></returns>
-        private string ConvertValueToText()
+        private string? ConvertValueToText()
         {
             //Manage FormatString of type "{}{0:N2} °" (in xaml) or "{0:N2} °" in code-behind.
             if (FormatString.Contains("{0"))
@@ -650,7 +657,7 @@ namespace Avalonia.Controls
                 return string.Format(NumberFormat, FormatString, Value);
             }
 
-            return Value.ToString(FormatString, NumberFormat);
+            return Value?.ToString(FormatString, NumberFormat);
         }
 
         /// <summary>
@@ -658,7 +665,16 @@ namespace Avalonia.Controls
         /// </summary>
         private void OnIncrement()
         {
-            var result = Value + Increment;
+            decimal result;
+            if (Value.HasValue)
+            {
+                result = Value.Value + Increment;
+            }
+            else
+            {
+                result = Minimum;
+            }
+            
             Value = MathUtilities.Clamp(result, Minimum, Maximum);
         }
 
@@ -667,7 +683,17 @@ namespace Avalonia.Controls
         /// </summary>
         private void OnDecrement()
         {
-            var result = Value - Increment;
+            decimal result;
+            
+            if (Value.HasValue)
+            {
+                result = Value.Value - Increment;
+            }
+            else
+            {
+                result = Maximum;
+            }
+            
             Value = MathUtilities.Clamp(result, Minimum, Maximum);
         }
 
@@ -681,6 +707,11 @@ namespace Avalonia.Controls
             // Zero increment always prevents spin.
             if (Increment != 0 && !IsReadOnly)
             {
+                if (!Value.HasValue)
+                {
+                    validDirections = ValidSpinDirections.Increase | ValidSpinDirections.Decrease;
+                }
+                
                 if (Value < Maximum)
                 {
                     validDirections = validDirections | ValidSpinDirections.Increase;
@@ -818,13 +849,13 @@ namespace Avalonia.Controls
         {
             if (e.Sender is NumericUpDown upDown)
             {
-                var oldValue = (decimal)e.OldValue!;
-                var newValue = (decimal)e.NewValue!;
+                var oldValue = (decimal?)e.OldValue;
+                var newValue = (decimal?)e.NewValue;
                 upDown.OnValueChanged(oldValue, newValue);
             }
         }
 
-        private void SetValueInternal(decimal value)
+        private void SetValueInternal(decimal? value)
         {
             _internalValueSet = true;
             try
@@ -939,9 +970,9 @@ namespace Avalonia.Controls
             remove { RemoveHandler(ValueChangedEvent, value); }
         }
 
-        private bool CommitInput()
+        private bool CommitInput(bool forceTextUpdate = false)
         {
-            return SyncTextAndValueProperties(true, Text);
+            return SyncTextAndValueProperties(true, Text, forceTextUpdate);
         }
 
         /// <summary>
@@ -971,28 +1002,24 @@ namespace Avalonia.Controls
             {
                 if (updateValueFromText)
                 {
-                    if (!string.IsNullOrEmpty(text))
+                    try
                     {
-                        try
+                        var newValue = ConvertTextToValue(text);
+                        if (!Equals(newValue, Value))
                         {
-                            var newValue = ConvertTextToValue(text);
-                            if (!Equals(newValue, Value))
-                            {
-                                SetValueInternal(newValue);
-                            }
-                        }
-                        catch
-                        {
-                            parsedTextIsValid = false;
+                            SetValueInternal(newValue);
                         }
                     }
+                    catch
+                    {
+                        parsedTextIsValid = false;
+                    }
                 }
 
                 // Do not touch the ongoing text input from user.
                 if (!_isTextChangedFromUI)
                 {
-                    var keepEmpty = !forceTextUpdate && string.IsNullOrEmpty(Text);
-                    if (!keepEmpty)
+                    if (forceTextUpdate)
                     {
                         var newText = ConvertValueToText();
                         if (!Equals(Text, newText))
@@ -1029,10 +1056,15 @@ namespace Avalonia.Controls
             return parsedTextIsValid;
         }
 
-        private decimal ConvertTextToValueCore(string currentValueText, string text)
+        private decimal? ConvertTextToValueCore(string? currentValueText, string? text)
         {
             decimal result;
 
+            if (string.IsNullOrEmpty(text))
+            {
+                return null;
+            }
+            
             if (IsPercent(FormatString))
             {
                 result = ParsePercent(text, NumberFormat);
@@ -1045,13 +1077,13 @@ namespace Avalonia.Controls
                     var shouldThrow = true;
 
                     // Check if CurrentValueText is also failing => it also contains special characters. ex : 90°
-                    if (!decimal.TryParse(currentValueText, ParsingNumberStyle, NumberFormat, out var _))
+                    if (!string.IsNullOrEmpty(currentValueText) && !decimal.TryParse(currentValueText, ParsingNumberStyle, NumberFormat, out var _))
                     {
                         // extract non-digit characters
                         var currentValueTextSpecialCharacters = currentValueText.Where(c => !char.IsDigit(c));
                         var textSpecialCharacters = text.Where(c => !char.IsDigit(c));
                         // same non-digit characters on currentValueText and new text => remove them on new Text to parse it again.
-                        if (currentValueTextSpecialCharacters.Except(textSpecialCharacters).ToList().Count == 0)
+                        if (!currentValueTextSpecialCharacters.Except(textSpecialCharacters).Any())
                         {
                             foreach (var character in textSpecialCharacters)
                             {
@@ -1075,8 +1107,12 @@ namespace Avalonia.Controls
             return result;
         }
 
-        private void ValidateMinMax(decimal value)
+        private void ValidateMinMax(decimal? value)
         {
+            if (!value.HasValue)
+            {
+                return;
+            }
             if (value < Minimum)
             {
                 throw new ArgumentOutOfRangeException(nameof(value), string.Format("Value must be greater than Minimum value of {0}", Minimum));
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
index 9b467d682c..af835541ae 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
@@ -4,13 +4,13 @@ namespace Avalonia.Controls
 {
     public class NumericUpDownValueChangedEventArgs : RoutedEventArgs
     {
-        public NumericUpDownValueChangedEventArgs(RoutedEvent routedEvent, decimal oldValue, decimal newValue) : base(routedEvent)
+        public NumericUpDownValueChangedEventArgs(RoutedEvent routedEvent, decimal? oldValue, decimal? newValue) : base(routedEvent)
         {
             OldValue = oldValue;
             NewValue = newValue;
         }
 
-        public decimal OldValue { get; }
-        public decimal NewValue { get; }
+        public decimal? OldValue { get; }
+        public decimal? NewValue { get; }
     }
 }
diff --git a/src/Avalonia.Controls/Panel.cs b/src/Avalonia.Controls/Panel.cs
index 482a7fab84..2230b4b0d2 100644
--- a/src/Avalonia.Controls/Panel.cs
+++ b/src/Avalonia.Controls/Panel.cs
@@ -147,7 +147,7 @@ namespace Avalonia.Controls
                     throw new NotSupportedException();
             }
 
-            _childIndexChanged?.Invoke(this, new ChildIndexChangedEventArgs());
+            _childIndexChanged?.Invoke(this, ChildIndexChangedEventArgs.Empty);
             InvalidateMeasureOnChildrenChanged();
         }
 
diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
index 23ecdb2e7b..3a6d06f150 100644
--- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
@@ -4,6 +4,7 @@ using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Threading;
@@ -14,6 +15,7 @@ namespace Avalonia.Controls.Platform
     /// <summary>
     /// Provides the default keyboard and pointer interaction for menus.
     /// </summary>
+    [Unstable]
     public class DefaultMenuInteractionHandler : IMenuInteractionHandler
     {
         private readonly bool _isContextMenu;
@@ -54,6 +56,7 @@ namespace Avalonia.Controls.Platform
             Menu.AddHandler(Avalonia.Controls.Menu.MenuOpenedEvent, this.MenuOpened);
             Menu.AddHandler(MenuItem.PointerEnterItemEvent, PointerEnter);
             Menu.AddHandler(MenuItem.PointerLeaveItemEvent, PointerLeave);
+            Menu.AddHandler(InputElement.PointerMovedEvent, PointerMoved);
 
             _root = Menu.VisualRoot;
 
@@ -89,6 +92,7 @@ namespace Avalonia.Controls.Platform
             Menu.RemoveHandler(Avalonia.Controls.Menu.MenuOpenedEvent, this.MenuOpened);
             Menu.RemoveHandler(MenuItem.PointerEnterItemEvent, PointerEnter);
             Menu.RemoveHandler(MenuItem.PointerLeaveItemEvent, PointerLeave);
+            Menu.RemoveHandler(InputElement.PointerMovedEvent, PointerMoved);
 
             if (_root is InputElement inputRoot)
             {
@@ -149,13 +153,18 @@ namespace Avalonia.Controls.Platform
                 case Key.Up:
                 case Key.Down:
                 {
-                    if (item?.IsTopLevel == true)
+                    if (item?.IsTopLevel == true && item.HasSubMenu)
                     {
-                        if (item.HasSubMenu && !item.IsSubMenuOpen)
+                        if (!item.IsSubMenuOpen)
                         {
                             Open(item, true);
-                            e.Handled = true;
                         }
+                        else
+                        {
+                            item.MoveSelection(NavigationDirection.First, true);
+                        }
+
+                        e.Handled = true;
                     }
                     else
                     {
@@ -247,7 +256,8 @@ namespace Avalonia.Controls.Platform
                             // new menu.
                             if (item.IsSubMenuOpen &&
                                 item.Parent is IMenu &&
-                                item.Parent.SelectedItem is object)
+                                item.Parent.SelectedItem is object &&
+                                item.Parent.SelectedItem != item)
                             {
                                 item.Close();
                                 Open(item.Parent.SelectedItem, true);
@@ -332,6 +342,22 @@ namespace Avalonia.Controls.Platform
             }
         }
 
+        protected internal virtual void PointerMoved(object? sender, PointerEventArgs e)
+        {
+            // HACK: #8179 needs to be addressed to correctly implement it in the PointerPressed method.
+            var item = GetMenuItem(e.Source as IControl) as MenuItem;
+            if (item?.TransformedBounds == null)
+            {
+                return;
+            }
+            var point = e.GetCurrentPoint(null);
+
+            if (point.Properties.IsLeftButtonPressed && item.TransformedBounds.Value.Contains(point.Position) == false)
+            {
+                e.Pointer.Capture(null);
+            }
+        }
+
         protected internal virtual void PointerLeave(object? sender, PointerEventArgs e)
         {
             var item = GetMenuItem(e.Source as IControl);
@@ -411,7 +437,7 @@ namespace Avalonia.Controls.Platform
 
         protected internal virtual void MenuOpened(object? sender, RoutedEventArgs e)
         {
-            if (e.Source == Menu)
+            if (e.Source is Menu)
             {
                 Menu?.MoveSelection(NavigationDirection.First, true);
             }
diff --git a/src/Avalonia.Controls/Platform/IApplicationPlatformEvents.cs b/src/Avalonia.Controls/Platform/IApplicationPlatformEvents.cs
index a8d3a3b3ac..99bbb8b56d 100644
--- a/src/Avalonia.Controls/Platform/IApplicationPlatformEvents.cs
+++ b/src/Avalonia.Controls/Platform/IApplicationPlatformEvents.cs
@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IApplicationPlatformEvents
     {
         void RaiseUrlsOpened(string[] urls);
diff --git a/src/Avalonia.Controls/Platform/IMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/IMenuInteractionHandler.cs
index dd8503f768..47b5a048b0 100644
--- a/src/Avalonia.Controls/Platform/IMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/IMenuInteractionHandler.cs
@@ -1,8 +1,11 @@
-namespace Avalonia.Controls.Platform
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Platform
 {
     /// <summary>
     /// Handles user interaction for menus.
     /// </summary>
+    [Unstable]
     public interface IMenuInteractionHandler
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/IMountedVolumeInfoProvider.cs b/src/Avalonia.Controls/Platform/IMountedVolumeInfoProvider.cs
index 6e10163175..daeb9076e6 100644
--- a/src/Avalonia.Controls/Platform/IMountedVolumeInfoProvider.cs
+++ b/src/Avalonia.Controls/Platform/IMountedVolumeInfoProvider.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Threading.Tasks;
-using Avalonia.Platform;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Platform
 {
     /// <summary>
     /// Defines a platform-specific mount volumes info provider implementation.
     /// </summary>
+    [Unstable]
     public interface IMountedVolumeInfoProvider 
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/INativeControlHostImpl.cs b/src/Avalonia.Controls/Platform/INativeControlHostImpl.cs
index df13613848..ffa79aa8d6 100644
--- a/src/Avalonia.Controls/Platform/INativeControlHostImpl.cs
+++ b/src/Avalonia.Controls/Platform/INativeControlHostImpl.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using Avalonia.Metadata;
 using Avalonia.Platform;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Platform
 {
+    [Unstable]
     public interface INativeControlHostImpl
     {
         INativeControlHostDestroyableControlHandle CreateDefaultChild(IPlatformHandle parent);
@@ -13,11 +14,13 @@ namespace Avalonia.Controls.Platform
         bool IsCompatibleWith(IPlatformHandle handle);
     }
 
+    [Unstable]
     public interface INativeControlHostDestroyableControlHandle : IPlatformHandle
     {
         void Destroy();
     }
 
+    [Unstable]
     public interface INativeControlHostControlTopLevelAttachment : IDisposable
     {
         INativeControlHostImpl? AttachedTo { get; set; }
@@ -27,6 +30,7 @@ namespace Avalonia.Controls.Platform
         void ShowInBounds(Rect rect);
     }
 
+    [Unstable]
     public interface ITopLevelImplWithNativeControlHost
     {
         INativeControlHostImpl? NativeControlHost { get; }
diff --git a/src/Avalonia.Controls/Platform/IPlatformIconLoader.cs b/src/Avalonia.Controls/Platform/IPlatformIconLoader.cs
index ecbc6d2234..4c844ce30f 100644
--- a/src/Avalonia.Controls/Platform/IPlatformIconLoader.cs
+++ b/src/Avalonia.Controls/Platform/IPlatformIconLoader.cs
@@ -1,7 +1,9 @@
 using System.IO;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IPlatformIconLoader
     {
         IWindowIconImpl LoadIcon(string fileName);
diff --git a/src/Avalonia.Controls/Platform/IPlatformLifetimeEventsImpl.cs b/src/Avalonia.Controls/Platform/IPlatformLifetimeEventsImpl.cs
index 4cd6640453..0658f9211c 100644
--- a/src/Avalonia.Controls/Platform/IPlatformLifetimeEventsImpl.cs
+++ b/src/Avalonia.Controls/Platform/IPlatformLifetimeEventsImpl.cs
@@ -1,9 +1,10 @@
 using System;
-using System.ComponentModel;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IPlatformLifetimeEventsImpl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/IPlatformNativeSurfaceHandle.cs b/src/Avalonia.Controls/Platform/IPlatformNativeSurfaceHandle.cs
new file mode 100644
index 0000000000..6ad07b1b13
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/IPlatformNativeSurfaceHandle.cs
@@ -0,0 +1,12 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Platform
+{
+    [Unstable]
+    public interface IPlatformNativeSurfaceHandle : IPlatformHandle
+    {
+        PixelSize Size { get; }
+        double Scaling { get; }
+    }
+}
diff --git a/src/Avalonia.Controls/Platform/IPopupImpl.cs b/src/Avalonia.Controls/Platform/IPopupImpl.cs
index 477d5fab43..cd86045dee 100644
--- a/src/Avalonia.Controls/Platform/IPopupImpl.cs
+++ b/src/Avalonia.Controls/Platform/IPopupImpl.cs
@@ -1,10 +1,12 @@
 using Avalonia.Controls.Primitives.PopupPositioning;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
     /// <summary>
     /// Defines a platform-specific popup window implementation.
     /// </summary>
+    [Unstable]
     public interface IPopupImpl : IWindowBaseImpl
     {
         IPopupPositioner PopupPositioner { get; }
diff --git a/src/Avalonia.Controls/Platform/IScreenImpl.cs b/src/Avalonia.Controls/Platform/IScreenImpl.cs
index 5bd45057d9..fcae3b6493 100644
--- a/src/Avalonia.Controls/Platform/IScreenImpl.cs
+++ b/src/Avalonia.Controls/Platform/IScreenImpl.cs
@@ -1,11 +1,19 @@
 using System.Collections.Generic;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IScreenImpl
     {
         int ScreenCount { get; }
 
         IReadOnlyList<Screen> AllScreens { get; }
+
+        Screen? ScreenFromWindow(IWindowBaseImpl window);
+
+        Screen? ScreenFromPoint(PixelPoint point);
+
+        Screen? ScreenFromRect(PixelRect rect);
     }
 }
diff --git a/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs b/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs
index 1685a6a38c..715eda5cfa 100644
--- a/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs
+++ b/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs
@@ -1,10 +1,12 @@
 using System.Threading.Tasks;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Platform
 {
     /// <summary>
     /// Defines a platform-specific system dialog implementation.
     /// </summary>
+    [Unstable]
     public interface ISystemDialogImpl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
index 80434882f7..bd0339f525 100644
--- a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
+++ b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
@@ -4,6 +4,7 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Layout;
+using Avalonia.Metadata;
 using Avalonia.Rendering;
 using JetBrains.Annotations;
 
@@ -50,6 +51,7 @@ namespace Avalonia.Platform
     /// This interface is the common interface to <see cref="IWindowImpl"/> and
     /// <see cref="IPopupImpl"/>.
     /// </remarks>
+    [Unstable]
     public interface ITopLevelImpl : IDisposable
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/ITopLevelImplWithTextInputMethod.cs b/src/Avalonia.Controls/Platform/ITopLevelImplWithTextInputMethod.cs
index bafb973765..a2e426ca08 100644
--- a/src/Avalonia.Controls/Platform/ITopLevelImplWithTextInputMethod.cs
+++ b/src/Avalonia.Controls/Platform/ITopLevelImplWithTextInputMethod.cs
@@ -1,9 +1,11 @@
 using Avalonia.Input;
 using Avalonia.Input.TextInput;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 
 namespace Avalonia.Controls.Platform
 {
+    [Unstable]
     public interface ITopLevelImplWithTextInputMethod : ITopLevelImpl
     {
         public ITextInputMethodImpl? TextInputMethod { get; }
diff --git a/src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs b/src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs
index 9e72a40439..149a978c54 100644
--- a/src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs
+++ b/src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs
@@ -1,13 +1,16 @@
 using System;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 
 namespace Avalonia.Controls.Platform
 {
+    [Unstable]
     public interface INativeMenuExporter
     {
         void SetNativeMenu(NativeMenu? menu);
     }
 
+    [Unstable]
     public interface ITopLevelNativeMenuExporter : INativeMenuExporter
     {
         bool IsNativeMenuExported { get; }
@@ -15,11 +18,13 @@ namespace Avalonia.Controls.Platform
         event EventHandler OnIsNativeMenuExportedChanged;
     }
 
+    [Unstable]
     public interface INativeMenuExporterProvider
     {
         INativeMenuExporter? NativeMenuExporter { get; }
     }
-    
+
+    [Unstable]
     public interface ITopLevelImplWithNativeMenuExporter : ITopLevelImpl
     {
         ITopLevelNativeMenuExporter? NativeMenuExporter { get; }
diff --git a/src/Avalonia.Controls/Platform/ITrayIconImpl.cs b/src/Avalonia.Controls/Platform/ITrayIconImpl.cs
index 289b569645..4ef9397d04 100644
--- a/src/Avalonia.Controls/Platform/ITrayIconImpl.cs
+++ b/src/Avalonia.Controls/Platform/ITrayIconImpl.cs
@@ -1,8 +1,10 @@
 using System;
 using Avalonia.Controls.Platform;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface ITrayIconImpl : IDisposable
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs b/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs
index 066f4579c0..512fad6dfc 100644
--- a/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs
@@ -1,8 +1,10 @@
 using System;
 using Avalonia.Automation.Peers;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IWindowBaseImpl : ITopLevelImpl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/IWindowIconImpl.cs b/src/Avalonia.Controls/Platform/IWindowIconImpl.cs
index 7086b7651c..4bb8844d97 100644
--- a/src/Avalonia.Controls/Platform/IWindowIconImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowIconImpl.cs
@@ -1,7 +1,9 @@
 using System.IO;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IWindowIconImpl
     {
         void Save(Stream outputStream);
diff --git a/src/Avalonia.Controls/Platform/IWindowImpl.cs b/src/Avalonia.Controls/Platform/IWindowImpl.cs
index d4be4f9f45..af9392d440 100644
--- a/src/Avalonia.Controls/Platform/IWindowImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowImpl.cs
@@ -1,12 +1,14 @@
 using System;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform
 {
     /// <summary>
     /// Defines a platform-specific window implementation.
     /// </summary>
+    [Unstable]
     public interface IWindowImpl : IWindowBaseImpl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Platform/IWindowingPlatform.cs b/src/Avalonia.Controls/Platform/IWindowingPlatform.cs
index fa26fe8fdd..5acc5adccd 100644
--- a/src/Avalonia.Controls/Platform/IWindowingPlatform.cs
+++ b/src/Avalonia.Controls/Platform/IWindowingPlatform.cs
@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Platform
 {
+    [Unstable]
     public interface IWindowingPlatform
     {
         IWindowImpl CreateWindow();
diff --git a/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs b/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
index 4e5908456e..630d2d8efb 100644
--- a/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
+++ b/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
@@ -1,14 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Threading;
-using System.Threading.Tasks;
+using Avalonia.Metadata;
 using Avalonia.Platform;
-using Avalonia.Rendering;
 using Avalonia.Threading;
 
 namespace Avalonia.Controls.Platform
 {
+    [Unstable]
     public class InternalPlatformThreadingInterface : IPlatformThreadingInterface
     {
         public InternalPlatformThreadingInterface()
diff --git a/src/Avalonia.Controls/Platform/MountedDriveInfo.cs b/src/Avalonia.Controls/Platform/MountedDriveInfo.cs
index f3104e4360..620ac9303f 100644
--- a/src/Avalonia.Controls/Platform/MountedDriveInfo.cs
+++ b/src/Avalonia.Controls/Platform/MountedDriveInfo.cs
@@ -1,10 +1,12 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Platform
 {
     /// <summary>
     /// Describes a Drive's properties.
     /// </summary>
+    [Unstable]
     public class MountedVolumeInfo : IEquatable<MountedVolumeInfo>
     {
         public string? VolumeLabel { get; set; }
diff --git a/src/Avalonia.Controls/Platform/PlatformManager.cs b/src/Avalonia.Controls/Platform/PlatformManager.cs
index ee62316922..92f6f1cb52 100644
--- a/src/Avalonia.Controls/Platform/PlatformManager.cs
+++ b/src/Avalonia.Controls/Platform/PlatformManager.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Reactive.Disposables;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 
 namespace Avalonia.Controls.Platform
 {
+    [Unstable]
     public static partial class PlatformManager
     {
         static bool s_designerMode;
diff --git a/src/Avalonia.Controls/Platform/ScreenHelper.cs b/src/Avalonia.Controls/Platform/ScreenHelper.cs
new file mode 100644
index 0000000000..0bd2be69d0
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/ScreenHelper.cs
@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+#nullable enable
+
+namespace Avalonia.Platform
+{
+    public static class ScreenHelper
+    {
+        public static Screen? ScreenFromPoint(PixelPoint point, IReadOnlyList<Screen> screens)
+        {
+            foreach (Screen screen in screens)
+            {
+                if (screen.Bounds.ContainsExclusive(point))
+                {
+                    return screen;
+                }
+            }
+
+            return null;
+        }
+
+        public static Screen? ScreenFromRect(PixelRect bounds, IReadOnlyList<Screen> screens)
+        {
+            Screen? currMaxScreen = null;
+            double maxAreaSize = 0;
+
+            foreach (Screen screen in screens)
+            {
+                double left = MathUtilities.Clamp(bounds.X, screen.Bounds.X, screen.Bounds.X + screen.Bounds.Width);
+                double top = MathUtilities.Clamp(bounds.Y, screen.Bounds.Y, screen.Bounds.Y + screen.Bounds.Height);
+                double right = MathUtilities.Clamp(bounds.X + bounds.Width, screen.Bounds.X, screen.Bounds.X + screen.Bounds.Width);
+                double bottom = MathUtilities.Clamp(bounds.Y + bounds.Height, screen.Bounds.Y, screen.Bounds.Y + screen.Bounds.Height);
+                double area = (right - left) * (bottom - top);
+                if (area > maxAreaSize)
+                {
+                    maxAreaSize = area;
+                    currMaxScreen = screen;
+                }
+            }
+
+            return currMaxScreen;
+        }
+
+        public static Screen? ScreenFromWindow(IWindowBaseImpl window, IReadOnlyList<Screen> screens)
+        {
+            var rect = new PixelRect(
+                window.Position, 
+                PixelSize.FromSize(window.FrameSize ?? window.ClientSize, window.DesktopScaling));
+
+            return ScreenFromRect(rect, screens);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Platform/Surfaces/IFramebufferPlatformSurface.cs b/src/Avalonia.Controls/Platform/Surfaces/IFramebufferPlatformSurface.cs
index 62cd012d51..0a7daeaa24 100644
--- a/src/Avalonia.Controls/Platform/Surfaces/IFramebufferPlatformSurface.cs
+++ b/src/Avalonia.Controls/Platform/Surfaces/IFramebufferPlatformSurface.cs
@@ -1,7 +1,9 @@
-using Avalonia.Platform;
+using Avalonia.Metadata;
+using Avalonia.Platform;
 
 namespace Avalonia.Controls.Platform.Surfaces
 {
+    [Unstable]
     public interface IFramebufferPlatformSurface
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Presenters/CarouselPresenter.cs b/src/Avalonia.Controls/Presenters/CarouselPresenter.cs
index 3d1e7eb5a8..87bbfce2a2 100644
--- a/src/Avalonia.Controls/Presenters/CarouselPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/CarouselPresenter.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Defines the <see cref="PageTransition"/> property.
         /// </summary>
-        public static readonly StyledProperty<IPageTransition> PageTransitionProperty =
+        public static readonly StyledProperty<IPageTransition?> PageTransitionProperty =
             Carousel.PageTransitionProperty.AddOwner<CarouselPresenter>();
 
         private int _selectedIndex = -1;
@@ -85,7 +85,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Gets or sets a transition to use when switching pages.
         /// </summary>
-        public IPageTransition PageTransition
+        public IPageTransition? PageTransition
         {
             get { return GetValue(PageTransitionProperty); }
             set { SetValue(PageTransitionProperty, value); }
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 9886dd913a..12a8dd747d 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -1,5 +1,6 @@
 using System;
 
+using Avalonia.Controls.Documents;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
@@ -8,6 +9,7 @@ using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Metadata;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -46,7 +48,73 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public static readonly StyledProperty<BoxShadows> BoxShadowProperty =
             Border.BoxShadowProperty.AddOwner<ContentPresenter>();
-        
+
+        /// <summary>
+        /// Defines the <see cref="Foreground"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> ForegroundProperty =
+            TextElement.ForegroundProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="FontFamily"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontFamily> FontFamilyProperty =
+            TextElement.FontFamilyProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="FontSize"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> FontSizeProperty =
+            TextElement.FontSizeProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="FontStyle"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontStyle> FontStyleProperty =
+            TextElement.FontStyleProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="FontWeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontWeight> FontWeightProperty =
+            TextElement.FontWeightProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="FontStretch"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontStretch> FontStretchProperty =
+            TextElement.FontStretchProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="TextAlignment"/> property
+        /// </summary>
+        public static readonly StyledProperty<TextAlignment> TextAlignmentProperty =
+            TextBlock.TextAlignmentProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="TextWrapping"/> property
+        /// </summary>
+        public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
+            TextBlock.TextWrappingProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="TextTrimming"/> property
+        /// </summary>
+        public static readonly StyledProperty<TextTrimming> TextTrimmingProperty =
+            TextBlock.TextTrimmingProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="LineHeight"/> property
+        /// </summary>
+        public static readonly StyledProperty<double> LineHeightProperty =
+            TextBlock.LineHeightProperty.AddOwner<ContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="MaxLines"/> property
+        /// </summary>
+        public static readonly StyledProperty<int> MaxLinesProperty =
+            TextBlock.MaxLinesProperty.AddOwner<ContentPresenter>();
+                
         /// <summary>
         /// Defines the <see cref="Child"/> property.
         /// </summary>
@@ -107,9 +175,6 @@ namespace Avalonia.Controls.Presenters
             AffectsRender<ContentPresenter>(BackgroundProperty, BorderBrushProperty, BorderThicknessProperty, CornerRadiusProperty);
             AffectsArrange<ContentPresenter>(HorizontalContentAlignmentProperty, VerticalContentAlignmentProperty);
             AffectsMeasure<ContentPresenter>(BorderThicknessProperty, PaddingProperty);
-            ContentProperty.Changed.AddClassHandler<ContentPresenter>((x, e) => x.ContentChanged(e));
-            ContentTemplateProperty.Changed.AddClassHandler<ContentPresenter>((x, e) => x.ContentChanged(e));
-            TemplatedParentProperty.Changed.AddClassHandler<ContentPresenter>((x, e) => x.TemplatedParentChanged(e));
         }
 
         public ContentPresenter()
@@ -162,6 +227,105 @@ namespace Avalonia.Controls.Presenters
             set => SetValue(BoxShadowProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets a brush used to paint the text.
+        /// </summary>
+        public IBrush? Foreground
+        {
+            get => GetValue(ForegroundProperty);
+            set => SetValue(ForegroundProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font family.
+        /// </summary>
+        public FontFamily FontFamily
+        {
+            get => GetValue(FontFamilyProperty);
+            set => SetValue(FontFamilyProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font size.
+        /// </summary>
+        public double FontSize
+        {
+            get => GetValue(FontSizeProperty);
+            set => SetValue(FontSizeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font style.
+        /// </summary>
+        public FontStyle FontStyle
+        {
+            get => GetValue(FontStyleProperty);
+            set => SetValue(FontStyleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font weight.
+        /// </summary>
+        public FontWeight FontWeight
+        {
+            get => GetValue(FontWeightProperty);
+            set => SetValue(FontWeightProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font stretch.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get => GetValue(FontStretchProperty);
+            set => SetValue(FontStretchProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the text alignment
+        /// </summary>
+        public TextAlignment TextAlignment
+        {
+            get => GetValue(TextAlignmentProperty);
+            set => SetValue(TextAlignmentProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the text wrapping
+        /// </summary>
+        public TextWrapping TextWrapping
+        {
+            get => GetValue(TextWrappingProperty);
+            set => SetValue(TextWrappingProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the text trimming
+        /// </summary>
+        public TextTrimming TextTrimming
+        {
+            get => GetValue(TextTrimmingProperty);
+            set => SetValue(TextTrimmingProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the line height
+        /// </summary>
+        public double LineHeight
+        {
+            get => GetValue(LineHeightProperty);
+            set => SetValue(LineHeightProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the max lines
+        /// </summary>
+        public int MaxLines
+        {
+            get => GetValue(MaxLinesProperty);
+            set => SetValue(MaxLinesProperty, value);
+        }
+
         /// <summary>
         /// Gets the control displayed by the presenter.
         /// </summary>
@@ -240,6 +404,25 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            switch (change.Property.Name)
+            {
+                case nameof(Content):
+                case nameof(ContentTemplate):
+                    ContentChanged(change);
+                    break;
+                case nameof(TemplatedParent):
+                    TemplatedParentChanged(change);
+                    break;
+                case nameof(UseLayoutRounding):
+                case nameof(BorderThickness):
+                    _layoutThickness = null;
+                    break;
+            }
+        }
+
         /// <summary>
         /// Updates the <see cref="Child"/> control based on the control's <see cref="Content"/>.
         /// </summary>
@@ -254,8 +437,14 @@ namespace Avalonia.Controls.Presenters
         public void UpdateChild()
         {
             var content = Content;
+            UpdateChild(content);
+        }
+
+        private void UpdateChild(object? content)
+        {
+            var contentTemplate = ContentTemplate;
             var oldChild = Child;
-            var newChild = CreateChild();
+            var newChild = CreateChild(content, oldChild, contentTemplate);
             var logicalChildren = Host?.LogicalChildren ?? LogicalChildren;
 
             // Remove the old child if we're not recycling it.
@@ -271,7 +460,7 @@ namespace Avalonia.Controls.Presenters
             }
 
             // Set the DataContext if the data isn't a control.
-            if (!(content is IControl))
+            if (contentTemplate is { } || !(content is IControl))
             {
                 DataContext = content;
             }
@@ -299,6 +488,7 @@ namespace Avalonia.Controls.Presenters
             }
 
             _createdChild = true;
+
         }
 
         /// <inheritdoc/>
@@ -310,10 +500,43 @@ namespace Avalonia.Controls.Presenters
             InvalidateMeasure();
         }
 
+        private Thickness? _layoutThickness;
+        private double _scale;
+
+        private Thickness LayoutThickness
+        {
+            get
+            {
+                VerifyScale();
+
+                if (_layoutThickness == null)
+                {
+                    var borderThickness = BorderThickness;
+
+                    if (UseLayoutRounding)
+                        borderThickness = LayoutHelper.RoundLayoutThickness(borderThickness, _scale, _scale);
+
+                    _layoutThickness = borderThickness;
+                }
+
+                return _layoutThickness.Value;
+            }
+        }
+
+        private void VerifyScale()
+        {
+            var currentScale = LayoutHelper.GetLayoutScale(this);
+            if (MathUtilities.AreClose(currentScale, _scale))
+                return;
+
+            _scale = currentScale;
+            _layoutThickness = null;
+        }
+
         /// <inheritdoc/>
         public override void Render(DrawingContext context)
         {
-            _borderRenderer.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush,
+            _borderRenderer.Render(context, Bounds.Size, LayoutThickness, CornerRadius, Background, BorderBrush,
                 BoxShadow);
         }
 
@@ -325,18 +548,23 @@ namespace Avalonia.Controls.Presenters
         {
             var content = Content;
             var oldChild = Child;
+            return CreateChild(content, oldChild, ContentTemplate);
+        }
+
+        private IControl? CreateChild(object? content, IControl? oldChild, IDataTemplate? template)
+        {            
             var newChild = content as IControl;
 
             // We want to allow creating Child from the Template, if Content is null.
             // But it's important to not use DataTemplates, otherwise we will break content presenters in many places,
             // otherwise it will blow up every ContentPresenter without Content set.
-            if (newChild == null
-                && (content != null || ContentTemplate != null))
+            if ((newChild == null 
+                && (content != null || template != null)) || (newChild is { } && template is { }))
             {
-                var dataTemplate = this.FindDataTemplate(content, ContentTemplate) ?? 
+                var dataTemplate = this.FindDataTemplate(content, template) ??
                     (
-                        RecognizesAccessKey 
-                            ? FuncDataTemplate.Access 
+                        RecognizesAccessKey
+                            ? FuncDataTemplate.Access
                             : FuncDataTemplate.Default
                     );
 
@@ -376,13 +604,22 @@ namespace Avalonia.Controls.Presenters
         {
             if (Child == null) return finalSize;
 
-            var padding = Padding + BorderThickness;
+            var useLayoutRounding = UseLayoutRounding;
+            var scale = LayoutHelper.GetLayoutScale(this);
+            var padding = Padding;
+            var borderThickness = BorderThickness;
+
+            if (useLayoutRounding)
+            {
+                padding = LayoutHelper.RoundLayoutThickness(padding, scale, scale);
+                borderThickness = LayoutHelper.RoundLayoutThickness(borderThickness, scale, scale);
+            }
+
+            padding += borderThickness;
             var horizontalContentAlignment = HorizontalContentAlignment;
             var verticalContentAlignment = VerticalContentAlignment;
-            var useLayoutRounding = UseLayoutRounding;
             var availableSize = finalSize;
             var sizeForChild = availableSize;
-            var scale = LayoutHelper.GetLayoutScale(this);
             var originX = offset.X;
             var originY = offset.Y;
 
@@ -446,7 +683,14 @@ namespace Avalonia.Controls.Presenters
 
             if (((ILogical)this).IsAttachedToLogicalTree)
             {
-                UpdateChild();
+                if (e.Property.Name == nameof(Content))
+                {
+                    UpdateChild(e.NewValue);
+                }
+                else
+                {
+                    UpdateChild();
+                }
             }
             else if (Child != null)
             {
diff --git a/src/Avalonia.Controls/Presenters/IContentPresenter.cs b/src/Avalonia.Controls/Presenters/IContentPresenter.cs
index ab4d61e3bd..673de4700b 100644
--- a/src/Avalonia.Controls/Presenters/IContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/IContentPresenter.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls.Primitives;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -6,6 +7,7 @@ namespace Avalonia.Controls.Presenters
     /// Interface for controls that present a single item of data inside a
     /// <see cref="TemplatedControl"/> template.
     /// </summary>
+    [NotClientImplementable]
     public interface IContentPresenter : IPresenter
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Presenters/IContentPresenterHost.cs b/src/Avalonia.Controls/Presenters/IContentPresenterHost.cs
index 78c4affe44..562638e94a 100644
--- a/src/Avalonia.Controls/Presenters/IContentPresenterHost.cs
+++ b/src/Avalonia.Controls/Presenters/IContentPresenterHost.cs
@@ -1,5 +1,6 @@
 using Avalonia.Collections;
 using Avalonia.LogicalTree;
+using Avalonia.Metadata;
 using Avalonia.Styling;
 
 namespace Avalonia.Controls.Presenters
@@ -15,6 +16,7 @@ namespace Avalonia.Controls.Presenters
     /// parent control's template is instantiated so they register themselves using this 
     /// interface.
     /// </remarks>
+    [NotClientImplementable]
     public interface IContentPresenterHost : ITemplatedControl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Presenters/IItemsPresenter.cs b/src/Avalonia.Controls/Presenters/IItemsPresenter.cs
index e7da3d4618..7cc72ef0a7 100644
--- a/src/Avalonia.Controls/Presenters/IItemsPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/IItemsPresenter.cs
@@ -1,8 +1,10 @@
 using System.Collections;
 using System.Collections.Specialized;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Presenters
 {
+    [NotClientImplementable]
     public interface IItemsPresenter : IPresenter
     {
         IEnumerable? Items { get; set; }
diff --git a/src/Avalonia.Controls/Presenters/IItemsPresenterHost.cs b/src/Avalonia.Controls/Presenters/IItemsPresenterHost.cs
index ba9ee0fe31..db11474871 100644
--- a/src/Avalonia.Controls/Presenters/IItemsPresenterHost.cs
+++ b/src/Avalonia.Controls/Presenters/IItemsPresenterHost.cs
@@ -1,3 +1,4 @@
+using Avalonia.Metadata;
 using Avalonia.Styling;
 
 namespace Avalonia.Controls.Presenters
@@ -13,6 +14,7 @@ namespace Avalonia.Controls.Presenters
     /// parent control's template is instantiated so they register themselves using this 
     /// interface.
     /// </remarks>
+    [NotClientImplementable]
     public interface IItemsPresenterHost : ITemplatedControl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Presenters/IPresenter.cs b/src/Avalonia.Controls/Presenters/IPresenter.cs
index 5318ea2757..0399983189 100644
--- a/src/Avalonia.Controls/Presenters/IPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/IPresenter.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls.Primitives;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -12,6 +13,7 @@ namespace Avalonia.Controls.Presenters
     /// of a <see cref="TemplatedControl"/> then that signals that the visual child
     /// of the presenter is not a part of the template.
     /// </remarks>
+    [NotClientImplementable]
     public interface IPresenter : IControl, INamed
     {
     }
diff --git a/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs b/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs
index f938c8d437..2821fa8cf0 100644
--- a/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs
+++ b/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs
@@ -158,7 +158,7 @@ namespace Avalonia.Controls.Presenters
             {
                 ItemsChanged(e);
 
-                _childIndexChanged?.Invoke(this, new ChildIndexChangedEventArgs());
+                _childIndexChanged?.Invoke(this, ChildIndexChangedEventArgs.Empty);
             }
         }
 
diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index 97fb4c3f43..c526b7ac49 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -389,7 +389,7 @@ namespace Avalonia.Controls.Presenters
                     {
                         var logicalUnits = delta.Y / logicalScrollItemSize.Y;
                         delta = delta.WithY(delta.Y - logicalUnits * logicalScrollItemSize.Y);
-                        dy = logicalUnits * scrollable!.ScrollSize.Height;
+                        dy = logicalUnits;
                     }
                     else
                         dy = delta.Y;
@@ -407,7 +407,7 @@ namespace Avalonia.Controls.Presenters
                     {
                         var logicalUnits = delta.X / logicalScrollItemSize.X;
                         delta = delta.WithX(delta.X - logicalUnits * logicalScrollItemSize.X);
-                        dx = logicalUnits * scrollable!.ScrollSize.Width;
+                        dx = logicalUnits;
                     }
                     else
                         dx = delta.X;
@@ -469,7 +469,7 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             if (change.Property == OffsetProperty && !_arranging)
             {
diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index 10ce31088a..3523cd5214 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -8,6 +8,7 @@ using Avalonia.Utilities;
 using Avalonia.VisualTree;
 using Avalonia.Layout;
 using Avalonia.Media.Immutable;
+using Avalonia.Controls.Documents;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -25,14 +26,14 @@ namespace Avalonia.Controls.Presenters
             AvaloniaProperty.Register<TextPresenter, char>(nameof(PasswordChar));
 
         public static readonly StyledProperty<IBrush?> SelectionBrushProperty =
-            AvaloniaProperty.Register<TextPresenter, IBrush?>(nameof(SelectionBrushProperty));
+            AvaloniaProperty.Register<TextPresenter, IBrush?>(nameof(SelectionBrush));
 
         public static readonly StyledProperty<IBrush?> SelectionForegroundBrushProperty =
-            AvaloniaProperty.Register<TextPresenter, IBrush?>(nameof(SelectionForegroundBrushProperty));
+            AvaloniaProperty.Register<TextPresenter, IBrush?>(nameof(SelectionForegroundBrush));
 
         public static readonly StyledProperty<IBrush?> CaretBrushProperty =
-            AvaloniaProperty.Register<TextPresenter, IBrush?>(nameof(CaretBrushProperty));
-
+            AvaloniaProperty.Register<TextPresenter, IBrush?>(nameof(CaretBrush));
+        
         public static readonly DirectProperty<TextPresenter, int> SelectionStartProperty =
             TextBox.SelectionStartProperty.AddOwner<TextPresenter>(
                 o => o.SelectionStart,
@@ -42,7 +43,7 @@ namespace Avalonia.Controls.Presenters
             TextBox.SelectionEndProperty.AddOwner<TextPresenter>(
                 o => o.SelectionEnd,
                 (o, v) => o.SelectionEnd = v);
-
+        
         /// <summary>
         /// Defines the <see cref="Text"/> property.
         /// </summary>
@@ -64,6 +65,12 @@ namespace Avalonia.Controls.Presenters
         public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
             TextBlock.TextWrappingProperty.AddOwner<TextPresenter>();
 
+        /// <summary>
+        /// Defines the <see cref="LineHeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> LineHeightProperty =
+            TextBlock.LineHeightProperty.AddOwner<TextPresenter>();
+        
         /// <summary>
         /// Defines the <see cref="Background"/> property.
         /// </summary>
@@ -121,8 +128,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public FontFamily FontFamily
         {
-            get => TextBlock.GetFontFamily(this);
-            set => TextBlock.SetFontFamily(this, value);
+            get => TextElement.GetFontFamily(this);
+            set => TextElement.SetFontFamily(this, value);
         }
 
         /// <summary>
@@ -130,8 +137,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public double FontSize
         {
-            get => TextBlock.GetFontSize(this);
-            set => TextBlock.SetFontSize(this, value);
+            get => TextElement.GetFontSize(this);
+            set => TextElement.SetFontSize(this, value);
         }
 
         /// <summary>
@@ -139,8 +146,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public FontStyle FontStyle
         {
-            get => TextBlock.GetFontStyle(this);
-            set => TextBlock.SetFontStyle(this, value);
+            get => TextElement.GetFontStyle(this);
+            set => TextElement.SetFontStyle(this, value);
         }
 
         /// <summary>
@@ -148,8 +155,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public FontWeight FontWeight
         {
-            get => TextBlock.GetFontWeight(this);
-            set => TextBlock.SetFontWeight(this, value);
+            get => TextElement.GetFontWeight(this);
+            set => TextElement.SetFontWeight(this, value);
         }
 
         /// <summary>
@@ -157,8 +164,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public FontStretch FontStretch
         {
-            get => TextBlock.GetFontStretch(this);
-            set => TextBlock.SetFontStretch(this, value);
+            get => TextElement.GetFontStretch(this);
+            set => TextElement.SetFontStretch(this, value);
         }
 
         /// <summary>
@@ -166,8 +173,8 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         public IBrush? Foreground
         {
-            get => TextBlock.GetForeground(this);
-            set => TextBlock.SetForeground(this, value);
+            get => TextElement.GetForeground(this);
+            set => TextElement.SetForeground(this, value);
         }
 
         /// <summary>
@@ -178,6 +185,15 @@ namespace Avalonia.Controls.Presenters
             get => GetValue(TextWrappingProperty);
             set => SetValue(TextWrappingProperty, value);
         }
+        
+        /// <summary>
+        /// Gets or sets the line height. By default, this is set to <see cref="double.NaN"/>, which determines the appropriate height automatically.
+        /// </summary>
+        public double LineHeight
+        {
+            get => GetValue(LineHeightProperty);
+            set => SetValue(LineHeightProperty, value);
+        }
 
         /// <summary>
         /// Gets or sets the text alignment.
@@ -252,7 +268,7 @@ namespace Avalonia.Controls.Presenters
             get => GetValue(CaretBrushProperty);
             set => SetValue(CaretBrushProperty, value);
         }
-
+        
         public int SelectionStart
         {
             get
@@ -280,6 +296,8 @@ namespace Avalonia.Controls.Presenters
                 SetAndRaise(SelectionEndProperty, ref _selectionEnd, value);
             }
         }
+        
+        protected override bool BypassFlowDirectionPolicies => true;
 
         /// <summary>
         /// Creates the <see cref="TextLayout"/> used to render the text.
@@ -298,7 +316,7 @@ namespace Avalonia.Controls.Presenters
             
             var textLayout = new TextLayout(text, typeface, FontSize, foreground, TextAlignment,
                 TextWrapping, maxWidth: maxWidth, maxHeight: maxHeight, textStyleOverrides: textStyleOverrides, 
-                flowDirection: FlowDirection);
+                flowDirection: FlowDirection, lineHeight: LineHeight);
 
             return textLayout;
         }
@@ -353,7 +371,7 @@ namespace Avalonia.Controls.Presenters
 
                 foreach (var rect in rects)
                 {
-                    context.FillRectangle(selectionBrush, rect);
+                    context.FillRectangle(selectionBrush, PixelRect.FromRect(rect, 1).ToRect(1));
                 }
             }
 
@@ -508,29 +526,35 @@ namespace Avalonia.Controls.Presenters
             
             InvalidateMeasure();
         }
-        
+
+
         protected override Size MeasureOverride(Size availableSize)
         {
             _constraint = availableSize;
-            
+
             _textLayout = null;
-            
+
             InvalidateArrange();
 
-            var measuredSize = PixelSize.FromSize(TextLayout.Bounds.Size, 1);
-            
-            return new Size(measuredSize.Width, measuredSize.Height);
+            var measuredSize = TextLayout.Bounds.Size;
+
+            return measuredSize;
         }
 
         protected override Size ArrangeOverride(Size finalSize)
         {
+            if (finalSize.Width < TextLayout.Bounds.Width)
+            {
+                finalSize = finalSize.WithWidth(TextLayout.Bounds.Width);
+            }
+
             if (MathUtilities.AreClose(_constraint.Width, finalSize.Width))
             {
                 return finalSize;
             }
-            
-            _constraint = finalSize;
-                
+
+            _constraint = new Size(finalSize.Width, double.PositiveInfinity);
+
             _textLayout = null;
 
             return finalSize;
@@ -637,14 +661,7 @@ namespace Avalonia.Controls.Presenters
             if (Text is null)
             {
                 return default;
-            }
-            
-            if (FlowDirection == FlowDirection.RightToLeft)
-            {
-                direction = direction == LogicalDirection.Forward ?
-                    LogicalDirection.Backward :
-                    LogicalDirection.Forward;
-            }
+            }          
 
             var characterHit = _lastCharacterHit;
             var caretIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
@@ -666,7 +683,7 @@ namespace Avalonia.Controls.Presenters
 
                     caretIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
 
-                    if (textLine.NewLineLength > 0 && caretIndex == textLine.TextRange.Start + textLine.TextRange.Length)
+                    if (textLine.TrailingWhitespaceLength > 0 && caretIndex == textLine.FirstTextSourceIndex + textLine.Length)
                     {
                         characterHit = new CharacterHit(caretIndex);
                     }
@@ -678,7 +695,7 @@ namespace Avalonia.Controls.Presenters
                         break;
                     }
 
-                    if (caretIndex - textLine.NewLineLength == textLine.TextRange.Start + textLine.TextRange.Length)
+                    if (caretIndex - textLine.NewLineLength == textLine.FirstTextSourceIndex + textLine.Length)
                     {
                         break;
                     }
@@ -719,6 +736,13 @@ namespace Avalonia.Controls.Presenters
         
         public void MoveCaretHorizontal(LogicalDirection direction = LogicalDirection.Forward)
         {
+            if (FlowDirection == FlowDirection.RightToLeft)
+            {
+                direction = direction == LogicalDirection.Forward ?
+                    LogicalDirection.Backward :
+                    LogicalDirection.Forward;
+            }
+
             var characterHit = GetNextCharacterHit(direction);
 
             UpdateCaret(characterHit);
@@ -773,25 +797,31 @@ namespace Avalonia.Controls.Presenters
             _caretTimer.Tick -= CaretTimerTick;
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
             
             switch (change.Property.Name)
             {
-                case nameof (TextBlock.Foreground):
-                case nameof (TextBlock.FontSize):
-                case nameof (TextBlock.FontStyle):
-                case nameof (TextBlock.FontWeight):
-                case nameof (TextBlock.FontFamily):
+                case nameof (Foreground):
+                case nameof (FontSize):
+                case nameof (FontStyle):
+                case nameof (FontWeight):
+                case nameof (FontFamily):
+                case nameof (FontStretch):
+
                 case nameof (Text):
                 case nameof (TextAlignment):
                 case nameof (TextWrapping):
+
                 case nameof (SelectionStart):
                 case nameof (SelectionEnd):
                 case nameof (SelectionForegroundBrush):
+
                 case nameof (PasswordChar):
                 case nameof (RevealPassword):
+
+                case nameof(FlowDirection):
                 {
                     InvalidateTextLayout();
                     break;
diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index 353f12118f..5ad4e39baf 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -69,15 +69,18 @@ namespace Avalonia.Controls.Primitives
         {
             foreach (var child in Children)
             {
-                var info = child.GetValue(s_adornedElementInfoProperty);
-
-                if (info != null && info.Bounds.HasValue)
-                {
-                    child.Measure(info.Bounds.Value.Bounds.Size);
-                }
-                else
+                if (child is AvaloniaObject ao)
                 {
-                    child.Measure(availableSize);
+                    var info = ao.GetValue(s_adornedElementInfoProperty);
+
+                    if (info != null && info.Bounds.HasValue)
+                    {
+                        child.Measure(info.Bounds.Value.Bounds.Size);
+                    }
+                    else
+                    {
+                        child.Measure(availableSize);
+                    }
                 }
             }
 
@@ -88,19 +91,22 @@ namespace Avalonia.Controls.Primitives
         {
             foreach (var child in Children)
             {
-                var info = child.GetValue(s_adornedElementInfoProperty);
-                var isClipEnabled = child.GetValue(IsClipEnabledProperty);
-
-                if (info != null && info.Bounds.HasValue)
-                {
-                    child.RenderTransform = new MatrixTransform(info.Bounds.Value.Transform);
-                    child.RenderTransformOrigin = new RelativePoint(new Point(0,0), RelativeUnit.Absolute);
-                    UpdateClip(child, info.Bounds.Value, isClipEnabled);
-                    child.Arrange(info.Bounds.Value.Bounds);
-                }
-                else
+                if (child is AvaloniaObject ao)
                 {
-                    child.Arrange(new Rect(finalSize));
+                    var info = ao.GetValue(s_adornedElementInfoProperty);
+                    var isClipEnabled = ao.GetValue(IsClipEnabledProperty);
+
+                    if (info != null && info.Bounds.HasValue)
+                    {
+                        child.RenderTransform = new MatrixTransform(info.Bounds.Value.Transform);
+                        child.RenderTransformOrigin = new RelativePoint(new Point(0, 0), RelativeUnit.Absolute);
+                        UpdateClip(child, info.Bounds.Value, isClipEnabled);
+                        child.Arrange(info.Bounds.Value.Bounds);
+                    }
+                    else
+                    {
+                        ArrangeChild((Control) child, finalSize);
+                    }
                 }
             }
 
diff --git a/src/Avalonia.Controls/Primitives/IPopupHost.cs b/src/Avalonia.Controls/Primitives/IPopupHost.cs
index 36d2ae9230..bd2aa39621 100644
--- a/src/Avalonia.Controls/Primitives/IPopupHost.cs
+++ b/src/Avalonia.Controls/Primitives/IPopupHost.cs
@@ -2,6 +2,8 @@ using System;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Input;
+using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
@@ -14,19 +16,54 @@ namespace Avalonia.Controls.Primitives
     /// (<see cref="PopupRoot"/>) or an <see cref="OverlayPopupHost"/> which is created
     /// on an <see cref="OverlayLayer"/>.
     /// </remarks>
+    [NotClientImplementable]
     public interface IPopupHost : IDisposable, IFocusScope
     {
         /// <summary>
-        /// Sets the control to display in the popup.
+        /// Gets or sets the fixed width of the popup.
         /// </summary>
-        /// <param name="control"></param>
-        void SetChild(IControl? control);
+        double Width { get; set; }
+
+        /// <summary>
+        /// Gets or sets the minimum width of the popup.
+        /// </summary>
+        double MinWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum width of the popup.
+        /// </summary>
+        double MaxWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fixed height of the popup.
+        /// </summary>
+        double Height { get; set; }
+
+        /// <summary>
+        /// Gets or sets the minimum height of the popup.
+        /// </summary>
+        double MinHeight { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum height of the popup.
+        /// </summary>
+        double MaxHeight { get; set; }
 
         /// <summary>
         /// Gets the presenter from the control's template.
         /// </summary>
         IContentPresenter? Presenter { get; }
 
+        /// <summary>
+        /// Gets or sets whether the popup appears on top of all other windows.
+        /// </summary>
+        bool Topmost { get; set; }
+
+        /// <summary>
+        /// Gets or sets a transform that will be applied to the popup.
+        /// </summary>
+        Transform? Transform { get; set; }
+
         /// <summary>
         /// Gets the root of the visual tree in the case where the popup is presented using a
         /// separate visual tree.
@@ -57,6 +94,12 @@ namespace Avalonia.Controls.Primitives
             PopupPositionerConstraintAdjustment constraintAdjustment = PopupPositionerConstraintAdjustment.All,
             Rect? rect = null);
 
+        /// <summary>
+        /// Sets the control to display in the popup.
+        /// </summary>
+        /// <param name="control"></param>
+        void SetChild(IControl? control);
+
         /// <summary>
         /// Shows the popup.
         /// </summary>
@@ -66,14 +109,5 @@ namespace Avalonia.Controls.Primitives
         /// Hides the popup.
         /// </summary>
         void Hide();
-
-        /// <summary>
-        /// Binds the constraints of the popup host to a set of properties, usally those present on
-        /// <see cref="Popup"/>.
-        /// </summary>
-        IDisposable BindConstraints(AvaloniaObject popup, StyledProperty<double> widthProperty,
-            StyledProperty<double> minWidthProperty, StyledProperty<double> maxWidthProperty,
-            StyledProperty<double> heightProperty, StyledProperty<double> minHeightProperty,
-            StyledProperty<double> maxHeightProperty, StyledProperty<bool> topmostProperty);
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/OverlayLayer.cs b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
index 6a0408d6d1..468879edd1 100644
--- a/src/Avalonia.Controls/Primitives/OverlayLayer.cs
+++ b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
@@ -23,7 +23,14 @@ namespace Avalonia.Controls.Primitives
         }
 
         public bool HitTest(Point point) => Children.HitTestCustom(point);
-        
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            foreach (Control child in Children)
+                child.Measure(availableSize);
+            return availableSize;
+        }
+
         protected override Size ArrangeOverride(Size finalSize)
         {
             // We are saving it here since child controls might need to know the entire size of the overlay
diff --git a/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs b/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
index 6251d5cda7..4765718c3b 100644
--- a/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
+++ b/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
@@ -11,6 +11,12 @@ namespace Avalonia.Controls.Primitives
 {
     public class OverlayPopupHost : ContentControl, IPopupHost, IInteractive, IManagedPopupPositionerPopup
     {
+        /// <summary>
+        /// Defines the <see cref="Transform"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Transform?> TransformProperty =
+            PopupRoot.TransformProperty.AddOwner<OverlayPopupHost>();
+
         private readonly OverlayLayer _overlayLayer;
         private PopupPositionerParameters _positionerParameters = new PopupPositionerParameters();
         private ManagedPopupPositioner _positioner;
@@ -29,10 +35,22 @@ namespace Avalonia.Controls.Primitives
         }
 
         public IVisual? HostedVisualTreeRoot => null;
-        
+
+        public Transform? Transform
+        {
+            get => GetValue(TransformProperty);
+            set => SetValue(TransformProperty, value);
+        }
+
         /// <inheritdoc/>
         IInteractive? IInteractive.InteractiveParent => Parent;
 
+        bool IPopupHost.Topmost
+        {
+            get => false;
+            set { /* Not currently supported in overlay popups */ }
+        }
+
         public void Dispose() => Hide();
 
 
@@ -48,35 +66,13 @@ namespace Avalonia.Controls.Primitives
             _shown = false;
         }
 
-        public IDisposable BindConstraints(AvaloniaObject popup, StyledProperty<double> widthProperty, StyledProperty<double> minWidthProperty,
-            StyledProperty<double> maxWidthProperty, StyledProperty<double> heightProperty, StyledProperty<double> minHeightProperty,
-            StyledProperty<double> maxHeightProperty, StyledProperty<bool> topmostProperty)
-        {
-            // Topmost property is not supported
-            var bindings = new List<IDisposable>();
-
-            void Bind(AvaloniaProperty what, AvaloniaProperty to) => bindings.Add(this.Bind(what, popup[~to]));
-            Bind(WidthProperty, widthProperty);
-            Bind(MinWidthProperty, minWidthProperty);
-            Bind(MaxWidthProperty, maxWidthProperty);
-            Bind(HeightProperty, heightProperty);
-            Bind(MinHeightProperty, minHeightProperty);
-            Bind(MaxHeightProperty, maxHeightProperty);
-            
-            return Disposable.Create(() =>
-            {
-                foreach (var x in bindings)
-                    x.Dispose();
-            });
-        }
-
         public void ConfigurePosition(IVisual target, PlacementMode placement, Point offset,
             PopupAnchor anchor = PopupAnchor.None, PopupGravity gravity = PopupGravity.None,
             PopupPositionerConstraintAdjustment constraintAdjustment = PopupPositionerConstraintAdjustment.All,
             Rect? rect = null)
         {
             _positionerParameters.ConfigurePosition((TopLevel)_overlayLayer.GetVisualRoot()!, target, placement, offset, anchor,
-                gravity, constraintAdjustment, rect);
+                gravity, constraintAdjustment, rect, FlowDirection);
             UpdatePosition();
         }
 
diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index bb546107e0..95e5e25c42 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -14,6 +14,8 @@ using Avalonia.LogicalTree;
 using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.VisualTree;
+using Avalonia.Media;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -25,7 +27,7 @@ namespace Avalonia.Controls.Primitives
 #pragma warning restore CS0612 // Type or member is obsolete
     {
         public static readonly StyledProperty<bool> WindowManagerAddShadowHintProperty =
-            AvaloniaProperty.Register<PopupRoot, bool>(nameof(WindowManagerAddShadowHint), false);
+            AvaloniaProperty.Register<Popup, bool>(nameof(WindowManagerAddShadowHint), false);
 
         /// <summary>
         /// Defines the <see cref="Child"/> property.
@@ -33,6 +35,12 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<Control?> ChildProperty =
             AvaloniaProperty.Register<Popup, Control?>(nameof(Child));
 
+        /// <summary>
+        /// Defines the <see cref="InheritsTransform"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> InheritsTransformProperty =
+            AvaloniaProperty.Register<Popup, bool>(nameof(InheritsTransform));
+
         /// <summary>
         /// Defines the <see cref="IsOpen"/> property.
         /// </summary>
@@ -196,6 +204,16 @@ namespace Avalonia.Controls.Primitives
             set;
         }
 
+        /// <summary>
+        /// Gets or sets a value that determines whether the popup inherits the render transform
+        /// from its <see cref="PlacementTarget"/>. Defaults to false.
+        /// </summary>
+        public bool InheritsTransform
+        {
+            get => GetValue(InheritsTransformProperty);
+            set => SetValue(InheritsTransformProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets a value that determines how the <see cref="Popup"/> can be dismissed.
         /// </summary>
@@ -395,24 +413,29 @@ namespace Avalonia.Controls.Primitives
             }
 
             _isOpenRequested = false;
-            var popupHost = OverlayPopupHost.CreatePopupHost(placementTarget, DependencyResolver);
 
+            var popupHost = OverlayPopupHost.CreatePopupHost(placementTarget, DependencyResolver);
             var handlerCleanup = new CompositeDisposable(7);
 
-            popupHost.BindConstraints(this, WidthProperty, MinWidthProperty, MaxWidthProperty,
-                HeightProperty, MinHeightProperty, MaxHeightProperty, TopmostProperty).DisposeWith(handlerCleanup);
-
+            UpdateHostSizing(popupHost, topLevel, placementTarget);
+            popupHost.Topmost = Topmost;
             popupHost.SetChild(Child);
             ((ISetLogicalParent)popupHost).SetParent(this);
 
-            popupHost.ConfigurePosition(
-                placementTarget,
-                PlacementMode,
-                new Point(HorizontalOffset, VerticalOffset),
-                PlacementAnchor,
-                PlacementGravity,
-                PlacementConstraintAdjustment,
-                PlacementRect);
+            if (InheritsTransform && placementTarget is Control c)
+            {
+                SubscribeToEventHandler<Control, EventHandler<AvaloniaPropertyChangedEventArgs>>(
+                    c,
+                    PlacementTargetPropertyChanged,
+                    (x, handler) => x.PropertyChanged += handler,
+                    (x, handler) => x.PropertyChanged -= handler).DisposeWith(handlerCleanup);
+            }
+            else
+            {
+                popupHost.Transform = null;
+            }
+
+            UpdateHostPosition(popupHost, placementTarget);
 
             SubscribeToEventHandler<IPopupHost, EventHandler<TemplateAppliedEventArgs>>(popupHost, RootTemplateApplied,
                 (x, handler) => x.TemplateApplied += handler,
@@ -494,7 +517,7 @@ namespace Avalonia.Controls.Primitives
                 }
             }
 
-            _openState = new PopupOpenState(topLevel, popupHost, cleanupPopup);
+            _openState = new PopupOpenState(placementTarget, topLevel, popupHost, cleanupPopup);
 
             WindowManagerAddShadowHintChanged(popupHost, WindowManagerAddShadowHint);
 
@@ -542,7 +565,93 @@ namespace Avalonia.Controls.Primitives
             base.OnDetachedFromLogicalTree(e);
             Close();
         }
-        
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (_openState is not null)
+            {
+                if (change.Property == WidthProperty ||
+                    change.Property == MinWidthProperty ||
+                    change.Property == MaxWidthProperty ||
+                    change.Property == HeightProperty ||
+                    change.Property == MinHeightProperty ||
+                    change.Property == MaxHeightProperty)
+                {
+                    UpdateHostSizing(_openState.PopupHost, _openState.TopLevel, _openState.PlacementTarget);
+                }
+                else if (change.Property == PlacementTargetProperty ||
+                         change.Property == PlacementModeProperty ||
+                         change.Property == HorizontalOffsetProperty ||
+                         change.Property == VerticalOffsetProperty ||
+                         change.Property == PlacementAnchorProperty ||
+                         change.Property == PlacementConstraintAdjustmentProperty ||
+                         change.Property == PlacementRectProperty)
+                {
+                    if (change.Property == PlacementTargetProperty)
+                    {
+                        var newTarget = change.GetNewValue<Control?>() ?? this.FindLogicalAncestorOfType<IControl>();
+
+                        if (newTarget is null || newTarget.GetVisualRoot() != _openState.TopLevel)
+                        {
+                            Close();
+                            return;
+                        }
+
+                        _openState.PlacementTarget = newTarget;
+                    }
+
+                    UpdateHostPosition(_openState.PopupHost, _openState.PlacementTarget);
+                }
+                else if (change.Property == TopmostProperty)
+                {
+                    _openState.PopupHost.Topmost = change.GetNewValue<bool>();
+                }
+            }
+        }
+
+        private void UpdateHostPosition(IPopupHost popupHost, IControl placementTarget)
+        {
+            popupHost.ConfigurePosition(
+                placementTarget,
+                PlacementMode,
+                new Point(HorizontalOffset, VerticalOffset),
+                PlacementAnchor,
+                PlacementGravity,
+                PlacementConstraintAdjustment,
+                PlacementRect ?? new Rect(default, placementTarget.Bounds.Size));
+        }
+
+        private void UpdateHostSizing(IPopupHost popupHost, TopLevel topLevel, IControl placementTarget)
+        {
+            var scaleX = 1.0;
+            var scaleY = 1.0;
+
+            if (InheritsTransform && placementTarget.TransformToVisual(topLevel) is Matrix m)
+            {
+                scaleX = Math.Sqrt(m.M11 * m.M11 + m.M12 * m.M12);
+                scaleY = Math.Sqrt(m.M11 * m.M11 + m.M12 * m.M12);
+
+                // Ideally we'd only assign a ScaleTransform here when the scale != 1, but there's
+                // an issue with LayoutTransformControl in that it sets its LayoutTransform property
+                // with LocalValue priority in ArrangeOverride in certain cases when LayoutTransform
+                // is null, which breaks TemplateBindings to this property. Offending commit/line:
+                //
+                // https://github.com/AvaloniaUI/Avalonia/commit/6fbe1c2180ef45a940e193f1b4637e64eaab80ed#diff-5344e793df13f462126a8153ef46c44194f244b6890f25501709bae51df97f82R54
+                popupHost.Transform = new ScaleTransform(scaleX, scaleY);
+            }
+            else
+            {
+                popupHost.Transform = null;
+            }
+
+            popupHost.Width = Width * scaleX;
+            popupHost.MinWidth = MinWidth * scaleX;
+            popupHost.MaxWidth = MaxWidth * scaleX;
+            popupHost.Height = Height * scaleY;
+            popupHost.MinHeight = MinHeight * scaleY;
+            popupHost.MaxHeight = MaxHeight * scaleY;
+        }
+
         private void HandlePositionChange()
         {
             if (_openState != null)
@@ -824,6 +933,14 @@ namespace Avalonia.Controls.Primitives
             }
         }
         
+        private void PlacementTargetPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            if (_openState is not null && e.Property == Visual.TransformedBoundsProperty)
+            {
+                UpdateHostSizing(_openState.PopupHost, _openState.TopLevel, _openState.PlacementTarget);
+            }
+        }
+
         private void WindowLostFocus()
         {
             if (IsLightDismissEnabled)
@@ -862,15 +979,16 @@ namespace Avalonia.Controls.Primitives
             private readonly IDisposable _cleanup;
             private IDisposable? _presenterCleanup;
 
-            public PopupOpenState(TopLevel topLevel, IPopupHost popupHost, IDisposable cleanup)
+            public PopupOpenState(IControl placementTarget, TopLevel topLevel, IPopupHost popupHost, IDisposable cleanup)
             {
+                PlacementTarget = placementTarget;
                 TopLevel = topLevel;
                 PopupHost = popupHost;
                 _cleanup = cleanup;
             }
 
             public TopLevel TopLevel { get; }
-
+            public IControl PlacementTarget { get; set; }
             public IPopupHost PopupHost { get; }
 
             public void SetPresenterSubscription(IDisposable? presenterCleanup)
diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs
index 340076a407..8d35a91e00 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs
@@ -45,7 +45,9 @@ Copyright © 2019 Nikita Tsukanov
 */
 
 using System;
+using Avalonia.Metadata;
 using Avalonia.VisualTree;
+using Avalonia.Media;
 
 namespace Avalonia.Controls.Primitives.PopupPositioning
 {
@@ -60,6 +62,7 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
     /// requirement that a popup must intersect with or be at least partially adjacent to its parent
     /// surface.
     /// </remarks>
+    [Unstable]
     public struct PopupPositionerParameters
     {
         private PopupGravity _gravity;
@@ -428,6 +431,7 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
     /// managed implementation is provided in <see cref="ManagedPopupPositioner"/> for platforms
     /// on which popups can be arbitrarily positioned.
     /// </remarks>
+    [NotClientImplementable]
     public interface IPopupPositioner
     {
         /// <summary>
@@ -438,13 +442,15 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
         void Update(PopupPositionerParameters parameters);
     }
 
+    [Unstable]
     static class PopupPositionerExtensions
     {
         public static void ConfigurePosition(ref this PopupPositionerParameters positionerParameters,
             TopLevel topLevel,
             IVisual target, PlacementMode placement, Point offset,
             PopupAnchor anchor, PopupGravity gravity,
-            PopupPositionerConstraintAdjustment constraintAdjustment, Rect? rect)
+            PopupPositionerConstraintAdjustment constraintAdjustment, Rect? rect,
+            FlowDirection flowDirection)
         {
             // We need a better way for tracking the last pointer position
 #pragma warning disable CS0618 // Type or member is obsolete
@@ -503,6 +509,32 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
                 else
                     throw new InvalidOperationException("Invalid value for Popup.PlacementMode");
             }
+
+            // Invert coordinate system if FlowDirection is RTL
+            if (flowDirection == FlowDirection.RightToLeft)
+            {
+                if ((positionerParameters.Anchor & PopupAnchor.Right) == PopupAnchor.Right)
+                {
+                    positionerParameters.Anchor ^= PopupAnchor.Right;
+                    positionerParameters.Anchor |= PopupAnchor.Left;
+                }
+                else if ((positionerParameters.Anchor & PopupAnchor.Left) == PopupAnchor.Left)
+                {
+                    positionerParameters.Anchor ^= PopupAnchor.Left;
+                    positionerParameters.Anchor |= PopupAnchor.Right;
+                }
+
+                if ((positionerParameters.Gravity & PopupGravity.Right) == PopupGravity.Right)
+                {
+                    positionerParameters.Gravity ^= PopupGravity.Right;
+                    positionerParameters.Gravity |= PopupGravity.Left;
+                }
+                else if ((positionerParameters.Gravity & PopupGravity.Left) == PopupGravity.Left)
+                {
+                    positionerParameters.Gravity ^= PopupGravity.Left;
+                    positionerParameters.Gravity |= PopupGravity.Right;
+                }
+            }
         }
     }
 
diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
index 0f0dd7311d..a80a60350e 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
@@ -106,9 +106,9 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
             {
                 var screens = _popup.Screens;
                 
-                var targetScreen = screens.FirstOrDefault(s => s.Bounds.Contains(anchorRect.TopLeft))
+                var targetScreen =  screens.FirstOrDefault(s => s.Bounds.ContainsExclusive(anchorRect.TopLeft))
                                    ?? screens.FirstOrDefault(s => s.Bounds.Intersects(anchorRect))
-                                   ?? screens.FirstOrDefault(s => s.Bounds.Contains(parentGeometry.TopLeft))
+                                   ?? screens.FirstOrDefault(s => s.Bounds.ContainsExclusive(parentGeometry.TopLeft))
                                    ?? screens.FirstOrDefault(s => s.Bounds.Intersects(parentGeometry))
                                    ?? screens.FirstOrDefault();
 
diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs
index 91ed5d975d..51a21323d9 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs
@@ -23,8 +23,9 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
 
         public IReadOnlyList<ManagedPopupPositionerScreenInfo> Screens =>
 
-            _parent.Screen.AllScreens.Select(s => new ManagedPopupPositionerScreenInfo(
-                s.Bounds.ToRect(1), s.WorkingArea.ToRect(1))).ToList();
+            _parent.Screen.AllScreens
+                .Select(s => new ManagedPopupPositionerScreenInfo(s.Bounds.ToRect(1), s.WorkingArea.ToRect(1)))
+                .ToArray();
 
         public Rect ParentClientAreaScreenGeometry
         {
diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index 2f6df862cf..f7bf7c1a27 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Reactive.Disposables;
 using Avalonia.Automation.Peers;
 using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Interactivity;
@@ -8,7 +6,6 @@ using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
-using JetBrains.Annotations;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -17,7 +14,12 @@ namespace Avalonia.Controls.Primitives
     /// </summary>
     public sealed class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IStyleHost, IPopupHost
     {
-        private readonly TopLevel _parent;
+        /// <summary>
+        /// Defines the <see cref="Transform"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Transform?> TransformProperty =
+            AvaloniaProperty.Register<PopupRoot, Transform?>(nameof(Transform));
+
         private PopupPositionerParameters _positionerParameters;        
 
         /// <summary>
@@ -47,7 +49,7 @@ namespace Avalonia.Controls.Primitives
         public PopupRoot(TopLevel parent, IPopupImpl impl, IAvaloniaDependencyResolver? dependencyResolver)
             : base(impl, dependencyResolver)
         {
-            _parent = parent;
+            ParentTopLevel = parent;
         }
 
         /// <summary>
@@ -55,6 +57,15 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public new IPopupImpl? PlatformImpl => (IPopupImpl?)base.PlatformImpl;               
 
+        /// <summary>
+        /// Gets or sets a transform that will be applied to the popup.
+        /// </summary>
+        public Transform? Transform
+        {
+            get => GetValue(TransformProperty);
+            set => SetValue(TransformProperty, value);
+        }
+
         /// <summary>
         /// Gets the parent control in the event route.
         /// </summary>
@@ -73,6 +84,8 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         IStyleHost? IStyleHost.StylingParent => Parent;
 
+        public TopLevel ParentTopLevel { get; }
+
         /// <inheritdoc/>
         public void Dispose()
         {
@@ -91,8 +104,8 @@ namespace Avalonia.Controls.Primitives
             PopupPositionerConstraintAdjustment constraintAdjustment = PopupPositionerConstraintAdjustment.All,
             Rect? rect = null)
         {
-            _positionerParameters.ConfigurePosition(_parent, target,
-                placement, offset, anchor, gravity, constraintAdjustment, rect);
+            _positionerParameters.ConfigurePosition(ParentTopLevel, target,
+                placement, offset, anchor, gravity, constraintAdjustment, rect, FlowDirection);
 
             if (_positionerParameters.Size != default)
                 UpdatePosition();
@@ -102,27 +115,6 @@ namespace Avalonia.Controls.Primitives
 
         IVisual IPopupHost.HostedVisualTreeRoot => this;
         
-        public IDisposable BindConstraints(AvaloniaObject popup, StyledProperty<double> widthProperty, StyledProperty<double> minWidthProperty,
-            StyledProperty<double> maxWidthProperty, StyledProperty<double> heightProperty, StyledProperty<double> minHeightProperty,
-            StyledProperty<double> maxHeightProperty, StyledProperty<bool> topmostProperty)
-        {
-            var bindings = new List<IDisposable>();
-
-            void Bind(AvaloniaProperty what, AvaloniaProperty to) => bindings.Add(this.Bind(what, popup[~to]));
-            Bind(WidthProperty, widthProperty);
-            Bind(MinWidthProperty, minWidthProperty);
-            Bind(MaxWidthProperty, maxWidthProperty);
-            Bind(HeightProperty, heightProperty);
-            Bind(MinHeightProperty, minHeightProperty);
-            Bind(MaxHeightProperty, maxHeightProperty);
-            Bind(TopmostProperty, topmostProperty);
-            return Disposable.Create(() =>
-            {
-                foreach (var x in bindings)
-                    x.Dispose();
-            });
-        }
-
         protected override Size MeasureOverride(Size availableSize)
         {
             var maxAutoSize = PlatformImpl?.MaxAutoSizeHint ?? Size.Infinity;
diff --git a/src/Avalonia.Controls/Primitives/ScrollBar.cs b/src/Avalonia.Controls/Primitives/ScrollBar.cs
index 8460fe3017..e5c3392faf 100644
--- a/src/Avalonia.Controls/Primitives/ScrollBar.cs
+++ b/src/Avalonia.Controls/Primitives/ScrollBar.cs
@@ -22,6 +22,10 @@ namespace Avalonia.Controls.Primitives
     /// <summary>
     /// A scrollbar control.
     /// </summary>
+    [TemplatePart("PART_LineDownButton", typeof(Button))]
+    [TemplatePart("PART_LineUpButton",   typeof(Button))]
+    [TemplatePart("PART_PageDownButton", typeof(Button))]
+    [TemplatePart("PART_PageUpButton",   typeof(Button))]
     [PseudoClasses(":vertical", ":horizontal")]
     public class ScrollBar : RangeBase
     {
@@ -190,13 +194,13 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == OrientationProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Orientation>());
+                UpdatePseudoClasses(change.GetNewValue<Orientation>());
             }
             else if (change.Property == AllowAutoHideProperty)
             {
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index c690726e71..ea20247b4b 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -94,7 +94,7 @@ namespace Avalonia.Controls.Primitives
         /// Defines the <see cref="IsTextSearchEnabled"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsTextSearchEnabledProperty =
-            AvaloniaProperty.Register<ItemsControl, bool>(nameof(IsTextSearchEnabled), false);
+            AvaloniaProperty.Register<SelectingItemsControl, bool>(nameof(IsTextSearchEnabled), false);
 
         /// <summary>
         /// Event that should be raised by items that implement <see cref="ISelectable"/> to
@@ -111,14 +111,14 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public static readonly RoutedEvent<SelectionChangedEventArgs> SelectionChangedEvent =
             RoutedEvent.Register<SelectingItemsControl, SelectionChangedEventArgs>(
-                "SelectionChanged",
+                nameof(SelectionChanged),
                 RoutingStrategies.Bubble);
 
         /// <summary>
         /// Defines the <see cref="WrapSelection"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> WrapSelectionProperty =
-            AvaloniaProperty.Register<ItemsControl, bool>(nameof(WrapSelection), defaultValue: false);
+            AvaloniaProperty.Register<SelectingItemsControl, bool>(nameof(WrapSelection), defaultValue: false);
 
         private static readonly IList Empty = Array.Empty<object>();
         private string _textSearchTerm = string.Empty;
@@ -292,11 +292,11 @@ namespace Avalonia.Controls.Primitives
                             "collection is different to the Items on the control.");
                     }
 
-                    var oldSelection = _selection?.SelectedItems.ToList();
+                    var oldSelection = _selection?.SelectedItems.ToArray();
                     DeinitializeSelectionModel(_selection);
                     _selection = value;
 
-                    if (oldSelection?.Count > 0)
+                    if (oldSelection?.Length > 0)
                     {
                         RaiseEvent(new SelectionChangedEventArgs(
                             SelectionChangedEvent,
@@ -501,12 +501,16 @@ namespace Avalonia.Controls.Primitives
         /// enabled.
         /// </summary>
         /// <param name="property">The property.</param>
-        /// <param name="value">The new binding value for the property.</param>
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        /// <param name="state">The current data binding state.</param>
+        /// <param name="error">The current data binding error, if any.</param>
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
             if (property == SelectedItemProperty)
             {
-                DataValidationErrors.SetError(this, value.Error);
+                DataValidationErrors.SetError(this, error);
             }
         }
         
@@ -533,9 +537,9 @@ namespace Avalonia.Controls.Primitives
 
                 bool Match(ItemContainerInfo info)
                 {
-                    if (info.ContainerControl.IsSet(TextSearch.TextProperty))
+                    if (info.ContainerControl is AvaloniaObject ao && ao.IsSet(TextSearch.TextProperty))
                     {
-                        var searchText = info.ContainerControl.GetValue(TextSearch.TextProperty);
+                        var searchText = ao.GetValue(TextSearch.TextProperty);
 
                         if (searchText?.StartsWith(_textSearchTerm, StringComparison.OrdinalIgnoreCase) == true)
                         {
@@ -585,7 +589,7 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -595,7 +599,7 @@ namespace Avalonia.Controls.Primitives
             }
             if (change.Property == ItemsProperty && _updateState is null && _selection is object)
             {
-                var newValue = change.NewValue.GetValueOrDefault<IEnumerable>();
+                var newValue = change.GetNewValue<IEnumerable>();
                 _selection.Source = newValue;
 
                 if (newValue is null)
@@ -605,7 +609,7 @@ namespace Avalonia.Controls.Primitives
             }
             else if (change.Property == SelectionModeProperty && _selection is object)
             {
-                var newValue = change.NewValue.GetValueOrDefault<SelectionMode>();
+                var newValue = change.GetNewValue<SelectionMode>();
                 _selection.SingleSelect = !newValue.HasAllFlags(SelectionMode.Multiple);
             }
             else if (change.Property == WrapSelectionProperty)
@@ -845,8 +849,8 @@ namespace Avalonia.Controls.Primitives
             {
                 var ev = new SelectionChangedEventArgs(
                     SelectionChangedEvent,
-                    e.DeselectedItems.ToList(),
-                    e.SelectedItems.ToList());
+                    e.DeselectedItems.ToArray(),
+                    e.SelectedItems.ToArray());
                 RaiseEvent(ev);
             }
         }
@@ -988,7 +992,7 @@ namespace Avalonia.Controls.Primitives
                 RaiseEvent(new SelectionChangedEventArgs(
                     SelectionChangedEvent,
                     Array.Empty<object>(),
-                    Selection.SelectedItems.ToList()));
+                    Selection.SelectedItems.ToArray()));
             }
         }
 
diff --git a/src/Avalonia.Controls/Primitives/TemplatedControl.cs b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
index af681d6930..db029d38c0 100644
--- a/src/Avalonia.Controls/Primitives/TemplatedControl.cs
+++ b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Controls.Documents;
 using Avalonia.Controls.Templates;
 using Avalonia.Interactivity;
 using Avalonia.Logging;
@@ -41,31 +42,37 @@ namespace Avalonia.Controls.Primitives
         /// Defines the <see cref="FontFamily"/> property.
         /// </summary>
         public static readonly StyledProperty<FontFamily> FontFamilyProperty =
-            TextBlock.FontFamilyProperty.AddOwner<TemplatedControl>();
+            TextElement.FontFamilyProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
         /// Defines the <see cref="FontSize"/> property.
         /// </summary>
         public static readonly StyledProperty<double> FontSizeProperty =
-            TextBlock.FontSizeProperty.AddOwner<TemplatedControl>();
+            TextElement.FontSizeProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
         /// Defines the <see cref="FontStyle"/> property.
         /// </summary>
         public static readonly StyledProperty<FontStyle> FontStyleProperty =
-            TextBlock.FontStyleProperty.AddOwner<TemplatedControl>();
+            TextElement.FontStyleProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
         /// Defines the <see cref="FontWeight"/> property.
         /// </summary>
         public static readonly StyledProperty<FontWeight> FontWeightProperty =
-            TextBlock.FontWeightProperty.AddOwner<TemplatedControl>();
+            TextElement.FontWeightProperty.AddOwner<TemplatedControl>();
+
+        /// <summary>
+        /// Defines the <see cref="FontWeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontStretch> FontStretchProperty =
+            TextElement.FontStretchProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
         /// Defines the <see cref="Foreground"/> property.
         /// </summary>
         public static readonly StyledProperty<IBrush?> ForegroundProperty =
-            TextBlock.ForegroundProperty.AddOwner<TemplatedControl>();
+            TextElement.ForegroundProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
         /// Defines the <see cref="Padding"/> property.
@@ -90,7 +97,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public static readonly RoutedEvent<TemplateAppliedEventArgs> TemplateAppliedEvent =
             RoutedEvent.Register<TemplatedControl, TemplateAppliedEventArgs>(
-                "TemplateApplied", 
+                nameof(TemplateApplied), 
                 RoutingStrategies.Direct);
 
         private IControlTemplate? _appliedTemplate;
@@ -185,6 +192,15 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(FontWeightProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the font stretch used to draw the control's text.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get { return GetValue(FontStretchProperty); }
+            set { SetValue(FontStretchProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the brush used to draw the control's text and other foreground elements.
         /// </summary>
@@ -340,6 +356,11 @@ namespace Avalonia.Controls.Primitives
             base.OnDetachedFromLogicalTree(e);
         }
 
+        /// <summary>
+        /// Called when the control's template is applied.
+        /// In simple terms, this means the method is called just before the control is displayed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
         protected virtual void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
         }
diff --git a/src/Avalonia.Controls/Primitives/Track.cs b/src/Avalonia.Controls/Primitives/Track.cs
index f8d6046101..14ec7a2849 100644
--- a/src/Avalonia.Controls/Primitives/Track.cs
+++ b/src/Avalonia.Controls/Primitives/Track.cs
@@ -44,7 +44,7 @@ namespace Avalonia.Controls.Primitives
             AvaloniaProperty.Register<Track, bool>(nameof(IsDirectionReversed));
 
         public static readonly StyledProperty<bool> IgnoreThumbDragProperty =
-            AvaloniaProperty.Register<Track, bool>(nameof(IsThumbDragHandled));
+            AvaloniaProperty.Register<Track, bool>(nameof(IgnoreThumbDrag));
 
         private double _minimum;
         private double _maximum = 100.0;
@@ -118,7 +118,7 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(IsDirectionReversedProperty, value); }
         }
 
-        public bool IsThumbDragHandled
+        public bool IgnoreThumbDrag
         {
             get { return GetValue(IgnoreThumbDragProperty); }
             set { SetValue(IgnoreThumbDragProperty, value); }
@@ -291,13 +291,13 @@ namespace Avalonia.Controls.Primitives
             return arrangeSize;
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == OrientationProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Orientation>());
+                UpdatePseudoClasses(change.GetNewValue<Orientation>());
             }
         }
 
@@ -442,7 +442,7 @@ namespace Avalonia.Controls.Primitives
 
         private void ThumbDragged(object? sender, VectorEventArgs e)
         {
-            if (IsThumbDragHandled)
+            if (IgnoreThumbDrag)
                 return;
                 
             Value = MathUtilities.Clamp(
diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index 017a053c48..1075328c67 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -1,6 +1,7 @@
 using System;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 using Avalonia.Layout;
 using Avalonia.Media;
 
@@ -9,6 +10,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control used to indicate the progress of an operation.
     /// </summary>
+    [TemplatePart("PART_Indicator", typeof(Border))]
     [PseudoClasses(":vertical", ":horizontal", ":indeterminate")]
     public class ProgressBar : RangeBase
     {
@@ -137,6 +139,7 @@ namespace Avalonia.Controls
 
         static ProgressBar()
         {
+            ValueProperty.OverrideMetadata<ProgressBar>(new DirectPropertyMetadata<double>(defaultBindingMode: BindingMode.OneWay));
             ValueProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
             MinimumProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
             MaximumProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
@@ -175,17 +178,17 @@ namespace Avalonia.Controls
             return base.ArrangeOverride(finalSize);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == IsIndeterminateProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<bool>(), null);
+                UpdatePseudoClasses(change.GetNewValue<bool>(), null);
             }
             else if (change.Property == OrientationProperty)
             {
-                UpdatePseudoClasses(null, change.NewValue.GetValueOrDefault<Orientation>());
+                UpdatePseudoClasses(null, change.GetNewValue<Orientation>());
             }
         }
 
diff --git a/src/Avalonia.Controls/Properties/AssemblyInfo.cs b/src/Avalonia.Controls/Properties/AssemblyInfo.cs
index 25330614cf..0f3da91107 100644
--- a/src/Avalonia.Controls/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Controls/Properties/AssemblyInfo.cs
@@ -1,10 +1,5 @@
-using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
-[assembly: InternalsVisibleTo("Avalonia.Controls.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.DesignerSupport, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.LeakTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Automation")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
diff --git a/src/Avalonia.Controls/Remote/RemoteServer.cs b/src/Avalonia.Controls/Remote/RemoteServer.cs
index f4cc91a0e6..2cf2d2b97d 100644
--- a/src/Avalonia.Controls/Remote/RemoteServer.cs
+++ b/src/Avalonia.Controls/Remote/RemoteServer.cs
@@ -1,11 +1,12 @@
 using System;
 using Avalonia.Controls.Embedding;
 using Avalonia.Controls.Remote.Server;
-using Avalonia.Platform;
+using Avalonia.Metadata;
 using Avalonia.Remote.Protocol;
 
 namespace Avalonia.Controls.Remote
 {
+    [Unstable]
     public class RemoteServer
     {
         private EmbeddableControlRoot _topLevel;
diff --git a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
index c9fd1dc3b8..e800f2f4b0 100644
--- a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
+++ b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
@@ -6,6 +6,7 @@ using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Layout;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Remote.Protocol;
 using Avalonia.Remote.Protocol.Input;
@@ -18,6 +19,7 @@ using ProtocolPixelFormat = Avalonia.Remote.Protocol.Viewport.PixelFormat;
 
 namespace Avalonia.Controls.Remote.Server
 {
+    [Unstable]
     public class RemoteServerTopLevelImpl : OffscreenTopLevelImplBase, IFramebufferPlatformSurface
     {
         private readonly IAvaloniaRemoteTransportConnection _transport;
diff --git a/src/Avalonia.Controls/RepeatButton.cs b/src/Avalonia.Controls/RepeatButton.cs
index 0415a78721..6a62172934 100644
--- a/src/Avalonia.Controls/RepeatButton.cs
+++ b/src/Avalonia.Controls/RepeatButton.cs
@@ -13,13 +13,13 @@ namespace Avalonia.Controls
         /// Defines the <see cref="Interval"/> property.
         /// </summary>
         public static readonly StyledProperty<int> IntervalProperty =
-            AvaloniaProperty.Register<Button, int>(nameof(Interval), 100);
+            AvaloniaProperty.Register<RepeatButton, int>(nameof(Interval), 100);
 
         /// <summary>
         /// Defines the <see cref="Delay"/> property.
         /// </summary>
         public static readonly StyledProperty<int> DelayProperty =
-            AvaloniaProperty.Register<Button, int>(nameof(Delay), 300);
+            AvaloniaProperty.Register<RepeatButton, int>(nameof(Delay), 300);
 
         private DispatcherTimer? _repeatTimer;
 
@@ -70,11 +70,11 @@ namespace Avalonia.Controls
             _repeatTimer?.Stop();
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
-            if (change.Property == IsPressedProperty && change.NewValue.GetValueOrDefault<bool>() == false)
+            if (change.Property == IsPressedProperty && change.GetNewValue<bool>() == false)
             {
                 StopTimer();
             }
diff --git a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
index 09c0e58332..3f42d95deb 100644
--- a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
+++ b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Controls
     /// Represents a data-driven collection control that incorporates a flexible layout system,
     /// custom views, and virtualization.
     /// </summary>
-    public class ItemsRepeater : Panel, IChildIndexProvider, IWeakEventSubscriber<EventArgs>
+    public class ItemsRepeater : Panel, IChildIndexProvider
     {
         /// <summary>
         /// Defines the <see cref="HorizontalCacheLength"/> property.
@@ -60,6 +60,7 @@ namespace Avalonia.Controls
 
         private readonly ViewManager _viewManager;
         private readonly ViewportManager _viewportManager;
+        private readonly TargetWeakEventSubscriber<ItemsRepeater, EventArgs> _layoutWeakSubscriber;
         private IEnumerable? _items;
         private VirtualizingLayoutContext? _layoutContext;
         private EventHandler<ChildIndexChangedEventArgs>? _childIndexChanged;
@@ -74,6 +75,15 @@ namespace Avalonia.Controls
         /// </summary>
         public ItemsRepeater()
         {
+            _layoutWeakSubscriber = new TargetWeakEventSubscriber<ItemsRepeater, EventArgs>(
+                this, static (target, _, ev, _) =>
+                {
+                    if (ev == AttachedLayout.ArrangeInvalidatedWeakEvent)
+                        target.InvalidateArrange();
+                    else if (ev == AttachedLayout.MeasureInvalidatedWeakEvent)
+                        target.InvalidateMeasure();
+                });
+
             _viewManager = new ViewManager(this);
             _viewportManager = new ViewportManager(this);
             KeyboardNavigation.SetTabNavigation(this, KeyboardNavigationMode.Once);
@@ -257,10 +267,9 @@ namespace Avalonia.Controls
 
         internal void UnpinElement(IControl element) => _viewManager.UpdatePin(element, false);
 
-        internal static VirtualizationInfo TryGetVirtualizationInfo(IControl element)
+        internal static VirtualizationInfo? TryGetVirtualizationInfo(IControl element)
         {
-            var value = element.GetValue(VirtualizationInfoProperty);
-            return value;
+            return (element as AvaloniaObject)?.GetValue(VirtualizationInfoProperty);
         }
 
         internal static VirtualizationInfo CreateAndInitializeVirtualizationInfo(IControl element)
@@ -277,15 +286,20 @@ namespace Avalonia.Controls
 
         internal static VirtualizationInfo GetVirtualizationInfo(IControl element)
         {
-            var result = element.GetValue(VirtualizationInfoProperty);
-
-            if (result == null)
+            if (element is AvaloniaObject ao)
             {
-                result = new VirtualizationInfo();
-                element.SetValue(VirtualizationInfoProperty, result);
+                var result = ao.GetValue(VirtualizationInfoProperty);
+
+                if (result == null)
+                {
+                    result = new VirtualizationInfo();
+                    ao.SetValue(VirtualizationInfoProperty, result);
+                }
+
+                return result;
             }
 
-            return result;
+            throw new NotSupportedException("Custom implementations of IAvaloniaObject not supported.");
         }
 
         private protected override void InvalidateMeasureOnChildrenChanged()
@@ -391,11 +405,7 @@ namespace Avalonia.Controls
                         var newBounds = element.Bounds;
                         virtInfo.ArrangeBounds = newBounds;
 
-                        if (!virtInfo.IsRegisteredAsAnchorCandidate)
-                        {
-                            _viewportManager.RegisterScrollAnchorCandidate(element);
-                            virtInfo.IsRegisteredAsAnchorCandidate = true;
-                        }
+                        _viewportManager.RegisterScrollAnchorCandidate(element, virtInfo);
                     }
                 }
 
@@ -420,12 +430,11 @@ namespace Avalonia.Controls
             _viewportManager.ResetScrollers();
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             if (change.Property == ItemsProperty)
             {
-                var oldEnumerable = change.OldValue.GetValueOrDefault<IEnumerable>();
-                var newEnumerable = change.NewValue.GetValueOrDefault<IEnumerable>();
+                var (oldEnumerable, newEnumerable) = change.GetOldAndNewValue<IEnumerable?>();
 
                 if (oldEnumerable != newEnumerable)
                 {
@@ -440,23 +449,21 @@ namespace Avalonia.Controls
             }
             else if (change.Property == ItemTemplateProperty)
             {
-                OnItemTemplateChanged(
-                    change.OldValue.GetValueOrDefault<IDataTemplate>(),
-                    change.NewValue.GetValueOrDefault<IDataTemplate>());
+                var (oldvalue, newValue) = change.GetOldAndNewValue<IDataTemplate?>();
+                OnItemTemplateChanged(oldvalue, newValue);
             }
             else if (change.Property == LayoutProperty)
             {
-                OnLayoutChanged(
-                    change.OldValue.GetValueOrDefault<AttachedLayout>(),
-                    change.NewValue.GetValueOrDefault<AttachedLayout>());
+                var (oldvalue, newValue) = change.GetOldAndNewValue<AttachedLayout>();
+                OnLayoutChanged(oldvalue, newValue);
             }
             else if (change.Property == HorizontalCacheLengthProperty)
             {
-                _viewportManager.HorizontalCacheLength = change.NewValue.GetValueOrDefault<double>();
+                _viewportManager.HorizontalCacheLength = change.GetNewValue<double>();
             }
             else if (change.Property == VerticalCacheLengthProperty)
             {
-                _viewportManager.VerticalCacheLength = change.NewValue.GetValueOrDefault<double>();
+                _viewportManager.VerticalCacheLength = change.GetNewValue<double>();
             }
 
             base.OnPropertyChanged(change);
@@ -480,7 +487,7 @@ namespace Avalonia.Controls
                     _processingItemsSourceChange.Action == NotifyCollectionChangedAction.Reset);
 
             _viewManager.ClearElement(element, isClearedDueToCollectionChange);
-            _viewportManager.OnElementCleared(element);
+            _viewportManager.OnElementCleared(element, GetVirtualizationInfo(element));
         }
 
         private int GetElementIndexImpl(IControl element)
@@ -491,7 +498,7 @@ namespace Avalonia.Controls
             if (parent == this)
             {
                 var virtInfo = TryGetVirtualizationInfo(element);
-                return _viewManager.GetElementIndex(virtInfo);
+                return _viewManager.GetElementIndex(virtInfo!);
             }
 
             return -1;
@@ -728,8 +735,8 @@ namespace Avalonia.Controls
             {
                 oldValue.UninitializeForContext(LayoutContext);
 
-                AttachedLayout.MeasureInvalidatedWeakEvent.Unsubscribe(oldValue, this);
-                AttachedLayout.ArrangeInvalidatedWeakEvent.Unsubscribe(oldValue, this);
+                AttachedLayout.MeasureInvalidatedWeakEvent.Unsubscribe(oldValue, _layoutWeakSubscriber);
+                AttachedLayout.ArrangeInvalidatedWeakEvent.Unsubscribe(oldValue, _layoutWeakSubscriber);
 
                 // Walk through all the elements and make sure they are cleared
                 foreach (var element in Children)
@@ -747,8 +754,8 @@ namespace Avalonia.Controls
             {
                 newValue.InitializeForContext(LayoutContext);
 
-                AttachedLayout.MeasureInvalidatedWeakEvent.Subscribe(newValue, this);
-                AttachedLayout.ArrangeInvalidatedWeakEvent.Subscribe(newValue, this);
+                AttachedLayout.MeasureInvalidatedWeakEvent.Subscribe(newValue, _layoutWeakSubscriber);
+                AttachedLayout.ArrangeInvalidatedWeakEvent.Subscribe(newValue, _layoutWeakSubscriber);
             }
 
             bool isVirtualizingLayout = newValue != null && newValue is VirtualizingLayout;
@@ -798,15 +805,7 @@ namespace Avalonia.Controls
         {
             _viewportManager.OnBringIntoViewRequested(e);
         }
-
-        void IWeakEventSubscriber<EventArgs>.OnEvent(object? sender, WeakEvent ev, EventArgs e)
-        {
-            if(ev == AttachedLayout.ArrangeInvalidatedWeakEvent)
-                InvalidateArrange();
-            else if (ev == AttachedLayout.MeasureInvalidatedWeakEvent)
-                InvalidateMeasure();
-        }
-
+        
         private VirtualizingLayoutContext GetLayoutContext()
         {
             if (_layoutContext == null)
diff --git a/src/Avalonia.Controls/Repeater/RecyclePool.cs b/src/Avalonia.Controls/Repeater/RecyclePool.cs
index 9e2da81f99..cf2b40836e 100644
--- a/src/Avalonia.Controls/Repeater/RecyclePool.cs
+++ b/src/Avalonia.Controls/Repeater/RecyclePool.cs
@@ -80,8 +80,8 @@ namespace Avalonia.Controls
             return null;
         }
 
-        internal string GetReuseKey(IControl element) => element.GetValue(ReuseKeyProperty);
-        internal void SetReuseKey(IControl element, string value) => element.SetValue(ReuseKeyProperty, value);
+        internal string GetReuseKey(IControl element) => ((Control)element).GetValue(ReuseKeyProperty);
+        internal void SetReuseKey(IControl element, string value) => ((Control)element).SetValue(ReuseKeyProperty, value);
 
         private IPanel? EnsureOwnerIsPanelOrNull(IControl? owner)
         {
diff --git a/src/Avalonia.Controls/Repeater/ViewManager.cs b/src/Avalonia.Controls/Repeater/ViewManager.cs
index b28753b518..12db48a2c2 100644
--- a/src/Avalonia.Controls/Repeater/ViewManager.cs
+++ b/src/Avalonia.Controls/Repeater/ViewManager.cs
@@ -47,7 +47,7 @@ namespace Avalonia.Controls
                 if (madeAnchor != null)
                 {
                     var anchorVirtInfo = ItemsRepeater.TryGetVirtualizationInfo(madeAnchor);
-                    if (anchorVirtInfo.Index == index)
+                    if (anchorVirtInfo!.Index == index)
                     {
                         element = madeAnchor;
                     }
@@ -60,12 +60,12 @@ namespace Avalonia.Controls
             var virtInfo = ItemsRepeater.TryGetVirtualizationInfo(element);
             if (suppressAutoRecycle)
             {
-                virtInfo.AutoRecycleCandidate = false;
+                virtInfo!.AutoRecycleCandidate = false;
                 Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "GetElement: {Index} Not AutoRecycleCandidate:", virtInfo.Index);
             }
             else
             {
-                virtInfo.AutoRecycleCandidate = true;
+                virtInfo!.AutoRecycleCandidate = true;
                 virtInfo.KeepAlive = true;
                 Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "GetElement: {Index} AutoRecycleCandidate:", virtInfo.Index);
             }
diff --git a/src/Avalonia.Controls/Repeater/ViewportManager.cs b/src/Avalonia.Controls/Repeater/ViewportManager.cs
index ec25fcb265..7f03cc575e 100644
--- a/src/Avalonia.Controls/Repeater/ViewportManager.cs
+++ b/src/Avalonia.Controls/Repeater/ViewportManager.cs
@@ -249,9 +249,10 @@ namespace Avalonia.Controls
             virtInfo.IsRegisteredAsAnchorCandidate = false;
         }
 
-        public void OnElementCleared(IControl element)
+        public void OnElementCleared(IControl element, VirtualizationInfo virtInfo)
         {
             _scroller?.UnregisterAnchorCandidate(element);
+            virtInfo.IsRegisteredAsAnchorCandidate = false;
         }
 
         public void OnOwnerMeasuring()
@@ -358,9 +359,12 @@ namespace Avalonia.Controls
                 {
                     foreach (var child in _owner.Children)
                     {
-                        if (child != targetChild)
+                        var info = ItemsRepeater.GetVirtualizationInfo(child);
+
+                        if (child != targetChild && info.IsRegisteredAsAnchorCandidate)
                         {
                             _scroller.UnregisterAnchorCandidate(child);
+                            info.IsRegisteredAsAnchorCandidate = false;
                         }
                     }
                 }
@@ -377,9 +381,13 @@ namespace Avalonia.Controls
             }
         }
 
-        public void RegisterScrollAnchorCandidate(IControl element)
+        public void RegisterScrollAnchorCandidate(IControl element, VirtualizationInfo virtInfo)
         {
-            _scroller?.RegisterAnchorCandidate(element);
+            if (!virtInfo.IsRegisteredAsAnchorCandidate)
+            {
+                _scroller?.RegisterAnchorCandidate(element);
+                virtInfo.IsRegisteredAsAnchorCandidate = true;
+            }
         }
 
         private IControl? GetImmediateChildOfRepeater(IControl descendant)
@@ -405,15 +413,18 @@ namespace Avalonia.Controls
             _isBringIntoViewInProgress = false;
             _makeAnchorElement = null;
 
+            // Undo the anchor deregistrations done by OnBringIntoViewRequested.
             if (_scroller is object)
             {
                 foreach (var child in _owner.Children)
                 {
                     var info = ItemsRepeater.GetVirtualizationInfo(child);
 
-                    if (info.IsRealized && info.IsHeldByLayout)
+                    // The item brought into view is still registered - don't register it more than once.
+                    if (info.IsRealized && info.IsHeldByLayout && !info.IsRegisteredAsAnchorCandidate)
                     {
                         _scroller.RegisterAnchorCandidate(child);
+                        info.IsRegisteredAsAnchorCandidate = true;
                     }
                 }
             }
@@ -430,7 +441,13 @@ namespace Avalonia.Controls
             {
                 foreach (var child in _owner.Children)
                 {
-                    _scroller.UnregisterAnchorCandidate(child);
+                    var info = ItemsRepeater.GetVirtualizationInfo(child);
+
+                    if (info.IsRegisteredAsAnchorCandidate)
+                    {
+                        _scroller.UnregisterAnchorCandidate(child);
+                        info.IsRegisteredAsAnchorCandidate = false;
+                    }
                 }
 
                 _scroller = null;
diff --git a/src/Avalonia.Controls/Screens.cs b/src/Avalonia.Controls/Screens.cs
index ef438576a7..a554f82f61 100644
--- a/src/Avalonia.Controls/Screens.cs
+++ b/src/Avalonia.Controls/Screens.cs
@@ -2,54 +2,45 @@
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Platform;
-using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
+#nullable enable
+
 namespace Avalonia.Controls
 {
     public class Screens
     {
-        private readonly IScreenImpl? _iScreenImpl;
+        private readonly IScreenImpl _iScreenImpl;
 
         public int ScreenCount => _iScreenImpl?.ScreenCount ?? 0;
         public IReadOnlyList<Screen> All => _iScreenImpl?.AllScreens ?? Array.Empty<Screen>();
         public Screen? Primary => All.FirstOrDefault(x => x.Primary);
 
-        public Screens(IScreenImpl? iScreenImpl)
+        public Screens(IScreenImpl iScreenImpl)
         {
             _iScreenImpl = iScreenImpl;
         }
 
-        public Screen? ScreenFromBounds(PixelRect bounds){
-        
-            Screen? currMaxScreen = null;
-            double maxAreaSize = 0;
-            foreach (Screen screen in All)
-            {
-                double left = MathUtilities.Clamp(bounds.X, screen.Bounds.X, screen.Bounds.X + screen.Bounds.Width);
-                double top = MathUtilities.Clamp(bounds.Y, screen.Bounds.Y, screen.Bounds.Y + screen.Bounds.Height);
-                double right = MathUtilities.Clamp(bounds.X + bounds.Width, screen.Bounds.X, screen.Bounds.X + screen.Bounds.Width);
-                double bottom = MathUtilities.Clamp(bounds.Y + bounds.Height, screen.Bounds.Y, screen.Bounds.Y + screen.Bounds.Height);
-                double area = (right - left) * (bottom - top);
-                if (area > maxAreaSize)
-                {
-                    maxAreaSize = area;
-                    currMaxScreen = screen;
-                }
-            }
-
-            return currMaxScreen;
+        public Screen? ScreenFromBounds(PixelRect bounds)
+        {
+            return _iScreenImpl.ScreenFromRect(bounds);
         }
         
-        public Screen? ScreenFromPoint(PixelPoint point)
+        public Screen? ScreenFromWindow(IWindowBaseImpl window)
         {
-            return All.FirstOrDefault(x => x.Bounds.Contains(point));        
+            return _iScreenImpl.ScreenFromWindow(window);
+        }
+
+        public Screen? ScreenFromPoint(PixelPoint point)
+        {      
+            return _iScreenImpl.ScreenFromPoint(point);
         }
 
         public Screen? ScreenFromVisual(IVisual visual)
         {
             var tl = visual.PointToScreen(visual.Bounds.TopLeft);
             var br = visual.PointToScreen(visual.Bounds.BottomRight);
+
             return ScreenFromBounds(new PixelRect(tl, br));
         }
     }
diff --git a/src/Avalonia.Controls/ScrollViewer.cs b/src/Avalonia.Controls/ScrollViewer.cs
index 73bb827ad9..535f9ae43e 100644
--- a/src/Avalonia.Controls/ScrollViewer.cs
+++ b/src/Avalonia.Controls/ScrollViewer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Reactive.Linq;
 using Avalonia.Automation.Peers;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
@@ -11,6 +12,8 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control which scrolls its content if the content is bigger than the space available.
     /// </summary>
+    [TemplatePart("PART_HorizontalScrollBar", typeof(ScrollBar))]
+    [TemplatePart("PART_VerticalScrollBar",   typeof(ScrollBar))]
     public class ScrollViewer : ContentControl, IScrollable, IScrollAnchorProvider
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Selection/InternalSelectionModel.cs b/src/Avalonia.Controls/Selection/InternalSelectionModel.cs
index 40c6f63ed8..d92ffb0d1a 100644
--- a/src/Avalonia.Controls/Selection/InternalSelectionModel.cs
+++ b/src/Avalonia.Controls/Selection/InternalSelectionModel.cs
@@ -182,8 +182,8 @@ namespace Avalonia.Controls.Selection
             try
             {
                 var items = WritableSelectedItems;
-                var deselected = e.DeselectedItems.ToList();
-                var selected = e.SelectedItems.ToList();
+                var deselected = e.DeselectedItems.ToArray();
+                var selected = e.SelectedItems.ToArray();
 
                 _ignoreSelectedItemsChanges = true;
 
diff --git a/src/Avalonia.Controls/Shapes/Rectangle.cs b/src/Avalonia.Controls/Shapes/Rectangle.cs
index f3db2644a9..d60180bab4 100644
--- a/src/Avalonia.Controls/Shapes/Rectangle.cs
+++ b/src/Avalonia.Controls/Shapes/Rectangle.cs
@@ -2,19 +2,139 @@ using Avalonia.Media;
 
 namespace Avalonia.Controls.Shapes
 {
+    /// <summary>
+    /// Represents a rectangle with optional rounded corners.
+    /// </summary>
     public class Rectangle : Shape
     {
+        private const double PiOver2 = 1.57079633; // 90 deg to rad
+
+        /// <summary>
+        /// Defines the <see cref="RadiusX"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> RadiusXProperty =
+            AvaloniaProperty.Register<Rectangle, double>(nameof(RadiusX));
+
+        /// <summary>
+        /// Defines the <see cref="RadiusY"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> RadiusYProperty =
+            AvaloniaProperty.Register<Rectangle, double>(nameof(RadiusY));
+
         static Rectangle()
         {
-            AffectsGeometry<Rectangle>(BoundsProperty, StrokeThicknessProperty);
+            AffectsGeometry<Rectangle>(
+                BoundsProperty,
+                RadiusXProperty,
+                RadiusYProperty,
+                StrokeThicknessProperty);
+        }
+
+        /// <summary>
+        /// Gets or sets the radius on the X-axis used to round the corners of the rectangle.
+        /// Corner radii are represented by an ellipse so this is the X-axis width of the ellipse.
+        /// </summary>
+        public double RadiusX
+        {
+            get => GetValue(RadiusXProperty);
+            set => SetValue(RadiusXProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the radius on the Y-axis used to round the corners of the rectangle.
+        /// Corner radii are represented by an ellipse so this is the Y-axis height of the ellipse.
+        /// </summary>
+        public double RadiusY
+        {
+            get => GetValue(RadiusYProperty);
+            set => SetValue(RadiusYProperty, value);
         }
 
+        /// <inheritdoc/>
         protected override Geometry CreateDefiningGeometry()
         {
-            var rect = new Rect(Bounds.Size).Deflate(StrokeThickness / 2);
-            return new RectangleGeometry(rect);
+            // TODO: If RectangleGeometry ever supports RadiusX/Y like in WPF,
+            // this code can be removed/combined with that implementation
+
+            double x = RadiusX;
+            double y = RadiusY;
+
+            if (x == 0 && y == 0)
+            {
+                // Optimization when there are no corner radii
+                var rect = new Rect(Bounds.Size).Deflate(StrokeThickness / 2);
+                return new RectangleGeometry(rect);
+            }
+            else
+            {
+                var rect = new Rect(Bounds.Size).Deflate(StrokeThickness / 2);
+                var geometry = new StreamGeometry();
+                var arcSize = new Size(x, y);
+
+                using (StreamGeometryContext context = geometry.Open())
+                {
+                    // The rectangle is constructed as follows:
+                    //
+                    //   (origin)
+                    //   Corner 4            Corner 1
+                    //   Top/Left  Line 1    Top/Right
+                    //      \_   __________   _/
+                    //          |          |
+                    //   Line 4 |          | Line 2
+                    //       _  |__________|  _
+                    //      /      Line 3      \
+                    //   Corner 3            Corner 2
+                    //   Bottom/Left         Bottom/Right
+                    //
+                    // - Lines 1,3 follow the deflated rectangle bounds minus RadiusX
+                    // - Lines 2,4 follow the deflated rectangle bounds minus RadiusY
+                    // - All corners are constructed using elliptical arcs 
+
+                    // Line 1 + Corner 1
+                    context.BeginFigure(new Point(rect.Left + x, rect.Top), true);
+                    context.LineTo(new Point(rect.Right - x, rect.Top));
+                    context.ArcTo(
+                        new Point(rect.Right, rect.Top + y),
+                        arcSize,
+                        rotationAngle: PiOver2,
+                        isLargeArc: false,
+                        SweepDirection.Clockwise);
+
+                    // Line 2 + Corner 2
+                    context.LineTo(new Point(rect.Right, rect.Bottom - y));
+                    context.ArcTo(
+                        new Point(rect.Right - x, rect.Bottom),
+                        arcSize,
+                        rotationAngle: PiOver2,
+                        isLargeArc: false,
+                        SweepDirection.Clockwise);
+
+                    // Line 3 + Corner 3
+                    context.LineTo(new Point(rect.Left + x, rect.Bottom));
+                    context.ArcTo(
+                        new Point(rect.Left, rect.Bottom - y),
+                        arcSize,
+                        rotationAngle: PiOver2,
+                        isLargeArc: false,
+                        SweepDirection.Clockwise);
+
+                    // Line 4 + Corner 4
+                    context.LineTo(new Point(rect.Left, rect.Top + y));
+                    context.ArcTo(
+                        new Point(rect.Left + x, rect.Top),
+                        arcSize,
+                        rotationAngle: PiOver2,
+                        isLargeArc: false,
+                        SweepDirection.Clockwise);
+
+                    context.EndFigure(true);
+                }
+
+                return geometry;
+            }
         }
 
+        /// <inheritdoc/>
         protected override Size MeasureOverride(Size availableSize)
         {
             return new Size(StrokeThickness, StrokeThickness);
diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index 574638c2bc..be87705b54 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -42,6 +42,9 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control that lets the user select from a range of values by moving a Thumb control along a Track.
     /// </summary>
+    [TemplatePart("PART_DecreaseButton", typeof(Button))]
+    [TemplatePart("PART_IncreaseButton", typeof(Button))]
+    [TemplatePart("PART_Track",          typeof(Track))]
     [PseudoClasses(":vertical", ":horizontal", ":pressed")]
     public class Slider : RangeBase
     {
@@ -73,7 +76,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="TickPlacement"/> property.
         /// </summary>
         public static readonly StyledProperty<TickPlacement> TickPlacementProperty =
-            AvaloniaProperty.Register<TickBar, TickPlacement>(nameof(TickPlacement), 0d);
+            AvaloniaProperty.Register<Slider, TickPlacement>(nameof(TickPlacement), 0d);
 
         /// <summary>
         /// Defines the <see cref="TicksProperty"/> property.
@@ -194,7 +197,7 @@ namespace Avalonia.Controls
 
             if (_track != null)
             {
-                _track.IsThumbDragHandled = true;
+                _track.IgnoreThumbDrag = true;
             }
 
             if (_decreaseButton != null)
@@ -358,21 +361,24 @@ namespace Avalonia.Controls
             Value = IsSnapToTickEnabled ? SnapToTick(finalValue) : finalValue;
         }
 
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
             if (property == ValueProperty)
             {
-                DataValidationErrors.SetError(this, value.Error);
+                DataValidationErrors.SetError(this, error);
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == OrientationProperty)
             {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Orientation>());
+                UpdatePseudoClasses(change.GetNewValue<Orientation>());
             }
         }
 
diff --git a/src/Avalonia.Controls/SplitButton/SplitButton.cs b/src/Avalonia.Controls/SplitButton/SplitButton.cs
index f1d07b2679..f39064435d 100644
--- a/src/Avalonia.Controls/SplitButton/SplitButton.cs
+++ b/src/Avalonia.Controls/SplitButton/SplitButton.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Windows.Input;
 using Avalonia.Controls.Metadata;
-using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -13,6 +12,8 @@ namespace Avalonia.Controls
     /// A button with primary and secondary parts that can each be pressed separately.
     /// The primary part behaves like a <see cref="Button"/> and the secondary part opens a flyout.
     /// </summary>
+    [TemplatePart("PART_PrimaryButton",   typeof(Button))]
+    [TemplatePart("PART_SecondaryButton", typeof(Button))]
     [PseudoClasses(pcFlyoutOpen, pcPressed)]
     public class SplitButton : ContentControl, ICommandSource
     {
@@ -227,6 +228,8 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
+            base.OnApplyTemplate(e);
+
             UnregisterEvents();
             UnregisterFlyoutEvents(Flyout);
 
@@ -275,19 +278,21 @@ namespace Avalonia.Controls
         }
 
         /// <inheritdoc/>
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> e)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (e.Property == CommandProperty)
             {
                 if (_isAttachedToLogicalTree)
                 {
                     // Must unregister events here while a reference to the old command still exists
-                    if (e.OldValue.GetValueOrDefault() is ICommand oldCommand)
+                    var (oldValue, newValue) = e.GetOldAndNewValue<ICommand?>();
+
+                    if (oldValue is ICommand oldCommand)
                     {
                         oldCommand.CanExecuteChanged -= CanExecuteChanged;
                     }
 
-                    if (e.NewValue.GetValueOrDefault() is ICommand newCommand)
+                    if (newValue is ICommand newCommand)
                     {
                         newCommand.CanExecuteChanged += CanExecuteChanged;
                     }
@@ -301,8 +306,7 @@ namespace Avalonia.Controls
             }
             else if (e.Property == FlyoutProperty)
             {
-                var oldFlyout = e.OldValue.GetValueOrDefault() as FlyoutBase;
-                var newFlyout = e.NewValue.GetValueOrDefault() as FlyoutBase;
+                var (oldFlyout, newFlyout) = e.GetOldAndNewValue<FlyoutBase?>();
 
                 // If flyout is changed while one is already open, make sure we 
                 // close the old one first
@@ -314,16 +318,9 @@ namespace Avalonia.Controls
                 }
 
                 // Must unregister events here while a reference to the old flyout still exists
-                if (oldFlyout != null)
-                {
-                    UnregisterFlyoutEvents(oldFlyout);
-                }
-
-                if (newFlyout != null)
-                {
-                    RegisterFlyoutEvents(newFlyout);
-                }
+                UnregisterFlyoutEvents(oldFlyout);
 
+                RegisterFlyoutEvents(newFlyout);
                 UpdatePseudoClasses();
             }
 
@@ -415,6 +412,22 @@ namespace Avalonia.Controls
             }
         }
 
+        /// <summary>
+        /// Invoked when the split button's flyout is opened.
+        /// </summary>
+        protected virtual void OnFlyoutOpened()
+        {
+            // Available for derived types
+        }
+
+        /// <summary>
+        /// Invoked when the split button's flyout is closed.
+        /// </summary>
+        protected virtual void OnFlyoutClosed()
+        {
+            // Available for derived types
+        }
+
         ////////////////////////////////////////////////////////////////////////
         // Event Handling
         ////////////////////////////////////////////////////////////////////////
@@ -464,6 +477,8 @@ namespace Avalonia.Controls
             {
                 _isFlyoutOpen = true;
                 UpdatePseudoClasses();
+
+                OnFlyoutOpened();
             }
         }
 
@@ -479,6 +494,8 @@ namespace Avalonia.Controls
             {
                 _isFlyoutOpen = false;
                 UpdatePseudoClasses();
+
+                OnFlyoutClosed();
             }
         }
     }
diff --git a/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs b/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
index 879c1aa6e1..cd34f8060a 100644
--- a/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
+++ b/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
@@ -90,7 +90,7 @@ namespace Avalonia.Controls
         ////////////////////////////////////////////////////////////////////////
 
         /// <inheritdoc/>
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> e)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (e.Property == IsCheckedProperty)
             {
diff --git a/src/Avalonia.Controls/SplitView.cs b/src/Avalonia.Controls/SplitView.cs
index d2161deb6e..532cb1d329 100644
--- a/src/Avalonia.Controls/SplitView.cs
+++ b/src/Avalonia.Controls/SplitView.cs
@@ -77,6 +77,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control with two views: A collapsible pane and an area for content
     /// </summary>
+    [TemplatePart("PART_PaneRoot", typeof(Panel))]
     [PseudoClasses(":open", ":closed")]
     [PseudoClasses(":compactoverlay", ":compactinline", ":overlay", ":inline")]
     [PseudoClasses(":left", ":right")]
@@ -137,7 +138,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="PaneTemplate"/> property.
         /// </summary>
         public static readonly StyledProperty<IDataTemplate> PaneTemplateProperty =
-            AvaloniaProperty.Register<HeaderedContentControl, IDataTemplate>(nameof(PaneTemplate));
+            AvaloniaProperty.Register<SplitView, IDataTemplate>(nameof(PaneTemplate));
 
         /// <summary>
         /// Defines the <see cref="UseLightDismissOverlayMode"/> property
diff --git a/src/Avalonia.Controls/StackPanel.cs b/src/Avalonia.Controls/StackPanel.cs
index feb425a9c3..50c48d2bb0 100644
--- a/src/Avalonia.Controls/StackPanel.cs
+++ b/src/Avalonia.Controls/StackPanel.cs
@@ -123,7 +123,7 @@ namespace Avalonia.Controls
                     index = Children.Count - 1;
                     break;
                 case NavigationDirection.Next:
-                    if (index != -1) ++index;
+                    ++index;
                     break;
                 case NavigationDirection.Previous:
                     if (index != -1) --index;
diff --git a/src/Avalonia.Controls/SystemDialog.cs b/src/Avalonia.Controls/SystemDialog.cs
index 4a9e745e30..093f10be51 100644
--- a/src/Avalonia.Controls/SystemDialog.cs
+++ b/src/Avalonia.Controls/SystemDialog.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Controls
         /// Gets or sets a collection of filters which determine the types of files displayed in an
         /// <see cref="OpenFileDialog"/> or an <see cref="SaveFileDialog"/>.
         /// </summary>
-        public List<FileDialogFilter> Filters { get; set; } = new List<FileDialogFilter>();
+        public List<FileDialogFilter>? Filters { get; set; } = new List<FileDialogFilter>();
 
         /// <summary>
         /// Gets or sets initial file name that is displayed when the dialog is opened.
diff --git a/src/Avalonia.Controls/TabControl.cs b/src/Avalonia.Controls/TabControl.cs
index 1fbe9cc4db..70fecc7ce1 100644
--- a/src/Avalonia.Controls/TabControl.cs
+++ b/src/Avalonia.Controls/TabControl.cs
@@ -11,12 +11,14 @@ using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.VisualTree;
 using Avalonia.Automation;
+using Avalonia.Controls.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// A tab control that displays a tab strip along with the content of the selected tab.
     /// </summary>
+    [TemplatePart("PART_ItemsPresenter", typeof(ItemsPresenter))]
     public class TabControl : SelectingItemsControl, IContentPresenterHost
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Templates/DataTemplates.cs b/src/Avalonia.Controls/Templates/DataTemplates.cs
index f203539536..d4eeda7908 100644
--- a/src/Avalonia.Controls/Templates/DataTemplates.cs
+++ b/src/Avalonia.Controls/Templates/DataTemplates.cs
@@ -1,3 +1,4 @@
+using System;
 using Avalonia.Collections;
 
 namespace Avalonia.Controls.Templates
@@ -13,6 +14,22 @@ namespace Avalonia.Controls.Templates
         public DataTemplates()
         {
             ResetBehavior = ResetBehavior.Remove;
+            
+            Validate += ValidateDataTemplate;
+        }
+
+        private static void ValidateDataTemplate(IDataTemplate template)
+        {
+            var valid = template switch
+            {
+                ITypedDataTemplate typed => typed.DataType is not null,
+                _ => true
+            };
+            
+            if (!valid)
+            {
+                throw new InvalidOperationException("DataTemplate inside of DataTemplates must have a DataType set. Set DataType property or use ItemTemplate with single template instead.");
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Templates/IDataTemplateHost.cs b/src/Avalonia.Controls/Templates/IDataTemplateHost.cs
index 61986a0661..ce763c3336 100644
--- a/src/Avalonia.Controls/Templates/IDataTemplateHost.cs
+++ b/src/Avalonia.Controls/Templates/IDataTemplateHost.cs
@@ -1,9 +1,11 @@
-
+using Avalonia.Metadata;
+
 namespace Avalonia.Controls.Templates
 {
     /// <summary>
     /// Defines an element that has a <see cref="DataTemplates"/> collection.
     /// </summary>
+    [NotClientImplementable]
     public interface IDataTemplateHost
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/Templates/ITypedDataTemplate.cs b/src/Avalonia.Controls/Templates/ITypedDataTemplate.cs
new file mode 100644
index 0000000000..239dbd79f4
--- /dev/null
+++ b/src/Avalonia.Controls/Templates/ITypedDataTemplate.cs
@@ -0,0 +1,10 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Templates;
+
+public interface ITypedDataTemplate : IDataTemplate
+{
+    [DataType]
+    Type? DataType { get; }
+}
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
index 09f22612de..1a69d1218c 100644
--- a/src/Avalonia.Controls/TextBlock.cs
+++ b/src/Avalonia.Controls/TextBlock.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control that displays a block of text.
     /// </summary>
-    public class TextBlock : Control
+    public class TextBlock : Control, IInlineHost
     {
         /// <summary>
         /// Defines the <see cref="Background"/> property.
@@ -28,78 +28,69 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<Thickness> PaddingProperty =
             Decorator.PaddingProperty.AddOwner<TextBlock>();
 
-        // TODO: Define these attached properties elsewhere (e.g. on a Text class) and AddOwner
-        // them into TextBlock.
-
         /// <summary>
         /// Defines the <see cref="FontFamily"/> property.
         /// </summary>
-        public static readonly AttachedProperty<FontFamily> FontFamilyProperty =
-            AvaloniaProperty.RegisterAttached<TextBlock, Control, FontFamily>(
-                nameof(FontFamily),
-                defaultValue: FontFamily.Default,
-                inherits: true);
+        public static readonly StyledProperty<FontFamily> FontFamilyProperty =
+            TextElement.FontFamilyProperty.AddOwner<TextBlock>();
 
         /// <summary>
         /// Defines the <see cref="FontSize"/> property.
         /// </summary>
-        public static readonly AttachedProperty<double> FontSizeProperty =
-            AvaloniaProperty.RegisterAttached<TextBlock, Control, double>(
-                nameof(FontSize),
-                defaultValue: 12,
-                inherits: true);
+        public static readonly StyledProperty<double> FontSizeProperty =
+            TextElement.FontSizeProperty.AddOwner<TextBlock>();
 
         /// <summary>
         /// Defines the <see cref="FontStyle"/> property.
         /// </summary>
-        public static readonly AttachedProperty<FontStyle> FontStyleProperty =
-            AvaloniaProperty.RegisterAttached<TextBlock, Control, FontStyle>(
-                nameof(FontStyle),
-                inherits: true);
+        public static readonly StyledProperty<FontStyle> FontStyleProperty =
+            TextElement.FontStyleProperty.AddOwner<TextBlock>();
 
         /// <summary>
         /// Defines the <see cref="FontWeight"/> property.
         /// </summary>
-        public static readonly AttachedProperty<FontWeight> FontWeightProperty =
-            AvaloniaProperty.RegisterAttached<TextBlock, Control, FontWeight>(
-                nameof(FontWeight),
-                inherits: true,
-                defaultValue: FontWeight.Normal);
+        public static readonly StyledProperty<FontWeight> FontWeightProperty =
+            TextElement.FontWeightProperty.AddOwner<TextBlock>();
 
         /// <summary>
-        /// Defines the <see cref="FontStretch"/> property.
+        /// Defines the <see cref="FontWeight"/> property.
         /// </summary>
-        public static readonly AttachedProperty<FontStretch> FontStretchProperty =
-            AvaloniaProperty.RegisterAttached<TextBlock, Control, FontStretch>(
-                nameof(FontStretch),
-                inherits: true,
-                defaultValue: FontStretch.Normal);
-        
+        public static readonly StyledProperty<FontStretch> FontStretchProperty =
+            TextElement.FontStretchProperty.AddOwner<TextBlock>();
+
         /// <summary>
         /// Defines the <see cref="Foreground"/> property.
         /// </summary>
-        public static readonly AttachedProperty<IBrush?> ForegroundProperty =
-            AvaloniaProperty.RegisterAttached<TextBlock, Control, IBrush?>(
-                nameof(Foreground),
-                Brushes.Black,
-                inherits: true);
+        public static readonly StyledProperty<IBrush?> ForegroundProperty =
+            TextElement.ForegroundProperty.AddOwner<TextBlock>();
+
+        /// <summary>
+        /// DependencyProperty for <see cref="BaselineOffset" /> property.
+        /// </summary>
+        public static readonly AttachedProperty<double> BaselineOffsetProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, double>(
+                nameof(BaselineOffset),
+                0,
+                true);
 
         /// <summary>
         /// Defines the <see cref="LineHeight"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> LineHeightProperty =
-            AvaloniaProperty.Register<TextBlock, double>(
+        public static readonly AttachedProperty<double> LineHeightProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, double>(
                 nameof(LineHeight),
                 double.NaN,
-                validate: IsValidLineHeight);
+                validate: IsValidLineHeight,
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="MaxLines"/> property.
         /// </summary>
-        public static readonly StyledProperty<int> MaxLinesProperty =
-            AvaloniaProperty.Register<TextBlock, int>(
+        public static readonly AttachedProperty<int> MaxLinesProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, int>(
                 nameof(MaxLines),
-                validate: IsValidMaxLines);
+                validate: IsValidMaxLines,
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="Text"/> property.
@@ -121,20 +112,24 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="TextAlignment"/> property.
         /// </summary>
-        public static readonly StyledProperty<TextAlignment> TextAlignmentProperty =
-            AvaloniaProperty.Register<TextBlock, TextAlignment>(nameof(TextAlignment));
+        public static readonly AttachedProperty<TextAlignment> TextAlignmentProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, TextAlignment>(nameof(TextAlignment), 
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="TextWrapping"/> property.
         /// </summary>
-        public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
-            AvaloniaProperty.Register<TextBlock, TextWrapping>(nameof(TextWrapping));
+        public static readonly AttachedProperty<TextWrapping> TextWrappingProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, TextWrapping>(nameof(TextWrapping), 
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="TextTrimming"/> property.
         /// </summary>
-        public static readonly StyledProperty<TextTrimming> TextTrimmingProperty =
-            AvaloniaProperty.Register<TextBlock, TextTrimming>(nameof(TextTrimming));
+        public static readonly AttachedProperty<TextTrimming> TextTrimmingProperty =
+            AvaloniaProperty.RegisterAttached<TextBlock, Control, TextTrimming>(nameof(TextTrimming), 
+                defaultValue: TextTrimming.None,
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="TextDecorations"/> property.
@@ -160,9 +155,7 @@ namespace Avalonia.Controls
         /// </summary>
         public TextBlock()
         {
-            Inlines = new InlineCollection(this);
-
-            Inlines.Invalidated += InlinesChanged;
+            Inlines = new InlineCollection(this, this);
         }
 
         /// <summary>
@@ -216,13 +209,13 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets the inlines.
+        /// Gets the inlines.
         /// </summary>
         [Content]
         public InlineCollection Inlines { get; }
 
         /// <summary>
-        /// Gets or sets the font family.
+        /// Gets or sets the font family used to draw the control's text.
         /// </summary>
         public FontFamily FontFamily
         {
@@ -231,7 +224,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets the font size.
+        /// Gets or sets the size of the control's text in points.
         /// </summary>
         public double FontSize
         {
@@ -240,7 +233,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets the font style.
+        /// Gets or sets the font style used to draw the control's text.
         /// </summary>
         public FontStyle FontStyle
         {
@@ -249,16 +242,16 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets the font weight.
+        /// Gets or sets the font weight used to draw the control's text.
         /// </summary>
         public FontWeight FontWeight
         {
             get { return GetValue(FontWeightProperty); }
             set { SetValue(FontWeightProperty, value); }
         }
-        
+
         /// <summary>
-        /// Gets or sets the font stretch.
+        /// Gets or sets the font stretch used to draw the control's text.
         /// </summary>
         public FontStretch FontStretch
         {
@@ -267,7 +260,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets a brush used to paint the text.
+        /// Gets or sets the brush used to draw the control's text and other foreground elements.
         /// </summary>
         public IBrush? Foreground
         {
@@ -328,127 +321,193 @@ namespace Avalonia.Controls
             get => GetValue(TextDecorationsProperty);
             set => SetValue(TextDecorationsProperty, value);
         }
+        
+        protected override bool BypassFlowDirectionPolicies => true;
 
         /// <summary>
-        /// Gets the value of the attached <see cref="FontFamilyProperty"/> on a control.
+        /// The BaselineOffset property provides an adjustment to baseline offset
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The font family.</returns>
-        public static FontFamily GetFontFamily(Control control)
+        public double BaselineOffset
         {
-            return control.GetValue(FontFamilyProperty);
+            get { return (double)GetValue(BaselineOffsetProperty); }
+            set { SetValue(BaselineOffsetProperty, value); }
         }
 
         /// <summary>
-        /// Gets the value of the attached <see cref="FontSizeProperty"/> on a control.
+        /// Reads the attached property from the given element
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The font size.</returns>
-        public static double GetFontSize(Control control)
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static double GetBaselineOffset(Control control)
         {
-            return control.GetValue(FontSizeProperty);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(BaselineOffsetProperty);
         }
 
         /// <summary>
-        /// Gets the value of the attached <see cref="FontStyleProperty"/> on a control.
+        /// Writes the attached property BaselineOffset to the given element.
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The font style.</returns>
-        public static FontStyle GetFontStyle(Control control)
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="value">The property value to set</param>
+        public static void SetBaselineOffset(Control control, double value)
         {
-            return control.GetValue(FontStyleProperty);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(BaselineOffsetProperty, value);
         }
 
         /// <summary>
-        /// Gets the value of the attached <see cref="FontWeightProperty"/> on a control.
+        /// Reads the attached property from the given element
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The font weight.</returns>
-        public static FontWeight GetFontWeight(Control control)
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static TextAlignment GetTextAlignment(Control control)
         {
-            return control.GetValue(FontWeightProperty);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(TextAlignmentProperty);
         }
-        
+
         /// <summary>
-        /// Gets the value of the attached <see cref="FontStretchProperty"/> on a control.
+        /// Writes the attached property BaselineOffset to the given element.
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The font stretch.</returns>
-        public static FontStretch GetFontStretch(Control control)
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="alignment">The property value to set</param>
+        public static void SetTextAlignment(Control control, TextAlignment alignment)
         {
-            return control.GetValue(FontStretchProperty);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(TextAlignmentProperty, alignment);
         }
 
         /// <summary>
-        /// Gets the value of the attached <see cref="ForegroundProperty"/> on a control.
+        /// Reads the attached property from the given element
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The foreground.</returns>
-        public static IBrush? GetForeground(Control control)
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static TextWrapping GetTextWrapping(Control control)
         {
-            return control.GetValue(ForegroundProperty);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(TextWrappingProperty);
         }
 
         /// <summary>
-        /// Sets the value of the attached <see cref="FontFamilyProperty"/> on a control.
+        /// Writes the attached property BaselineOffset to the given element.
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The property value to set.</param>
-        public static void SetFontFamily(Control control, FontFamily value)
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="wrapping">The property value to set</param>
+        public static void SetTextWrapping(Control control, TextWrapping wrapping)
         {
-            control.SetValue(FontFamilyProperty, value);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(TextWrappingProperty, wrapping);
         }
 
         /// <summary>
-        /// Sets the value of the attached <see cref="FontSizeProperty"/> on a control.
+        /// Reads the attached property from the given element
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The property value to set.</param>
-        public static void SetFontSize(Control control, double value)
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static TextTrimming GetTextTrimming(Control control)
         {
-            control.SetValue(FontSizeProperty, value);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(TextTrimmingProperty);
+        }
+
+        /// <summary>
+        /// Writes the attached property BaselineOffset to the given element.
+        /// </summary>
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="trimming">The property value to set</param>
+        public static void SetTextTrimming(Control control, TextTrimming trimming)
+        {
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(TextTrimmingProperty, trimming);
         }
 
         /// <summary>
-        /// Sets the value of the attached <see cref="FontStyleProperty"/> on a control.
+        /// Reads the attached property from the given element
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The property value to set.</param>
-        public static void SetFontStyle(Control control, FontStyle value)
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static double GetLineHeight(Control control)
         {
-            control.SetValue(FontStyleProperty, value);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(LineHeightProperty);
         }
 
         /// <summary>
-        /// Sets the value of the attached <see cref="FontWeightProperty"/> on a control.
+        /// Writes the attached property BaselineOffset to the given element.
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The property value to set.</param>
-        public static void SetFontWeight(Control control, FontWeight value)
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="height">The property value to set</param>
+        public static void SetLineHeight(Control control, double height)
         {
-            control.SetValue(FontWeightProperty, value);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(LineHeightProperty, height);
         }
-        
+
         /// <summary>
-        /// Sets the value of the attached <see cref="FontStretchProperty"/> on a control.
+        /// Reads the attached property from the given element
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The property value to set.</param>
-        public static void SetFontStretch(Control control, FontStretch value)
+        /// <param name="control">The element to which to read the attached property.</param>
+        public static int GetMaxLines(Control control)
         {
-            control.SetValue(FontStretchProperty, value);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            return control.GetValue(MaxLinesProperty);
         }
 
         /// <summary>
-        /// Sets the value of the attached <see cref="ForegroundProperty"/> on a control.
+        /// Writes the attached property BaselineOffset to the given element.
         /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The property value to set.</param>
-        public static void SetForeground(Control control, IBrush? value)
+        /// <param name="control">The element to which to write the attached property.</param>
+        /// <param name="maxLines">The property value to set</param>
+        public static void SetMaxLines(Control control, int maxLines)
         {
-            control.SetValue(ForegroundProperty, value);
+            if (control == null)
+            {
+                throw new ArgumentNullException(nameof(control));
+            }
+
+            control.SetValue(MaxLinesProperty, maxLines);
         }
 
+
         /// <summary>
         /// Renders the <see cref="TextBlock"/> to a drawing context.
         /// </summary>
@@ -491,38 +550,41 @@ namespace Avalonia.Controls
         /// <returns>A <see cref="TextLayout"/> object.</returns>
         protected virtual TextLayout CreateTextLayout(Size constraint, string? text)
         {
-            List<ValueSpan<TextRunProperties>>? textStyleOverrides = null;
+            var defaultProperties = new GenericTextRunProperties(
+                new Typeface(FontFamily, FontStyle, FontWeight, FontStretch),
+                FontSize,
+                TextDecorations,
+                Foreground);
+
+            var paragraphProperties = new GenericTextParagraphProperties(FlowDirection, TextAlignment, true, false,
+                defaultProperties, TextWrapping, LineHeight, 0);
+
+            ITextSource textSource;
 
             if (Inlines.HasComplexContent)
             {
-                textStyleOverrides = new List<ValueSpan<TextRunProperties>>(Inlines.Count);
-
-                var textPosition = 0;
-                var stringBuilder = new StringBuilder();
+                var textRuns = new List<TextRun>();
 
                 foreach (var inline in Inlines)
                 {
-                    textPosition += inline.BuildRun(stringBuilder, textStyleOverrides, textPosition);
+                    inline.BuildTextRun(textRuns);
                 }
 
-                text = stringBuilder.ToString();
+                textSource = new InlinesTextSource(textRuns);
+            }
+            else
+            {
+                textSource = new SimpleTextSource((text ?? "").AsMemory(), defaultProperties);
             }
 
             return new TextLayout(
-                text ?? string.Empty,
-                new Typeface(FontFamily, FontStyle, FontWeight, FontStretch),
-                FontSize,
-                Foreground ?? Brushes.Transparent,
-                TextAlignment,
-                TextWrapping,
+                textSource,
+                paragraphProperties,
                 TextTrimming,
-                TextDecorations,
-                FlowDirection,
                 constraint.Width,
                 constraint.Height,
                 maxLines: MaxLines,
-                lineHeight: LineHeight,
-                textStyleOverrides: textStyleOverrides);
+                lineHeight: LineHeight);
         }
 
         /// <summary>
@@ -531,7 +593,7 @@ namespace Avalonia.Controls
         protected void InvalidateTextLayout()
         {
             _textLayout = null;
-            
+
             InvalidateMeasure();
         }
 
@@ -542,28 +604,39 @@ namespace Avalonia.Controls
                 return new Size();
             }
 
-            var padding = Padding;
-            
+            var scale = LayoutHelper.GetLayoutScale(this);
+
+            var padding = LayoutHelper.RoundLayoutThickness(Padding, scale, scale);
+
             _constraint = availableSize.Deflate(padding);
-            
+
             _textLayout = null;
 
             InvalidateArrange();
 
-            var measuredSize = PixelSize.FromSize(TextLayout.Bounds.Size, 1);
+            var measuredSize = TextLayout.Bounds.Size.Inflate(padding);
 
-            return new Size(measuredSize.Width, measuredSize.Height).Inflate(padding);
+            return measuredSize;
         }
 
         protected override Size ArrangeOverride(Size finalSize)
         {
+            if(finalSize.Width < TextLayout.Bounds.Width)
+            {
+                finalSize = finalSize.WithWidth(TextLayout.Bounds.Width);
+            }
+
             if (MathUtilities.AreClose(_constraint.Width, finalSize.Width))
             {
                 return finalSize;
             }
-            
-            _constraint = finalSize;
-            
+
+            var scale = LayoutHelper.GetLayoutScale(this);
+
+            var padding = LayoutHelper.RoundLayoutThickness(Padding, scale, scale);
+
+            _constraint = new Size(finalSize.Deflate(padding).Width, double.PositiveInfinity);
+
             _textLayout = null;
 
             return finalSize;
@@ -578,7 +651,7 @@ namespace Avalonia.Controls
 
         private static bool IsValidLineHeight(double lineHeight) => double.IsNaN(lineHeight) || lineHeight > 0;
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -588,10 +661,12 @@ namespace Avalonia.Controls
                 case nameof (FontWeight):
                 case nameof (FontStyle):
                 case nameof (FontFamily):
+                case nameof (FontStretch):
 
                 case nameof (TextWrapping):
                 case nameof (TextTrimming):
                 case nameof (TextAlignment):
+
                 case nameof (FlowDirection):
 
                 case nameof (Padding):
@@ -608,9 +683,83 @@ namespace Avalonia.Controls
             }
         }
 
- 		private void InlinesChanged(object? sender, EventArgs e)
+        private void InlinesChanged(object? sender, EventArgs e)
+        {
+            InvalidateTextLayout();
+        }
+
+        void IInlineHost.AddVisualChild(IControl child)
+        {
+            if (child.VisualParent == null)
+            {
+                VisualChildren.Add(child);
+            }            
+        }
+
+        void IInlineHost.Invalidate()
         {
             InvalidateTextLayout();
         }
+
+        private readonly struct InlinesTextSource : ITextSource
+        {
+            private readonly IReadOnlyList<TextRun> _textRuns;
+
+            public InlinesTextSource(IReadOnlyList<TextRun> textRuns)
+            {
+                _textRuns = textRuns;
+            }
+
+            public TextRun? GetTextRun(int textSourceIndex)
+            {
+                var currentPosition = 0;
+
+                foreach (var textRun in _textRuns)
+                {
+                    if(textRun.TextSourceLength == 0)
+                    {
+                        continue;
+                    }
+
+                    if(currentPosition >= textSourceIndex)
+                    {
+                        return textRun;
+                    }
+
+                    currentPosition += textRun.TextSourceLength;
+                }
+
+                return null;
+            }
+        }
+
+        private readonly struct SimpleTextSource : ITextSource
+        {
+            private readonly ReadOnlySlice<char> _text;
+            private readonly TextRunProperties _defaultProperties;
+
+            public SimpleTextSource(ReadOnlySlice<char> text, TextRunProperties defaultProperties)
+            {
+                _text = text;
+                _defaultProperties = defaultProperties;
+            }
+
+            public TextRun? GetTextRun(int textSourceIndex)
+            {
+                if (textSourceIndex > _text.Length)
+                {
+                    return null;
+                }
+
+                var runText = _text.Skip(textSourceIndex);
+
+                if (runText.IsEmpty)
+                {
+                    return null;
+                }
+
+                return new TextCharacters(runText, _defaultProperties);
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 995ec142a5..7652b23162 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -23,6 +23,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Represents a control that can be used to display or edit unformatted text.
     /// </summary>
+    [TemplatePart("PART_TextPresenter", typeof(TextPresenter))]
     [PseudoClasses(":empty")]
     public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.IUndoRedoHost
     {
@@ -54,13 +55,13 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<TextBox, char>(nameof(PasswordChar));
 
         public static readonly StyledProperty<IBrush?> SelectionBrushProperty =
-            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(SelectionBrushProperty));
+            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(SelectionBrush));
 
         public static readonly StyledProperty<IBrush?> SelectionForegroundBrushProperty =
-            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(SelectionForegroundBrushProperty));
+            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(SelectionForegroundBrush));
 
         public static readonly StyledProperty<IBrush?> CaretBrushProperty =
-            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(CaretBrushProperty));
+            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(CaretBrush));
 
         public static readonly DirectProperty<TextBox, int> SelectionStartProperty =
             AvaloniaProperty.RegisterDirect<TextBox, int>(
@@ -77,6 +78,9 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<int> MaxLengthProperty =
             AvaloniaProperty.Register<TextBox, int>(nameof(MaxLength), defaultValue: 0);
 
+        public static readonly StyledProperty<int> MaxLinesProperty =
+            AvaloniaProperty.Register<TextBox, int>(nameof(MaxLines), defaultValue: 0);
+        
         public static readonly DirectProperty<TextBox, string?> TextProperty =
             TextBlock.TextProperty.AddOwnerWithDataValidation<TextBox>(
                 o => o.Text,
@@ -101,6 +105,12 @@ namespace Avalonia.Controls
 
         public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
             TextBlock.TextWrappingProperty.AddOwner<TextBox>();
+        
+        /// <summary>
+        /// Defines see <see cref="TextPresenter.LineHeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> LineHeightProperty =
+            TextBlock.LineHeightProperty.AddOwner<TextBox>();
 
         public static readonly StyledProperty<string?> WatermarkProperty =
             AvaloniaProperty.Register<TextBox, string?>(nameof(Watermark));
@@ -150,15 +160,15 @@ namespace Avalonia.Controls
 
         public static readonly RoutedEvent<RoutedEventArgs> CopyingToClipboardEvent =
             RoutedEvent.Register<TextBox, RoutedEventArgs>(
-                "CopyingToClipboard", RoutingStrategies.Bubble);
+                nameof(CopyingToClipboard), RoutingStrategies.Bubble);
 
         public static readonly RoutedEvent<RoutedEventArgs> CuttingToClipboardEvent =
             RoutedEvent.Register<TextBox, RoutedEventArgs>(
-                "CuttingToClipboard", RoutingStrategies.Bubble);
+                nameof(CuttingToClipboard), RoutingStrategies.Bubble);
 
         public static readonly RoutedEvent<RoutedEventArgs> PastingFromClipboardEvent =
             RoutedEvent.Register<TextBox, RoutedEventArgs>(
-                "PastingFromClipboard", RoutingStrategies.Bubble);
+                nameof(PastingFromClipboard), RoutingStrategies.Bubble);
 
         readonly struct UndoRedoState : IEquatable<UndoRedoState>
         {
@@ -202,7 +212,10 @@ namespace Avalonia.Controls
             FocusableProperty.OverrideDefaultValue(typeof(TextBox), true);
             TextInputMethodClientRequestedEvent.AddClassHandler<TextBox>((tb, e) =>
             {
-                e.Client = tb._imClient;
+                if (!tb.IsReadOnly)
+                {
+                    e.Client = tb._imClient;
+                }
             });
         }
 
@@ -232,23 +245,19 @@ namespace Avalonia.Controls
 
         public bool AcceptsReturn
         {
-            get { return GetValue(AcceptsReturnProperty); }
-            set { SetValue(AcceptsReturnProperty, value); }
+            get => GetValue(AcceptsReturnProperty);
+            set => SetValue(AcceptsReturnProperty, value);
         }
 
         public bool AcceptsTab
         {
-            get { return GetValue(AcceptsTabProperty); }
-            set { SetValue(AcceptsTabProperty, value); }
+            get => GetValue(AcceptsTabProperty);
+            set => SetValue(AcceptsTabProperty, value);
         }
 
         public int CaretIndex
         {
-            get
-            {
-                return _caretIndex;
-            }
-
+            get => _caretIndex;
             set
             {
                 value = CoerceCaretIndex(value);
@@ -264,8 +273,8 @@ namespace Avalonia.Controls
 
         public bool IsReadOnly
         {
-            get { return GetValue(IsReadOnlyProperty); }
-            set { SetValue(IsReadOnlyProperty, value); }
+            get => GetValue(IsReadOnlyProperty);
+            set => SetValue(IsReadOnlyProperty, value);
         }
 
         public char PasswordChar
@@ -294,11 +303,7 @@ namespace Avalonia.Controls
 
         public int SelectionStart
         {
-            get
-            {
-                return _selectionStart;
-            }
-
+            get => _selectionStart;
             set
             {
                 value = CoerceCaretIndex(value);
@@ -318,11 +323,7 @@ namespace Avalonia.Controls
 
         public int SelectionEnd
         {
-            get
-            {
-                return _selectionEnd;
-            }
-
+            get => _selectionEnd;
             set
             {
                 value = CoerceCaretIndex(value);
@@ -342,14 +343,29 @@ namespace Avalonia.Controls
 
         public int MaxLength
         {
-            get { return GetValue(MaxLengthProperty); }
-            set { SetValue(MaxLengthProperty, value); }
+            get => GetValue(MaxLengthProperty);
+            set => SetValue(MaxLengthProperty, value);
+        }
+
+        public int MaxLines
+        {
+            get => GetValue(MaxLinesProperty);
+            set => SetValue(MaxLinesProperty, value);
+        }
+        
+        /// <summary>
+        /// Gets or sets the line height.
+        /// </summary>
+        public double LineHeight
+        {
+            get { return GetValue(LineHeightProperty); }
+            set { SetValue(LineHeightProperty, value); }
         }
 
         [Content]
         public string? Text
         {
-            get { return _text; }
+            get => _text;
             set
             {
                 if (!_ignoreTextChanges)
@@ -373,7 +389,7 @@ namespace Avalonia.Controls
 
         public string SelectedText
         {
-            get { return GetSelection(); }
+            get => GetSelection();
             set
             {
                 if (string.IsNullOrEmpty(value))
@@ -394,8 +410,8 @@ namespace Avalonia.Controls
         /// </summary>
         public HorizontalAlignment HorizontalContentAlignment
         {
-            get { return GetValue(HorizontalContentAlignmentProperty); }
-            set { SetValue(HorizontalContentAlignmentProperty, value); }
+            get => GetValue(HorizontalContentAlignmentProperty);
+            set => SetValue(HorizontalContentAlignmentProperty, value);
         }
 
         /// <summary>
@@ -403,50 +419,58 @@ namespace Avalonia.Controls
         /// </summary>
         public VerticalAlignment VerticalContentAlignment
         {
-            get { return GetValue(VerticalContentAlignmentProperty); }
-            set { SetValue(VerticalContentAlignmentProperty, value); }
+            get => GetValue(VerticalContentAlignmentProperty);
+            set => SetValue(VerticalContentAlignmentProperty, value);
         }
 
         public TextAlignment TextAlignment
         {
-            get { return GetValue(TextAlignmentProperty); }
-            set { SetValue(TextAlignmentProperty, value); }
+            get => GetValue(TextAlignmentProperty);
+            set => SetValue(TextAlignmentProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the placeholder or descriptive text that is displayed even if the <see cref="Text"/>
+        /// property is not yet set.
+        /// </summary>
         public string? Watermark
         {
-            get { return GetValue(WatermarkProperty); }
-            set { SetValue(WatermarkProperty, value); }
+            get => GetValue(WatermarkProperty);
+            set => SetValue(WatermarkProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the <see cref="Watermark"/> will still be shown above the
+        /// <see cref="Text"/> even after a text value is set.
+        /// </summary>
         public bool UseFloatingWatermark
         {
-            get { return GetValue(UseFloatingWatermarkProperty); }
-            set { SetValue(UseFloatingWatermarkProperty, value); }
+            get => GetValue(UseFloatingWatermarkProperty);
+            set => SetValue(UseFloatingWatermarkProperty, value);
         }
 
         public object InnerLeftContent
         {
-            get { return GetValue(InnerLeftContentProperty); }
-            set { SetValue(InnerLeftContentProperty, value); }
+            get => GetValue(InnerLeftContentProperty);
+            set => SetValue(InnerLeftContentProperty, value);
         }
 
         public object InnerRightContent
         {
-            get { return GetValue(InnerRightContentProperty); }
-            set { SetValue(InnerRightContentProperty, value); }
+            get => GetValue(InnerRightContentProperty);
+            set => SetValue(InnerRightContentProperty, value);
         }
 
         public bool RevealPassword
         {
-            get { return GetValue(RevealPasswordProperty); }
-            set { SetValue(RevealPasswordProperty, value); }
+            get => GetValue(RevealPasswordProperty);
+            set => SetValue(RevealPasswordProperty, value);
         }
 
         public TextWrapping TextWrapping
         {
-            get { return GetValue(TextWrappingProperty); }
-            set { SetValue(TextWrappingProperty, value); }
+            get => GetValue(TextWrappingProperty);
+            set => SetValue(TextWrappingProperty, value);
         }
 
         /// <summary>
@@ -454,8 +478,8 @@ namespace Avalonia.Controls
         /// </summary>
         public string NewLine
         {
-            get { return _newLine; }
-            set { SetAndRaise(NewLineProperty, ref _newLine, value); }
+            get => _newLine;
+            set => SetAndRaise(NewLineProperty, ref _newLine, value);
         }
 
         /// <summary>
@@ -471,8 +495,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool CanCut
         {
-            get { return _canCut; }
-            private set { SetAndRaise(CanCutProperty, ref _canCut, value); }
+            get => _canCut;
+            private set => SetAndRaise(CanCutProperty, ref _canCut, value);
         }
 
         /// <summary>
@@ -480,8 +504,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool CanCopy
         {
-            get { return _canCopy; }
-            private set { SetAndRaise(CanCopyProperty, ref _canCopy, value); }
+            get => _canCopy;
+            private set => SetAndRaise(CanCopyProperty, ref _canCopy, value);
         }
 
         /// <summary>
@@ -489,8 +513,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool CanPaste
         {
-            get { return _canPaste; }
-            private set { SetAndRaise(CanPasteProperty, ref _canPaste, value); }
+            get => _canPaste;
+            private set => SetAndRaise(CanPasteProperty, ref _canPaste, value);
         }
 
         /// <summary>
@@ -498,13 +522,13 @@ namespace Avalonia.Controls
         /// </summary>
         public bool IsUndoEnabled
         {
-            get { return GetValue(IsUndoEnabledProperty); }
-            set { SetValue(IsUndoEnabledProperty, value); }
+            get => GetValue(IsUndoEnabledProperty);
+            set => SetValue(IsUndoEnabledProperty, value);
         }
 
         public int UndoLimit
         {
-            get { return _undoRedoHelper.Limit; }
+            get => _undoRedoHelper.Limit;
             set
             {
                 if (_undoRedoHelper.Limit != value)
@@ -572,7 +596,7 @@ namespace Avalonia.Controls
             _imClient.SetPresenter(null, null);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -581,7 +605,7 @@ namespace Avalonia.Controls
                 UpdatePseudoclasses();
                 UpdateCommandStates();
             }
-            else if (change.Property == IsUndoEnabledProperty && change.NewValue.GetValueOrDefault<bool>() == false)
+            else if (change.Property == IsUndoEnabledProperty && change.GetNewValue<bool>() == false)
             {
                 // from docs at
                 // https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.primitives.textboxbase.isundoenabled:
@@ -667,6 +691,39 @@ namespace Avalonia.Controls
             _selectedTextChangesMadeSinceLastUndoSnapshot++;
             SnapshotUndoRedo(ignoreChangeCount: false);
 
+            if (_presenter != null && MaxLines > 0)
+            {
+                var lineCount = _presenter.TextLayout.TextLines.Count;
+
+                var length = 0;
+
+                var graphemeEnumerator = new GraphemeEnumerator(input.AsMemory());
+
+                while (graphemeEnumerator.MoveNext())
+                {
+                    var grapheme = graphemeEnumerator.Current;
+
+                    if (grapheme.FirstCodepoint.IsBreakChar)
+                    {
+                        if(lineCount + 1 > MaxLines)
+                        {
+                            break;
+                        }
+                        else
+                        {
+                            lineCount++;
+                        }                       
+                    }
+
+                    length += grapheme.Text.Length;
+                }
+
+                if (length < input.Length)
+                {
+                    input = input.Remove(Math.Max(0, length));
+                }
+            }
+
             var text = Text ?? string.Empty;
             var newLength = input.Length + text.Length - Math.Abs(SelectionStart - SelectionEnd);
 
@@ -994,18 +1051,25 @@ namespace Avalonia.Controls
                             SetSelectionForControlBackspace();
                         }
 
-                        if (!DeleteSelection() && caretIndex > 0)
+                        if (!DeleteSelection())
                         {
-                            _presenter.MoveCaretHorizontal(LogicalDirection.Backward);
+                            var characterHit = _presenter.GetNextCharacterHit(LogicalDirection.Backward);
 
-                            var removedCharacters = Math.Max(0, caretIndex - _presenter.CaretIndex);
-                            
-                            var length = Math.Max(0, caretIndex - removedCharacters);
+                            var backspacePosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
 
-                            SetTextInternal(text.Substring(0, length) +
-                                            text.Substring(caretIndex));
+                            if (caretIndex != backspacePosition)
+                            {
+                                var start = Math.Min(backspacePosition, caretIndex);
+                                var end = Math.Max(backspacePosition, caretIndex);
 
-                            CaretIndex = _presenter.CaretIndex;
+                                var length = end - start;
+
+                                var editedText = text.Substring(0, start) + text.Substring(Math.Min(end, text.Length));
+
+                                SetTextInternal(editedText);
+
+                                CaretIndex = start;
+                            } 
                         }
                         
                         SnapshotUndoRedo();
@@ -1021,15 +1085,21 @@ namespace Avalonia.Controls
                             SetSelectionForControlDelete();
                         }
 
-                        if (!DeleteSelection() && caretIndex < text.Length)
+                        if (!DeleteSelection())
                         {
                             var characterHit = _presenter.GetNextCharacterHit();
 
-                            var removedCharacters = Math.Max(0,
-                                characterHit.FirstCharacterIndex + characterHit.TrailingLength - caretIndex);
+                            var nextPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+
+                            if(nextPosition != caretIndex)
+                            {
+                                var start = Math.Min(nextPosition, caretIndex);
+                                var end = Math.Max(nextPosition, caretIndex);
 
-                            SetTextInternal(text.Substring(0, caretIndex) +
-                                            text.Substring(caretIndex + removedCharacters));
+                                var editedText = text.Substring(0, start) + text.Substring(Math.Min(end, text.Length));
+
+                                SetTextInternal(editedText);
+                            }
                         }
 
                         SnapshotUndoRedo();
@@ -1203,11 +1273,14 @@ namespace Avalonia.Controls
             return new TextBoxAutomationPeer(this);
         }
 
-        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        protected override void UpdateDataValidation(
+            AvaloniaProperty property,
+            BindingValueType state,
+            Exception? error)
         {
             if (property == TextProperty)
             {
-                DataValidationErrors.SetError(this, value.Error);
+                DataValidationErrors.SetError(this, error);
             }
         }
 
@@ -1246,17 +1319,17 @@ namespace Avalonia.Controls
 
         private void MoveHorizontal(int direction, bool wholeWord, bool isSelecting)
         {
+            if (_presenter == null)
+            {
+                return;
+            }
+            
             var text = Text ?? string.Empty;
             var selectionStart = SelectionStart;
             var selectionEnd = SelectionEnd;
 
             if (!wholeWord)
             {
-                if (_presenter == null)
-                {
-                    return;
-                }
-                
                 if (isSelecting)
                 {
                     _presenter.MoveCaretToTextPosition(selectionEnd);
@@ -1300,10 +1373,16 @@ namespace Avalonia.Controls
                 
                 SelectionEnd += offset;
 
+                _presenter.MoveCaretToTextPosition(SelectionEnd);
+
                 if (!isSelecting)
                 {
                     CaretIndex = SelectionEnd;
                 }
+                else
+                {
+                    SelectionStart = selectionStart;
+                }
             }
         }
 
@@ -1323,10 +1402,10 @@ namespace Avalonia.Controls
             else
             {
                 var textLines = _presenter.TextLayout.TextLines;
-                var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(caretIndex, true);
+                var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(caretIndex, false);
                 var textLine = textLines[lineIndex];
 
-                _presenter.MoveCaretToTextPosition(textLine.TextRange.Start);
+                _presenter.MoveCaretToTextPosition(textLine.FirstTextSourceIndex);
             }
         }
 
@@ -1347,16 +1426,10 @@ namespace Avalonia.Controls
             else
             {
                 var textLines = _presenter.TextLayout.TextLines;
-                var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(caretIndex, true);
+                var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(caretIndex, false);
                 var textLine = textLines[lineIndex];
-                
-                if (caretIndex == textLine.TextRange.Start + textLine.TextRange.Length  - textLine.NewLineLength &&
-                    lineIndex + 1 < textLines.Count)
-                {
-                    textLine = textLines[++lineIndex];
-                }
 
-                var textPosition = textLine.TextRange.Start + textLine.TextRange.Length - textLine.NewLineLength;
+                var textPosition = textLine.FirstTextSourceIndex + textLine.Length;
 
                 _presenter.MoveCaretToTextPosition(textPosition, true);
             }
@@ -1477,7 +1550,7 @@ namespace Avalonia.Controls
 
         UndoRedoState UndoRedoHelper<UndoRedoState>.IUndoRedoHost.UndoRedoState
         {
-            get { return new UndoRedoState(Text, CaretIndex); }
+            get => new UndoRedoState(Text, CaretIndex);
             set
             {
                 Text = value.Text;
diff --git a/src/Avalonia.Controls/ToggleSwitch.cs b/src/Avalonia.Controls/ToggleSwitch.cs
index f33f2b9df3..fd6c202c6f 100644
--- a/src/Avalonia.Controls/ToggleSwitch.cs
+++ b/src/Avalonia.Controls/ToggleSwitch.cs
@@ -9,6 +9,8 @@ namespace Avalonia.Controls
     /// <summary>
     /// A Toggle Switch control.
     /// </summary>
+    [TemplatePart("MovingKnobs", typeof(Panel))]
+    [TemplatePart("SwitchKnob",  typeof(Panel))]
     [PseudoClasses(":dragging")]
     public class ToggleSwitch : ToggleButton
     {
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index a4fe154515..57fb82485c 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reactive.Linq;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
@@ -14,7 +15,6 @@ using Avalonia.Rendering;
 using Avalonia.Styling;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
-using JetBrains.Annotations;
 
 namespace Avalonia.Controls
 {
@@ -26,6 +26,7 @@ namespace Avalonia.Controls
     /// It handles scheduling layout, styling and rendering as well as
     /// tracking the widget's <see cref="ClientSize"/>.
     /// </remarks>
+    [TemplatePart("PART_TransparencyFallback", typeof(Border))]
     public abstract class TopLevel : ContentControl,
         IInputRoot,
         ILayoutRoot,
@@ -33,8 +34,7 @@ namespace Avalonia.Controls
         ICloseable,
         IStyleHost,
         ILogicalRoot,
-        ITextInputMethodRoot,
-        IWeakEventSubscriber<ResourcesChangedEventArgs>
+        ITextInputMethodRoot
     {
         /// <summary>
         /// Defines the <see cref="ClientSize"/> property.
@@ -85,11 +85,14 @@ namespace Avalonia.Controls
         private readonly IKeyboardNavigationHandler? _keyboardNavigationHandler;
         private readonly IPlatformRenderInterface? _renderInterface;
         private readonly IGlobalStyles? _globalStyles;
+        private readonly PointerOverPreProcessor? _pointerOverPreProcessor;
+        private readonly IDisposable? _pointerOverPreProcessorSubscription;
         private Size _clientSize;
         private Size? _frameSize;
         private WindowTransparencyLevel _actualTransparencyLevel;
         private ILayoutManager? _layoutManager;
         private Border? _transparencyFallbackBorder;
+        private TargetWeakEventSubscriber<TopLevel, ResourcesChangedEventArgs>? _resourcesChangesSubscriber;
 
         /// <summary>
         /// Initializes static members of the <see cref="TopLevel"/> class.
@@ -189,10 +192,19 @@ namespace Avalonia.Controls
 
             if (((IStyleHost)this).StylingParent is IResourceHost applicationResources)
             {
-                ResourcesChangedWeakEvent.Subscribe(applicationResources, this);
+                _resourcesChangesSubscriber = new TargetWeakEventSubscriber<TopLevel, ResourcesChangedEventArgs>(
+                    this, static (target, _, _, e) =>
+                    {
+                        ((ILogical)target).NotifyResourcesChanged(e);
+                    });
+
+                ResourcesChangedWeakEvent.Subscribe(applicationResources, _resourcesChangesSubscriber);
             }
 
             impl.LostFocus += PlatformImpl_LostFocus;
+
+            _pointerOverPreProcessor = new PointerOverPreProcessor(this);
+            _pointerOverPreProcessorSubscription = _inputManager?.PreProcess.Subscribe(_pointerOverPreProcessor);
         }
 
         /// <summary>
@@ -281,9 +293,7 @@ namespace Avalonia.Controls
         /// </summary>
         IKeyboardNavigationHandler IInputRoot.KeyboardNavigationHandler => _keyboardNavigationHandler!;
 
-        /// <summary>
-        /// Gets or sets the input element that the pointer is currently over.
-        /// </summary>
+        /// <inheritdoc/>
         IInputElement? IInputRoot.PointerOverElement
         {
             get { return GetValue(PointerOverElementProperty); }
@@ -293,11 +303,6 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         IMouseDevice? IInputRoot.MouseDevice => PlatformImpl?.MouseDevice;
 
-        void IWeakEventSubscriber<ResourcesChangedEventArgs>.OnEvent(object? sender, WeakEvent ev, ResourcesChangedEventArgs e)
-        {
-            ((ILogical)this).NotifyResourcesChanged(e);
-        }
-
         /// <summary>
         /// Gets or sets a value indicating whether access keys are shown in the window.
         /// </summary>
@@ -348,6 +353,12 @@ namespace Avalonia.Controls
         /// </summary>
         protected virtual ILayoutManager CreateLayoutManager() => new LayoutManager(this);
 
+        public override void InvalidateMirrorTransform()
+        {
+        }
+        
+        protected override bool BypassFlowDirectionPolicies => true;
+        
         /// <summary>
         /// Handles a paint notification from <see cref="ITopLevelImpl.Resized"/>.
         /// </summary>
@@ -370,10 +381,12 @@ namespace Avalonia.Controls
 
             Renderer?.Dispose();
             Renderer = null!;
-            
-            (this as IInputRoot).MouseDevice?.TopLevelClosed(this);
+
+            _pointerOverPreProcessor?.OnCompleted();
+            _pointerOverPreProcessorSubscription?.Dispose();
+
             PlatformImpl = null;
-            
+
             var logicalArgs = new LogicalTreeAttachmentEventArgs(this, this, null);
             ((ILogical)this).NotifyDetachedFromLogicalTree(logicalArgs);
 
@@ -507,12 +520,17 @@ namespace Avalonia.Controls
         /// <param name="e">The event args.</param>
         private void HandleInput(RawInputEventArgs e)
         {
+            if (e is RawPointerEventArgs pointerArgs)
+            {
+                pointerArgs.InputHitTestResult = this.InputHitTest(pointerArgs.Position);
+            }
+
             _inputManager?.ProcessInput(e);
         }
 
         private void SceneInvalidated(object? sender, SceneInvalidatedEventArgs e)
         {
-            (this as IInputRoot).MouseDevice?.SceneInvalidated(this, e.DirtyRect);
+            _pointerOverPreProcessor?.SceneInvalidated(e.DirtyRect);
         }
 
         void PlatformImpl_LostFocus()
diff --git a/src/Avalonia.Controls/TransitioningContentControl.cs b/src/Avalonia.Controls/TransitioningContentControl.cs
index cb0d229110..451e234653 100644
--- a/src/Avalonia.Controls/TransitioningContentControl.cs
+++ b/src/Avalonia.Controls/TransitioningContentControl.cs
@@ -61,7 +61,7 @@ public class TransitioningContentControl : ContentControl
         _lastTransitionCts?.Cancel();
     }
 
-    protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
 
diff --git a/src/Avalonia.Controls/TrayIcon.cs b/src/Avalonia.Controls/TrayIcon.cs
index b8ab48a2b7..2ccb03e447 100644
--- a/src/Avalonia.Controls/TrayIcon.cs
+++ b/src/Avalonia.Controls/TrayIcon.cs
@@ -206,7 +206,7 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -216,15 +216,15 @@ namespace Avalonia.Controls
             }
             else if (change.Property == IsVisibleProperty)
             {
-                _impl?.SetIsVisible(change.NewValue.GetValueOrDefault<bool>());
+                _impl?.SetIsVisible(change.GetNewValue<bool>());
             }
             else if (change.Property == ToolTipTextProperty)
             {
-                _impl?.SetToolTipText(change.NewValue.GetValueOrDefault<string?>());
+                _impl?.SetToolTipText(change.GetNewValue<string?>());
             }
             else if (change.Property == MenuProperty)
             {
-                _impl?.MenuExporter?.SetNativeMenu(change.NewValue.GetValueOrDefault<NativeMenu>());
+                _impl?.MenuExporter?.SetNativeMenu(change.GetNewValue<NativeMenu?>());
             }
         }
 
diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs
index 9a276e74d2..b2a188a2ea 100644
--- a/src/Avalonia.Controls/TreeView.cs
+++ b/src/Avalonia.Controls/TreeView.cs
@@ -401,7 +401,7 @@ namespace Avalonia.Controls
         protected virtual ITreeItemContainerGenerator CreateTreeItemContainerGenerator() =>
             CreateTreeItemContainerGenerator<TreeViewItem>();
 
-        protected virtual ITreeItemContainerGenerator CreateTreeItemContainerGenerator<TVItem>() where TVItem: TreeViewItem, new()
+        protected ITreeItemContainerGenerator CreateTreeItemContainerGenerator<TVItem>() where TVItem: TreeViewItem, new()
         {
             return new TreeItemContainerGenerator<TVItem>(
                 this,
@@ -849,7 +849,7 @@ namespace Avalonia.Controls
         /// <param name="desired">The desired items.</param>
         private static void SynchronizeItems(IList items, IEnumerable<object> desired)
         {
-            var list = items.Cast<object>().ToList();
+            var list = items.Cast<object>();
             var toRemove = list.Except(desired).ToList();
             var toAdd = desired.Except(list).ToList();
 
diff --git a/src/Avalonia.Controls/TreeViewItem.cs b/src/Avalonia.Controls/TreeViewItem.cs
index 20c0ed386d..490b0b3ce3 100644
--- a/src/Avalonia.Controls/TreeViewItem.cs
+++ b/src/Avalonia.Controls/TreeViewItem.cs
@@ -12,6 +12,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// An item in a <see cref="TreeView"/>.
     /// </summary>
+    [TemplatePart("PART_Header", typeof(IControl))]
     [PseudoClasses(":pressed", ":selected")]
     public class TreeViewItem : HeaderedItemsControl, ISelectable
     {
@@ -95,7 +96,7 @@ namespace Avalonia.Controls
         protected override IItemContainerGenerator CreateItemContainerGenerator() => CreateTreeItemContainerGenerator<TreeViewItem>();
 
         /// <inheritdoc/>
-        protected virtual ITreeItemContainerGenerator CreateTreeItemContainerGenerator<TVItem>()
+        protected ITreeItemContainerGenerator CreateTreeItemContainerGenerator<TVItem>()
             where TVItem: TreeViewItem, new()
         {
             return new TreeItemContainerGenerator<TVItem>(
diff --git a/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs b/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
index 0b1c4fc90e..9d13daa453 100644
--- a/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
+++ b/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
@@ -105,7 +105,7 @@ namespace Avalonia.Controls.Utils
                 static void Notify(
                     INotifyCollectionChanged incc,
                     NotifyCollectionChangedEventArgs args,
-                    List<WeakReference<ICollectionChangedListener>> listeners)
+                    WeakReference<ICollectionChangedListener>[] listeners)
                 {
                     foreach (var l in listeners)
                     {
@@ -132,7 +132,7 @@ namespace Avalonia.Controls.Utils
                     }
                 }
 
-                var l = Listeners.ToList();
+                var l = Listeners.ToArray();
 
                 if (Dispatcher.UIThread.CheckAccess())
                 {
diff --git a/src/Avalonia.Controls/Viewbox.cs b/src/Avalonia.Controls/Viewbox.cs
index 624c61bb82..aabfd3ef18 100644
--- a/src/Avalonia.Controls/Viewbox.cs
+++ b/src/Avalonia.Controls/Viewbox.cs
@@ -1,18 +1,21 @@
 using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Viewbox is used to scale single child to fit in the available space.
     /// </summary>
-    /// <seealso cref="Avalonia.Controls.Decorator" />
-    public class Viewbox : Decorator
+    public class Viewbox : Control
     {
+        private readonly ViewboxContainer _containerVisual;
+
         /// <summary>
         /// Defines the <see cref="Stretch"/> property.
         /// </summary>
         public static readonly StyledProperty<Stretch> StretchProperty =
-            AvaloniaProperty.Register<Image, Stretch>(nameof(Stretch), Stretch.Uniform);
+            AvaloniaProperty.Register<Viewbox, Stretch>(nameof(Stretch), Stretch.Uniform);
 
         /// <summary>
         /// Defines the <see cref="StretchDirection"/> property.
@@ -20,12 +23,28 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<StretchDirection> StretchDirectionProperty =
             AvaloniaProperty.Register<Viewbox, StretchDirection>(nameof(StretchDirection), StretchDirection.Both);
 
+        /// <summary>
+        /// Defines the <see cref="Child"/> property
+        /// </summary>
+        public static readonly StyledProperty<IControl?> ChildProperty =
+            Decorator.ChildProperty.AddOwner<Viewbox>();
+
         static Viewbox()
         {
             ClipToBoundsProperty.OverrideDefaultValue<Viewbox>(true);
+            UseLayoutRoundingProperty.OverrideDefaultValue<Viewbox>(true);
             AffectsMeasure<Viewbox>(StretchProperty, StretchDirectionProperty);
         }
 
+        public Viewbox()
+        {
+            // The Child control is hosted inside a ViewboxContainer control so that the transform
+            // can be applied independently of the Viewbox and Child transforms.
+            _containerVisual = new ViewboxContainer();
+            _containerVisual.RenderTransformOrigin = RelativePoint.TopLeft;
+            VisualChildren.Add(_containerVisual);
+        }
+
         /// <summary>
         /// Gets or sets the stretch mode, 
         /// which determines how child fits into the available space.
@@ -45,9 +64,55 @@ namespace Avalonia.Controls
             set => SetValue(StretchDirectionProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the child of the Viewbox
+        /// </summary>
+        [Content]
+        public IControl? Child
+        {
+            get => GetValue(ChildProperty);
+            set => SetValue(ChildProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the transform applied to the container visual that
+        /// hosts the child of the Viewbox
+        /// </summary>
+        protected internal ITransform? InternalTransform
+        {
+            get => _containerVisual.RenderTransform;
+            set => _containerVisual.RenderTransform = value;
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ChildProperty)
+            {
+                var (oldChild, newChild) = change.GetOldAndNewValue<IControl>();
+
+                if (oldChild is not null)
+                {
+                    ((ISetLogicalParent)oldChild).SetParent(null);
+                    LogicalChildren.Remove(oldChild);
+                }
+
+                _containerVisual.Child = newChild;
+
+                if (newChild is not null)
+                {
+                    ((ISetLogicalParent)newChild).SetParent(this);
+                    LogicalChildren.Add(newChild);
+                }
+
+                InvalidateMeasure();
+            }
+        }
+
         protected override Size MeasureOverride(Size availableSize)
         {
-            var child = Child;
+            var child = _containerVisual;
 
             if (child != null)
             {
@@ -57,7 +122,7 @@ namespace Avalonia.Controls
 
                 var size = Stretch.CalculateSize(availableSize, childSize, StretchDirection);
 
-                return size.Constrain(availableSize);
+                return size;
             }
 
             return new Size();
@@ -65,31 +130,49 @@ namespace Avalonia.Controls
 
         protected override Size ArrangeOverride(Size finalSize)
         {
-            var child = Child;
+            var child = _containerVisual;
 
             if (child != null)
             {
                 var childSize = child.DesiredSize;
                 var scale = Stretch.CalculateScaling(finalSize, childSize, StretchDirection);
 
-                // TODO: Viewbox should have another decorator as a child so we won't affect other render transforms.
-                var scaleTransform = child.RenderTransform as ScaleTransform;
-
-                if (scaleTransform == null)
-                {
-                    child.RenderTransform = scaleTransform = new ScaleTransform(scale.X, scale.Y);
-                    child.RenderTransformOrigin = RelativePoint.TopLeft;
-                }
-
-                scaleTransform.ScaleX = scale.X;
-                scaleTransform.ScaleY = scale.Y;
+                InternalTransform = new ImmutableTransform(Matrix.CreateScale(scale.X, scale.Y));
 
                 child.Arrange(new Rect(childSize));
 
                 return childSize * scale;
             }
 
-            return new Size();
+            return finalSize;
+        }
+
+        /// <summary>
+        /// A simple container control which hosts its child as a visual but not logical child.
+        /// </summary>
+        private class ViewboxContainer : Control
+        {
+            private IControl? _child;
+
+            public IControl? Child
+            {
+                get => _child;
+                set
+                {
+                    if (_child != value)
+                    {
+                        if (_child is not null)
+                            VisualChildren.Remove(_child);
+
+                        _child = value;
+
+                        if (_child is not null)
+                            VisualChildren.Add(_child);
+
+                        InvalidateMeasure();
+                    }
+                }
+            }
         }
     }
 }
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index eda23389f7..a4f4534b88 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -12,7 +12,6 @@ using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Styling;
-using JetBrains.Annotations;
 
 namespace Avalonia.Controls
 {
@@ -172,13 +171,13 @@ namespace Avalonia.Controls
         /// <summary>
         /// Routed event that can be used for global tracking of window destruction
         /// </summary>
-        public static readonly RoutedEvent WindowClosedEvent =
+        public static readonly RoutedEvent<RoutedEventArgs> WindowClosedEvent =
             RoutedEvent.Register<Window, RoutedEventArgs>("WindowClosed", RoutingStrategies.Direct);
 
         /// <summary>
         /// Routed event that can be used for global tracking of opening windows
         /// </summary>
-        public static readonly RoutedEvent WindowOpenedEvent =
+        public static readonly RoutedEvent<RoutedEventArgs> WindowOpenedEvent =
             RoutedEvent.Register<Window, RoutedEventArgs>("WindowOpened", RoutingStrategies.Direct);
 
 
@@ -258,7 +257,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets a collection of child windows owned by this window.
         /// </summary>
-        public IReadOnlyList<Window> OwnedWindows => _children.Select(x => x.child).ToList();
+        public IReadOnlyList<Window> OwnedWindows => _children.Select(x => x.child).ToArray();
 
         /// <summary>
         /// Gets or sets a value indicating how the window will size itself to fit its content.
@@ -527,7 +526,7 @@ namespace Avalonia.Controls
 
         private void CloseInternal()
         {
-            foreach (var (child, _) in _children.ToList())
+            foreach (var (child, _) in _children.ToArray())
             {
                 child.CloseInternal();
             }
@@ -551,7 +550,7 @@ namespace Avalonia.Controls
             
             bool canClose = true;
 
-            foreach (var (child, _) in _children.ToList())
+            foreach (var (child, _) in _children.ToArray())
             {
                 if (child.ShouldCancelClose(args))
                 {
@@ -879,7 +878,19 @@ namespace Avalonia.Controls
 
             if (startupLocation == WindowStartupLocation.CenterScreen)
             {
-                var screen = Screens.ScreenFromPoint(owner?.Position ?? Position);
+                Screen? screen = null;
+
+                if (owner is not null)
+                {
+                    screen = Screens.ScreenFromWindow(owner);
+
+                    screen ??= Screens.ScreenFromPoint(owner.Position);
+                }
+
+                if (screen is null)
+                {
+                    screen = Screens.ScreenFromPoint(Position);
+                }
 
                 if (screen != null)
                 {
@@ -906,6 +917,15 @@ namespace Avalonia.Controls
             var constraint = clientSize;
             var maxAutoSize = PlatformImpl?.MaxAutoSizeHint ?? Size.Infinity;
 
+            if (MaxWidth > 0 && MaxWidth < maxAutoSize.Width)
+            {
+                maxAutoSize = maxAutoSize.WithWidth(MaxWidth);
+            }
+            if (MaxHeight > 0 && MaxHeight < maxAutoSize.Height)
+            {
+                maxAutoSize = maxAutoSize.WithHeight(MaxHeight);
+            }
+
             if (sizeToContent.HasAllFlags(SizeToContent.Width))
             {
                 constraint = constraint.WithWidth(maxAutoSize.Width);
@@ -1008,16 +1028,16 @@ namespace Avalonia.Controls
         /// </remarks>
         protected virtual void OnClosing(CancelEventArgs e) => Closing?.Invoke(this, e);
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
             if (change.Property == SystemDecorationsProperty)
             {
-                var typedNewValue = change.NewValue.GetValueOrDefault<SystemDecorations>();
+                var (typedOldValue, typedNewValue) = change.GetOldAndNewValue<SystemDecorations>();
 
                 PlatformImpl?.SetSystemDecorations(typedNewValue);
 
-                var o = change.OldValue.GetValueOrDefault<SystemDecorations>() == SystemDecorations.Full;
+                var o = typedOldValue == SystemDecorations.Full;
                 var n = typedNewValue == SystemDecorations.Full;
 
                 if (o != n)
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index d3c940c07c..12ba143c8a 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -60,7 +60,7 @@ namespace Avalonia.Controls
 
         public WindowBase(IWindowBaseImpl impl, IAvaloniaDependencyResolver? dependencyResolver) : base(impl, dependencyResolver)
         {
-            Screens = new Screens(PlatformImpl?.Screen);
+            Screens = new Screens(impl.Screen);
             impl.Activated = HandleActivated;
             impl.Deactivated = HandleDeactivated;
             impl.PositionChanged = HandlePositionChanged;
diff --git a/src/Avalonia.Controls/WindowTransparencyLevel.cs b/src/Avalonia.Controls/WindowTransparencyLevel.cs
index f416b5de91..d463f74a0e 100644
--- a/src/Avalonia.Controls/WindowTransparencyLevel.cs
+++ b/src/Avalonia.Controls/WindowTransparencyLevel.cs
@@ -22,6 +22,11 @@
         /// </summary>
         AcrylicBlur,
         
+        /// <summary>
+        /// Force acrylic on some incompatible versions of Windows 10. 
+        /// </summary>
+        ForceAcrylicBlur,
+        
         /// <summary>
         /// The window background is based on desktop wallpaper tint with a blur. This will only work on Windows 11 
         /// </summary>
diff --git a/src/Avalonia.DesignerSupport/ApiCompatBaseline.txt b/src/Avalonia.DesignerSupport/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..fcc74cf864
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/ApiCompatBaseline.txt
@@ -0,0 +1 @@
+Total Issues: 0
diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
index f8a7cdc690..0be695e0a1 100644
--- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
+++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
@@ -16,15 +16,8 @@
     <EmbeddedResource Condition="'$(Configuration)' == 'Debug'" Remove="Remote\HtmlTransport\webapp\build\**\*.map.gz" />
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ApiDiff.props" />
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs
index 6b1934ed06..f100be5d5b 100644
--- a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs
@@ -10,6 +10,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Remote.Protocol;
 using Avalonia.Remote.Protocol.Viewport;
+using Avalonia.Utilities;
 using InputProtocol = Avalonia.Remote.Protocol.Input;
 
 namespace Avalonia.DesignerSupport.Remote.HtmlTransport
@@ -320,15 +321,13 @@ namespace Avalonia.DesignerSupport.Remote.HtmlTransport
             ? null
             : modifiersText
                 .Split(',')
-                .Select(x => (InputProtocol.InputModifiers)Enum.Parse(
-                    typeof(InputProtocol.InputModifiers), x, true))
+                .Select(x => EnumHelper.Parse<InputProtocol.InputModifiers>(x, true))
                 .ToArray();
 
         private static InputProtocol.MouseButton ParseMouseButton(string buttonText) =>
             string.IsNullOrWhiteSpace(buttonText)
             ? InputProtocol.MouseButton.None
-            : (InputProtocol.MouseButton)Enum.Parse(
-                typeof(InputProtocol.MouseButton), buttonText, true);
+            : EnumHelper.Parse<InputProtocol.MouseButton>(buttonText, true);
 
         private static double ParseDouble(string text) =>
             double.Parse(text, NumberStyles.Float, CultureInfo.InvariantCulture);
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package-lock.json b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package-lock.json
index 6a5fea5b10..403bb5a59a 100644
--- a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package-lock.json
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package-lock.json
@@ -377,9 +377,9 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.14"
@@ -1078,12 +1078,6 @@
             "json5": "^2.1.2"
           }
         },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        },
         "schema-utils": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
@@ -1636,9 +1630,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "mobx": {
@@ -1839,12 +1833,6 @@
             "ms": "^2.1.1"
           }
         },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        },
         "mkdirp": {
           "version": "0.5.5",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -2592,12 +2580,6 @@
             "json5": "^2.1.2"
           }
         },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        },
         "schema-utils": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
diff --git a/src/Avalonia.DesignerSupport/Remote/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
index 8fb2c456b2..a5f478f445 100644
--- a/src/Avalonia.DesignerSupport/Remote/Stubs.cs
+++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
@@ -237,5 +237,20 @@ namespace Avalonia.DesignerSupport.Remote
 
         public IReadOnlyList<Screen> AllScreens { get; } =
             new Screen[] { new Screen(1, new PixelRect(0, 0, 4000, 4000), new PixelRect(0, 0, 4000, 4000), true) };
+
+        public Screen ScreenFromPoint(PixelPoint point)
+        {
+            return ScreenHelper.ScreenFromPoint(point, AllScreens);
+        }
+
+        public Screen ScreenFromRect(PixelRect rect)
+        {
+            return ScreenHelper.ScreenFromRect(rect, AllScreens);
+        }
+
+        public Screen ScreenFromWindow(IWindowBaseImpl window)
+        {
+            return ScreenHelper.ScreenFromWindow(window, AllScreens);
+        }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
index 1fc3604f70..adddf3f57b 100644
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@@ -13,17 +13,12 @@
     <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
     <ProjectReference Include="..\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
   </ItemGroup>
   <ItemGroup>
@@ -34,4 +29,5 @@
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\NullableEnable.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs
index cb98fb70f3..ec7e91c8be 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs
@@ -92,7 +92,7 @@ namespace Avalonia.Diagnostics.Controls
             set => SetValue(HighlightProperty, value);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
@@ -102,7 +102,7 @@ namespace Avalonia.Diagnostics.Controls
                 {
                     _isUpdatingThickness = true;
 
-                    var value = change.NewValue.GetValueOrDefault<Thickness>();
+                    var value = change.GetNewValue<Thickness>();
 
                     Left = value.Left;
                     Top = value.Top;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs b/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
index 683c2e6549..9029ddf2bd 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
@@ -105,13 +105,15 @@ namespace Avalonia.Diagnostics
 
         private static IDisposable Open(Application? application, DevToolsOptions options, Window? owner = default)
         {
+            var focussedControl = KeyboardDevice.Instance?.FocusedElement as IControl;
             if (application is null)
             {
                 throw new ArgumentNullException(nameof(application));
             }
             if (s_open.TryGetValue(application, out var window))
-            {                
+            {
                 window.Activate();
+                window.SelectedControl(focussedControl);
             }
             else
             {
@@ -122,7 +124,7 @@ namespace Avalonia.Diagnostics
                     Height = options.Size.Height,
                 };
                 window.SetOptions(options);
-
+                window.SelectedControl(focussedControl);
                 window.Closed += DevToolsClosed;
                 s_open.Add(application, window);
                 if (options.ShowAsChildWindow && owner is { })
diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
index 46ee8e686c..5672641602 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
@@ -41,5 +41,10 @@ namespace Avalonia.Diagnostics
         /// <remarks>Default handler is <see cref="Screenshots.FilePickerHandler"/></remarks>
         public IScreenshotHandler ScreenshotHandler { get; set; }
           = Convetions.DefaultScreenshotHandler;
+
+        /// <summary>
+        /// Gets or sets whether DevTools should use the dark mode theme
+        /// </summary>
+        public bool UseDarkMode { get; set; }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
index aa03330cc5..7384daae30 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
@@ -1,13 +1,17 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Media;
+
 namespace Avalonia.Diagnostics.ViewModels
 {
     internal class AvaloniaPropertyViewModel : PropertyViewModel
     {
         private readonly AvaloniaObject _target;
-        private System.Type _assignedType;
+        private Type _assignedType;
         private object? _value;
         private string _priority;
         private string _group;
-        private readonly System.Type _propertyType;
+        private readonly Type _propertyType;
 
 #nullable disable
         // Remove "nullable disable" after MemberNotNull will work on our CI.
@@ -28,13 +32,9 @@ namespace Avalonia.Diagnostics.ViewModels
         public AvaloniaProperty Property { get; }
         public override object Key => Property;
         public override string Name { get; }
-        public override bool? IsAttached => 
-            Property.IsAttached;
-
-        public override string Priority =>
-            _priority;
-
-        public override System.Type AssignedType => _assignedType;
+        public override bool? IsAttached => Property.IsAttached;
+        public override string Priority => _priority;
+        public override Type AssignedType => _assignedType;
 
         public override string? Value
         {
@@ -53,30 +53,58 @@ namespace Avalonia.Diagnostics.ViewModels
 
         public override string Group => _group;
 
-        public override System.Type? DeclaringType { get; }
-        public override System.Type PropertyType => _propertyType;
+        public override Type? DeclaringType { get; }
+        public override Type PropertyType => _propertyType;
 
         // [MemberNotNull(nameof(_type), nameof(_group), nameof(_priority))]
         public override void Update()
         {
             if (Property.IsDirect)
             {
-                RaiseAndSetIfChanged(ref _value, _target.GetValue(Property), nameof(Value));
-                RaiseAndSetIfChanged(ref _assignedType,_value?.GetType() ?? Property.PropertyType, nameof(AssignedType));
+                object? value;
+                Type? valueType = null;
+
+                try
+                {
+                    value = _target.GetValue(Property);
+                    valueType = value?.GetType();
+                }
+                catch (Exception e)
+                {
+                    value = e.GetBaseException();
+                }
+
+                RaiseAndSetIfChanged(ref _value, value, nameof(Value));
+                RaiseAndSetIfChanged(ref _assignedType, valueType ?? Property.PropertyType, nameof(AssignedType));
                 RaiseAndSetIfChanged(ref _priority, "Direct", nameof(Priority));
 
                 _group = "Properties";
             }
             else
             {
-                var val = _target.GetDiagnostic(Property);
+                object? value;
+                Type? valueType = null;
+                BindingPriority? priority = null;
+
+                try
+                {
+                    var diag = _target.GetDiagnostic(Property);
+
+                    value = diag.Value;
+                    valueType = value?.GetType();
+                    priority = diag.Priority;
+                }
+                catch (Exception e)
+                {
+                    value = e.GetBaseException();
+                }
 
-                RaiseAndSetIfChanged(ref _value, val?.Value, nameof(Value));
-                RaiseAndSetIfChanged(ref _assignedType, _value?.GetType() ?? Property.PropertyType, nameof(AssignedType));
+                RaiseAndSetIfChanged(ref _value, value, nameof(Value));
+                RaiseAndSetIfChanged(ref _assignedType, valueType ?? Property.PropertyType, nameof(AssignedType));
 
-                if (val != null)
+                if (priority != null)
                 {
-                    RaiseAndSetIfChanged(ref _priority, val.Priority.ToString(), nameof(Priority));
+                    RaiseAndSetIfChanged(ref _priority, priority.ToString()!, nameof(Priority));
                     RaiseAndSetIfChanged(ref _group, IsAttached == true ? "Attached Properties" : "Properties", nameof(Group));
                 }
                 else
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
new file mode 100644
index 0000000000..16973a96ef
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
@@ -0,0 +1,56 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Markup.Xaml.MarkupExtensions;
+using Avalonia.Media;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class BindingSetterViewModel : SetterViewModel
+    {
+        public BindingSetterViewModel(AvaloniaProperty property, object? value) : base(property, value)
+        {
+            switch (value)
+            {
+                case Binding binding:
+                    Path = binding.Path;
+                    Tint = Brushes.CornflowerBlue;
+                    ValueTypeTooltip = "Reflection Binding";
+
+                    break;
+                case CompiledBindingExtension binding:
+                    Path = binding.Path.ToString();
+                    Tint = Brushes.DarkGreen;
+                    ValueTypeTooltip = "Compiled Binding";
+
+                    break;
+                case TemplateBinding binding:
+                    if (binding.Property is AvaloniaProperty templateProperty)
+                    {
+                        Path = $"{templateProperty.OwnerType.Name}.{templateProperty.Name}";
+                    }
+                    else
+                    {
+                        Path = "Unassigned";
+                    }
+
+                    Tint = Brushes.OrangeRed;
+                    ValueTypeTooltip = "Template Binding";
+
+                    break;
+                default:
+                    throw new ArgumentException("Invalid binding type", nameof(value));
+            }
+        }
+
+        public IBrush Tint { get; }
+        
+        public string ValueTypeTooltip { get; }
+
+        public string Path { get; }
+
+        public override void CopyValue()
+        {
+            CopyToClipboard(Path);
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
index e2d8a30c8a..73fb615b32 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
@@ -1,13 +1,15 @@
-using System.Reflection;
+using System;
+using System.Reflection;
+using Avalonia.Media;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
     internal class ClrPropertyViewModel : PropertyViewModel
     {
         private readonly object _target;
-        private System.Type _assignedType;
+        private Type _assignedType;
         private object? _value;
-        private readonly System.Type _propertyType;
+        private readonly Type _propertyType;
 
 #nullable disable
         // Remove "nullable disable" after MemberNotNull will work on our CI.
@@ -25,6 +27,7 @@ namespace Avalonia.Diagnostics.ViewModels
             {
                 Name = property.DeclaringType.Name + '.' + property.Name;
             }
+
             DeclaringType = property.DeclaringType;
             _propertyType = property.PropertyType;
 
@@ -36,10 +39,10 @@ namespace Avalonia.Diagnostics.ViewModels
         public override string Name { get; }
         public override string Group => "CLR Properties";
 
-        public override System.Type AssignedType => _assignedType;
-        public override  System.Type PropertyType => _propertyType;
+        public override Type AssignedType => _assignedType;
+        public override Type PropertyType => _propertyType;
 
-        public override string? Value 
+        public override string? Value
         {
             get => ConvertToString(_value);
             set
@@ -54,20 +57,30 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
-        public override string Priority => 
-            string.Empty;
+        public override string Priority => string.Empty;
 
-        public override bool? IsAttached => 
-            default;
+        public override bool? IsAttached => default;
 
-        public override System.Type? DeclaringType { get; }
+        public override Type? DeclaringType { get; }
 
         // [MemberNotNull(nameof(_type))]
         public override void Update()
         {
-            var val = Property.GetValue(_target);
-            RaiseAndSetIfChanged(ref _value, val, nameof(Value));
-            RaiseAndSetIfChanged(ref _assignedType, _value?.GetType() ?? Property.PropertyType, nameof(AssignedType));
+            object? value;
+            Type? valueType = null;
+
+            try
+            {
+                value = Property.GetValue(_target);
+                valueType = value?.GetType();
+            }
+            catch (Exception e)
+            {
+                value = e.GetBaseException();
+            }
+
+            RaiseAndSetIfChanged(ref _value, value, nameof(Value));
+            RaiseAndSetIfChanged(ref _assignedType, valueType ?? Property.PropertyType, nameof(AssignedType));
             RaisePropertyChanged(nameof(Type));
         }
     }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
index 8f0a4d07b0..e383c160e3 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -8,6 +8,7 @@ using System.Reflection;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
+using Avalonia.Data;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
@@ -17,7 +18,7 @@ namespace Avalonia.Diagnostics.ViewModels
     internal class ControlDetailsViewModel : ViewModelBase, IDisposable
     {
         private readonly IAvaloniaObject _avaloniaObject;
-        private IDictionary<object, List<PropertyViewModel>>? _propertyIndex;
+        private IDictionary<object, PropertyViewModel[]>? _propertyIndex;
         private PropertyViewModel? _selectedProperty;
         private DataGridCollectionView? _propertiesView;
         private bool _snapshotStyles;
@@ -59,7 +60,8 @@ namespace Avalonia.Diagnostics.ViewModels
 
                 var styleDiagnostics = styledElement.GetStyleDiagnostics();
 
-                foreach (var appliedStyle in styleDiagnostics.AppliedStyles)
+                // We need to place styles without activator first, such styles will be overwritten by ones with activators.
+                foreach (var appliedStyle in styleDiagnostics.AppliedStyles.OrderBy(s => s.HasActivator))
                 {
                     var styleSource = appliedStyle.Source;
 
@@ -87,7 +89,16 @@ namespace Avalonia.Diagnostics.ViewModels
                                 }
                                 else
                                 {
-                                    setterVm = new SetterViewModel(regularSetter.Property, setterValue);
+                                    var isBinding = IsBinding(setterValue);
+
+                                    if (isBinding)
+                                    {
+                                        setterVm = new BindingSetterViewModel(regularSetter.Property, setterValue);
+                                    }
+                                    else
+                                    {
+                                        setterVm = new SetterViewModel(regularSetter.Property, setterValue);
+                                    }
                                 }
 
                                 setters.Add(setterVm);
@@ -117,6 +128,19 @@ namespace Avalonia.Diagnostics.ViewModels
             return null;
         }
 
+        private bool IsBinding(object? value)
+        {
+            switch (value)
+            {
+                case Binding:
+                case CompiledBindingExtension:
+                case TemplateBinding:
+                    return true;
+            }
+
+            return false;
+        }
+
         public TreePageViewModel TreePage { get; }
 
         public DataGridCollectionView? PropertiesView
@@ -132,31 +156,19 @@ namespace Avalonia.Diagnostics.ViewModels
         public object? SelectedEntity
         {
             get => _selectedEntity;
-            set
-            {
-                RaiseAndSetIfChanged(ref _selectedEntity, value);
-               
-            }
+            set => RaiseAndSetIfChanged(ref _selectedEntity, value);
         }
 
         public string? SelectedEntityName
         {
             get => _selectedEntityName;
-            set
-            {
-                RaiseAndSetIfChanged(ref _selectedEntityName, value);
-               
-            }
+            set => RaiseAndSetIfChanged(ref _selectedEntityName, value);
         }
         
         public string? SelectedEntityType
         {
             get => _selectedEntityType;
-            set
-            {
-                RaiseAndSetIfChanged(ref _selectedEntityType, value);
-               
-            }
+            set => RaiseAndSetIfChanged(ref _selectedEntityType, value);
         }
         
         public PropertyViewModel? SelectedProperty
@@ -461,9 +473,9 @@ namespace Avalonia.Diagnostics.ViewModels
                 .Concat(GetClrProperties(o, _showImplementedInterfaces))
                 .OrderBy(x => x, PropertyComparer.Instance)
                 .ThenBy(x => x.Name)
-                .ToList();
+                .ToArray();
 
-            _propertyIndex = properties.GroupBy(x => x.Key).ToDictionary(x => x.Key, x => x.ToList());
+            _propertyIndex = properties.GroupBy(x => x.Key).ToDictionary(x => x.Key, x => x.ToArray());
 
             var view = new DataGridCollectionView(properties);
             view.GroupDescriptions.Add(new DataGridPathGroupDescription(nameof(AvaloniaPropertyViewModel.Group)));
@@ -479,6 +491,31 @@ namespace Avalonia.Diagnostics.ViewModels
                 inpc2.PropertyChanged += ControlPropertyChanged;
             }
         }
+        
+        internal void SelectProperty(AvaloniaProperty property)
+        {
+            SelectedProperty = null;
+
+            if (SelectedEntity != _avaloniaObject)
+            {
+                NavigateToProperty(_avaloniaObject, (_avaloniaObject as IControl)?.Name ?? _avaloniaObject.ToString());    
+            }
+            
+            if (PropertiesView is null)
+            {
+                return;
+            }
+
+            foreach (object o in PropertiesView)
+            {
+                if (o is AvaloniaPropertyViewModel propertyVm && propertyVm.Property == property)
+                {
+                    SelectedProperty = propertyVm;
+                    
+                    break;
+                }
+            }
+        }
 
         internal void UpdatePropertiesView(bool showImplementedInterfaces)
         {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
index 4dc0c34c0a..0c0c005122 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
@@ -110,7 +110,7 @@ namespace Avalonia.Diagnostics.ViewModels
 
         private void UpdateSizeConstraints()
         {
-            if (_control is IAvaloniaObject ao)
+            if (_control is AvaloniaObject ao)
             {
                 string? CreateConstraintInfo(StyledProperty<double> minProperty, StyledProperty<double> maxProperty)
                 {
@@ -191,7 +191,7 @@ namespace Avalonia.Diagnostics.ViewModels
                 }
                 else
                 {
-                    if (_control is IAvaloniaObject ao)
+                    if (_control is AvaloniaObject ao)
                     {
                         if (e.Property == Layoutable.MarginProperty)
                         {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
index e08c5bc8dd..9e8a5d8d9b 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
@@ -7,7 +7,6 @@ using Avalonia.Diagnostics.Models;
 using Avalonia.Input;
 using Avalonia.Metadata;
 using Avalonia.Threading;
-using System.Reactive.Linq;
 using System.Linq;
 
 namespace Avalonia.Diagnostics.ViewModels
@@ -59,8 +58,8 @@ namespace Avalonia.Diagnostics.ViewModels
                     .Subscribe(e =>
                         {
                             PointerOverRoot = e.Root;
-                            PointerOverElement = e.Root.GetInputElementsAt(e.Position).FirstOrDefault();
-                        });                                     
+                            PointerOverElement = e.Root.InputHitTest(e.Position);
+                        });
 #nullable restore
             }
             Console = new ConsoleViewModel(UpdateConsoleContext);
@@ -163,8 +162,7 @@ namespace Avalonia.Diagnostics.ViewModels
                             }
                             catch { }
                         },
-                        TimeSpan.FromMilliseconds(0),
-                        DispatcherPriority.ApplicationIdle);
+                        TimeSpan.FromMilliseconds(0));
                 }
 
                 RaiseAndSetIfChanged(ref _content, value);
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
index e93dc7361b..5202ac963e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
@@ -7,11 +7,14 @@ namespace Avalonia.Diagnostics.ViewModels
         public object Key { get; }
 
         public IBrush Tint { get; }
+        
+        public string ValueTypeTooltip { get; }
 
         public ResourceSetterViewModel(AvaloniaProperty property, object resourceKey, object? resourceValue, bool isDynamic) : base(property, resourceValue)
         {
             Key = resourceKey;
             Tint = isDynamic ? Brushes.Orange : Brushes.Brown;
+            ValueTypeTooltip = isDynamic ? "Dynamic Resource" : "Static Resource";
         }
 
         public void CopyResourceKey()
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
index 38cbefcb93..559ed49911 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
@@ -34,7 +34,7 @@ namespace Avalonia.Diagnostics.ViewModels
             IsVisible = true;
         }
 
-        public void CopyValue()
+        public virtual void CopyValue()
         {
             var textToCopy = Value?.ToString();
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml
index 264a0de359..7dec878e69 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml
@@ -11,7 +11,7 @@
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}">
             <DockPanel Margin="{TemplateBinding Padding}">
-              <TextBlock DockPanel.Dock="Left" Margin="0,0,4,0">></TextBlock>
+              <TextBlock DockPanel.Dock="Left" Margin="0,0,4,0"></TextBlock>
               <TextPresenter Name="PART_TextPresenter"
                              Text="{TemplateBinding Text, Mode=TwoWay}"
                              CaretIndex="{TemplateBinding CaretIndex}"
@@ -44,7 +44,7 @@
         <DataTemplate>
           <StackPanel Orientation="Vertical">
             <DockPanel>
-              <TextBlock DockPanel.Dock="Left" Margin="0,0,4,0">></TextBlock>
+              <TextBlock DockPanel.Dock="Left" Margin="0,0,4,0"></TextBlock>
               <TextBlock Text="{Binding Input}"/>
             </DockPanel>
             <TextBlock Foreground="{Binding Foreground}" Text="{Binding Output}"/>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index d7acbbd577..cc392853be 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -44,7 +44,9 @@
                               UseWholeWordFilter="{Binding UseWholeWordFilter}"
                               UseRegexFilter="{Binding UseRegexFilter}"/>
       
-      <DataGrid Items="{Binding PropertiesView}"
+      <DataGrid 
+                x:Name="DataGrid"
+                Items="{Binding PropertiesView}"
                 Grid.Row="2"
                 BorderThickness="0"
                 RowBackground="Transparent"
@@ -129,6 +131,26 @@
                     </Expander.Header>
 
                     <ItemsControl Margin="20,0,0,0" Grid.Row="1" Items="{Binding Setters}">
+                      
+                      <ItemsControl.Styles>
+                        <Style Selector="TextBlock.property-name">
+                          <Setter Property="FontWeight" Value="SemiBold" />
+                          <Setter Property="Background" Value="Transparent" />
+                        </Style>
+                        
+                        <Style Selector="TextBlock.property-name:pointerover">
+                          <Setter Property="TextDecorations" Value="Underline" />
+                        </Style>
+                        
+                        <Style Selector="Rectangle.property-inactive">
+                          <Setter Property="IsHitTestVisible" Value="False" />
+                          <Setter Property="Height" Value="1" />
+                          <Setter Property="Fill" Value="#6C6C6C" />
+                          <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                        
+                      </ItemsControl.Styles>
+                      
                       <ItemsControl.DataTemplates>
 
                         <DataTemplate DataType="IBrush">
@@ -148,6 +170,26 @@
                             <TextBlock Text="{Binding}" />
                           </StackPanel>
                         </DataTemplate>
+                        
+                        <DataTemplate DataType="vm:BindingSetterViewModel">
+                          <Panel Opacity="{Binding IsActive, Converter={StaticResource BoolToOpacity}}" IsVisible="{Binding IsVisible}" HorizontalAlignment="Left">
+                            <Panel.ContextMenu>
+                              <ContextMenu>
+                                <MenuItem Header="Copy property name" Command="{Binding CopyPropertyName} "/>
+                                <MenuItem Header="Copy value" Command="{Binding CopyValue} "/>
+                              </ContextMenu>
+                            </Panel.ContextMenu>
+                            <StackPanel Orientation="Horizontal" Spacing="2">
+                              <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
+                              <TextBlock Text=":" />
+                              <TextBlock>{</TextBlock>
+                              <Rectangle Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}" ToolTip.Tip="{Binding ValueTypeTooltip}"/>
+                              <TextBlock Text="{Binding Path}" />
+                              <TextBlock>}</TextBlock>
+                            </StackPanel>
+                            <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
+                          </Panel>
+                        </DataTemplate>
 
                         <DataTemplate DataType="vm:ResourceSetterViewModel">
                           <Panel Opacity="{Binding IsActive, Converter={StaticResource BoolToOpacity}}" IsVisible="{Binding IsVisible}" HorizontalAlignment="Left">
@@ -159,15 +201,15 @@
                               </ContextMenu>
                             </Panel.ContextMenu>
                             <StackPanel Orientation="Horizontal" Spacing="2" HorizontalAlignment="Left">
-                              <TextBlock Text="{Binding Name}" FontWeight="SemiBold" />
+                              <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
                               <TextBlock Text=":" />
                               <ContentControl Content="{Binding Value}"/>
                               <TextBlock>(</TextBlock>
-                              <Ellipse Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}"/>
+                              <Ellipse Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}" ToolTip.Tip="{Binding ValueTypeTooltip}"/>
                               <TextBlock FontStyle="Italic" Text="{Binding Key}" />
                               <TextBlock>)</TextBlock>
                             </StackPanel>
-                            <Rectangle Height="1" Fill="#6C6C6C" IsVisible="{Binding !IsActive}" />
+                            <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
                           </Panel>
                         </DataTemplate>
 
@@ -180,11 +222,11 @@
                               </ContextMenu>
                             </Panel.ContextMenu>
                             <StackPanel Orientation="Horizontal" Spacing="2">
-                              <TextBlock Text="{Binding Name}" FontWeight="SemiBold" />
+                              <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
                               <TextBlock Text=":" />
                               <ContentControl Content="{Binding Value}"/>
                             </StackPanel>
-                            <Rectangle Height="1" Fill="#6C6C6C" VerticalAlignment="Center" IsVisible="{Binding !IsActive}" />
+                            <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
                           </Panel>
                         </DataTemplate>
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
index 78919a2105..08ffe2c081 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
@@ -7,9 +7,13 @@ namespace Avalonia.Diagnostics.Views
 {
     internal class ControlDetailsView : UserControl
     {
+        private DataGrid _dataGrid;
+
         public ControlDetailsView()
         {
             InitializeComponent();
+
+            _dataGrid = this.GetControl<DataGrid>("DataGrid");
         }
 
         private void InitializeComponent()
@@ -25,5 +29,25 @@ namespace Avalonia.Diagnostics.Views
             }
             
         }
+
+        private void PropertyNamePressed(object sender, PointerPressedEventArgs e)
+        {
+            var mainVm = (ControlDetailsViewModel?) DataContext;
+
+            if (mainVm is null)
+            {
+                return;
+            }
+            
+            if (sender is Control control && control.DataContext is SetterViewModel setterVm)
+            {
+                mainVm.SelectProperty(setterVm.Property);
+
+                if (mainVm.SelectedProperty is not null)
+                {
+                    _dataGrid.ScrollIntoView(mainVm.SelectedProperty, null);   
+                }
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
index af6c84a76a..c404a5c382 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
@@ -15,6 +15,7 @@
         <SolidColorBrush x:Key="PaddingHighlightBrush" Color="#CEDA8E" />
         <SolidColorBrush x:Key="SizeBackgroundBrush" Color="#88B2BD" />
         <SolidColorBrush x:Key="SizeHighlightBrush" Color="#9ED0DC" />
+        <SolidColorBrush x:Key="ThicknessEditorForeground" Color="Black" />
     </UserControl.Resources>
 
     <Grid RowDefinitions="*,Auto">
@@ -46,6 +47,7 @@
 
                 <controls:ThicknessEditor Grid.Row="0" Grid.Column="0" Header="margin" VerticalAlignment="Top"
                                           HorizontalAlignment="Center"
+                                          Foreground="{StaticResource ThicknessEditorForeground}"
                                           Background="{StaticResource MarginBackgroundBrush}"
                                           Highlight="{StaticResource MarginHighlightBrush}"
                                           Thickness="{Binding MarginThickness}">
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
index a3cff7f3d3..3b143d3b58 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -11,6 +11,7 @@ using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
+using Avalonia.Themes.Default;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics.Views
@@ -109,7 +110,7 @@ namespace Avalonia.Diagnostics.Views
         {
 #pragma warning disable CS0618 // Type or member is obsolete
             var point = (topLevel as IInputRoot)?.MouseDevice?.GetPosition(topLevel) ?? default;
-#pragma warning restore CS0618 // Type or member is obsolete                
+#pragma warning restore CS0618 // Type or member is obsolete
 
             return (IControl?)topLevel.GetVisualsAt(point, x =>
                 {
@@ -161,13 +162,18 @@ namespace Avalonia.Diagnostics.Views
                 return;
             }
 
-            var root = Root as TopLevel
-                ?? vm.PointerOverRoot as TopLevel;
+            var root = vm.PointerOverRoot as TopLevel;
+
             if (root is null)
             {
                 return;
             }
 
+            if (root is PopupRoot pr && pr.ParentTopLevel != null)
+            {
+                root = pr.ParentTopLevel;
+            }
+
             switch (e.Modifiers)
             {
                 case RawInputModifiers.Control when (e.Key == Key.LeftShift || e.Key == Key.RightShift):
@@ -242,7 +248,25 @@ namespace Avalonia.Diagnostics.Views
 
         private void RootClosed(object? sender, EventArgs e) => Close();
 
-        public void SetOptions(DevToolsOptions options) =>
+        public void SetOptions(DevToolsOptions options)
+        {
             (DataContext as MainViewModel)?.SetOptions(options);
+
+            if (options.UseDarkMode)
+            {
+                if (Styles[0] is SimpleTheme st)
+                {
+                    st.Mode = SimpleThemeMode.Dark;
+                }                
+            }
+        }
+
+        internal void SelectedControl(IControl? control)
+        {
+            if (control is { })
+            {
+                (DataContext as MainViewModel)?.SelectControl(control);
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
index 2553ae90ce..58807b489e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
@@ -36,6 +36,7 @@ namespace Avalonia.Diagnostics.Views
                     new Border { BorderBrush = new SolidColorBrush(Colors.Yellow, 0.5) }
                 },
             };
+            AdornerLayer.SetIsClipEnabled(_adorner, false);
         }
 
         protected void AddAdorner(object? sender, PointerEventArgs e)
diff --git a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
index 770d15ea27..80159c82d7 100644
--- a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
+++ b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
@@ -14,5 +14,10 @@
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
   </ItemGroup>
 
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.X11, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
+
   <Import Project="..\..\build\ApiDiff.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Avalonia.Dialogs/ManagedFileChooser.cs b/src/Avalonia.Dialogs/ManagedFileChooser.cs
index 9058c405a3..199a4d6620 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooser.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooser.cs
@@ -2,6 +2,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -9,6 +10,8 @@ using Avalonia.LogicalTree;
 
 namespace Avalonia.Dialogs
 {
+    [TemplatePart("QuickLinks", typeof(Control))]
+    [TemplatePart("Files",      typeof(ListBox))]
     public class ManagedFileChooser : TemplatedControl
     {
         private Control _quickLinksRoot;
diff --git a/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs b/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs
index 1970c5557d..e4025453c4 100644
--- a/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs
+++ b/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs
@@ -8,7 +8,7 @@ namespace Avalonia.Dialogs
 {
     public static class ManagedFileDialogExtensions
     {
-        private class ManagedSystemDialogImpl<T> : ISystemDialogImpl where T : Window, new()
+        internal class ManagedSystemDialogImpl<T> : ISystemDialogImpl where T : Window, new()
         {
             async Task<string[]> Show(SystemDialog d, Window parent, ManagedFileDialogOptions options = null)
             {
@@ -141,7 +141,7 @@ namespace Avalonia.Dialogs
 
         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()
         {
diff --git a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
index bcb63783a4..a5cb207223 100644
--- a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
+++ b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
@@ -2,11 +2,15 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
     <PackageReference Include="Tmds.DBus" Version="0.9.0" />
   </ItemGroup>
-
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.X11, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.FreeDesktop/DBusFileChooser.cs b/src/Avalonia.FreeDesktop/DBusFileChooser.cs
new file mode 100644
index 0000000000..24db614a02
--- /dev/null
+++ b/src/Avalonia.FreeDesktop/DBusFileChooser.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Tmds.DBus;
+
+[assembly: InternalsVisibleTo(Connection.DynamicAssemblyName)]
+namespace Avalonia.FreeDesktop
+{
+    [DBusInterface("org.freedesktop.portal.FileChooser")]
+    internal interface IFileChooser : IDBusObject
+    {
+        Task<ObjectPath> OpenFileAsync(string ParentWindow, string Title, IDictionary<string, object> Options);
+        Task<ObjectPath> SaveFileAsync(string ParentWindow, string Title, IDictionary<string, object> Options);
+        Task<ObjectPath> SaveFilesAsync(string ParentWindow, string Title, IDictionary<string, object> Options);
+        Task<T> GetAsync<T>(string prop);
+        Task<FileChooserProperties> GetAllAsync();
+        Task SetAsync(string prop, object val);
+        Task<IDisposable> WatchPropertiesAsync(Action<PropertyChanges> handler);
+    }
+
+    [Dictionary]
+    internal class FileChooserProperties
+    {
+        public uint Version { get; set; }
+    }
+
+    internal static class FileChooserExtensions
+    {
+        public static Task<uint> GetVersionAsync(this IFileChooser o) => o.GetAsync<uint>("version");
+    }
+}
diff --git a/src/Avalonia.FreeDesktop/DBusHelper.cs b/src/Avalonia.FreeDesktop/DBusHelper.cs
index c14539d7bf..7204e51dbd 100644
--- a/src/Avalonia.FreeDesktop/DBusHelper.cs
+++ b/src/Avalonia.FreeDesktop/DBusHelper.cs
@@ -6,7 +6,7 @@ using Tmds.DBus;
 
 namespace Avalonia.FreeDesktop
 {
-    public class DBusHelper
+    public static class DBusHelper
     {
         /// <summary>
         /// This class uses synchronous execution at DBus connection establishment stage
@@ -14,14 +14,14 @@ namespace Avalonia.FreeDesktop
         /// </summary>
         private class DBusSyncContext : SynchronizationContext
         {
-            private SynchronizationContext _ctx;
-            private object _lock = new object();
+            private readonly object _lock = new();
+            private SynchronizationContext? _ctx;
 
             public override void Post(SendOrPostCallback d, object state)
             {
                 lock (_lock)
                 {
-                    if (_ctx != null)
+                    if (_ctx is not null)
                         _ctx?.Post(d, state);
                     else
                         lock (_lock)
@@ -33,10 +33,9 @@ namespace Avalonia.FreeDesktop
             {
                 lock (_lock)
                 {
-                    if (_ctx != null)
+                    if (_ctx is not null)
                         _ctx?.Send(d, state);
                     else
-
                         d(state);
                 }
             }
@@ -47,15 +46,14 @@ namespace Avalonia.FreeDesktop
                     _ctx = new AvaloniaSynchronizationContext();
             }
         }
-        public static Connection Connection { get; private set; }
 
-        public static Connection TryInitialize(string dbusAddress = null)
+        public static Connection? Connection { get; private set; }
+
+        public static Connection? TryInitialize(string? dbusAddress = null)
+            => Connection ?? TryCreateNewConnection(dbusAddress);
+
+        public static Connection? TryCreateNewConnection(string? dbusAddress = null)
         {
-            return Connection ?? TryCreateNewConnection(dbusAddress);
-        }
-        
-        public static Connection TryCreateNewConnection(string dbusAddress = null)
-        { 
             var oldContext = SynchronizationContext.Current;
             try
             {
diff --git a/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs b/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
index a7e83140ae..864c579319 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
@@ -198,9 +198,9 @@ namespace Avalonia.FreeDesktop.DBusIme
             UpdateActive();
         }
         
-        void ITextInputMethodImpl.SetActive(bool active)
+        void ITextInputMethodImpl.SetClient(ITextInputMethodClient client)
         {
-            _controlActive = active;
+            _controlActive = client is { };
             UpdateActive();
         }
 
@@ -272,7 +272,7 @@ namespace Avalonia.FreeDesktop.DBusIme
             UpdateCursorRect();
         }
 
-        public abstract void SetOptions(TextInputOptionsQueryEventArgs options);
+        public abstract void SetOptions(TextInputOptions options);
 
         void ITextInputMethodImpl.Reset()
         {
diff --git a/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs b/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs
index 31a061571f..0b85965de7 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs
@@ -93,7 +93,7 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
                 (uint)args.Timestamp).ConfigureAwait(false);
         }
         
-        public override void SetOptions(TextInputOptionsQueryEventArgs options) =>
+        public override void SetOptions(TextInputOptions options) =>
             Enqueue(async () =>
             {
                 if(_context == null)
@@ -111,7 +111,7 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
                     flags |= FcitxCapabilityFlags.CAPACITY_NUMBER;
                 else if (options.ContentType == TextInputContentType.Password)
                     flags |= FcitxCapabilityFlags.CAPACITY_PASSWORD;
-                else if (options.ContentType == TextInputContentType.Phone)
+                else if (options.ContentType == TextInputContentType.Digits)
                     flags |= FcitxCapabilityFlags.CAPACITY_DIALABLE;
                 else if (options.ContentType == TextInputContentType.Url)
                     flags |= FcitxCapabilityFlags.CAPACITY_URL;
diff --git a/src/Avalonia.FreeDesktop/DBusIme/IBus/IBusX11TextInputMethod.cs b/src/Avalonia.FreeDesktop/DBusIme/IBus/IBusX11TextInputMethod.cs
index a73de9dae8..1397eaa57b 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/IBus/IBusX11TextInputMethod.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/IBus/IBusX11TextInputMethod.cs
@@ -97,7 +97,7 @@ namespace Avalonia.FreeDesktop.DBusIme.IBus
             return _context.ProcessKeyEventAsync((uint)keyVal, (uint)keyCode, (uint)state);
         }
 
-        public override void SetOptions(TextInputOptionsQueryEventArgs options)
+        public override void SetOptions(TextInputOptions options)
         {
             // No-op, because ibus 
         }
diff --git a/src/Avalonia.FreeDesktop/DBusRequest.cs b/src/Avalonia.FreeDesktop/DBusRequest.cs
new file mode 100644
index 0000000000..940a476916
--- /dev/null
+++ b/src/Avalonia.FreeDesktop/DBusRequest.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Tmds.DBus;
+
+[assembly: InternalsVisibleTo(Connection.DynamicAssemblyName)]
+namespace Avalonia.FreeDesktop
+{
+    [DBusInterface("org.freedesktop.portal.Request")]
+    internal interface IRequest : IDBusObject
+    {
+        Task CloseAsync();
+        Task<IDisposable> WatchResponseAsync(Action<(uint response, IDictionary<string, object> results)> handler, Action<Exception> onError = null);
+    }
+}
diff --git a/src/Avalonia.FreeDesktop/DBusSystemDialog.cs b/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
new file mode 100644
index 0000000000..d1905a4569
--- /dev/null
+++ b/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Platform;
+using Avalonia.Logging;
+using Tmds.DBus;
+
+namespace Avalonia.FreeDesktop
+{
+    internal class DBusSystemDialog : ISystemDialogImpl
+    {
+        private readonly IFileChooser _fileChooser;
+
+        internal static DBusSystemDialog? TryCreate()
+        {
+            var fileChooser = DBusHelper.Connection?.CreateProxy<IFileChooser>("org.freedesktop.portal.Desktop", "/org/freedesktop/portal/desktop");
+            if (fileChooser is null)
+                return null;
+            try
+            {
+                fileChooser.GetVersionAsync().GetAwaiter().GetResult();
+                return new DBusSystemDialog(fileChooser);
+            }
+            catch (Exception e)
+            {
+                Logger.TryGet(LogEventLevel.Error, LogArea.X11Platform)?.Log(null, $"Unable to connect to org.freedesktop.portal.Desktop: {e.Message}");
+                return null;
+            }
+        }
+
+        private DBusSystemDialog(IFileChooser fileChooser)
+        {
+            _fileChooser = fileChooser;
+        }
+
+        public async Task<string[]?> ShowFileDialogAsync(FileDialog dialog, Window parent)
+        {
+            var parentWindow = $"x11:{parent.PlatformImpl!.Handle.Handle.ToString("X")}";
+            ObjectPath objectPath;
+            var options = new Dictionary<string, object>();
+            if (dialog.Filters is not null)
+                options.Add("filters", ParseFilters(dialog));
+
+            switch (dialog)
+            {
+                case OpenFileDialog openFileDialog:
+                    options.Add("multiple", openFileDialog.AllowMultiple);
+                    objectPath = await _fileChooser.OpenFileAsync(parentWindow, openFileDialog.Title ?? string.Empty, options);
+                    break;
+                case SaveFileDialog saveFileDialog:
+                    if (saveFileDialog.InitialFileName is not null)
+                        options.Add("current_name", saveFileDialog.InitialFileName);
+                    if (saveFileDialog.Directory is not null)
+                        options.Add("current_folder", Encoding.UTF8.GetBytes(saveFileDialog.Directory));
+                    objectPath = await _fileChooser.SaveFileAsync(parentWindow, saveFileDialog.Title ?? string.Empty, options);
+                    break;
+            }
+
+            var request = DBusHelper.Connection!.CreateProxy<IRequest>("org.freedesktop.portal.Request", objectPath);
+            var tsc = new TaskCompletionSource<string[]?>();
+            using var disposable = await request.WatchResponseAsync(x => tsc.SetResult(x.results["uris"] as string[]), tsc.SetException);
+            var uris = await tsc.Task;
+            if (uris is null)
+                return null;
+            for (var i = 0; i < uris.Length; i++)
+                uris[i] = new Uri(uris[i]).AbsolutePath;
+            return uris;
+        }
+
+        public async Task<string?> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
+        {
+            var parentWindow = $"x11:{parent.PlatformImpl!.Handle.Handle.ToString("X")}";
+            var options = new Dictionary<string, object>
+            {
+                { "directory", true }
+            };
+            var objectPath = await _fileChooser.OpenFileAsync(parentWindow, dialog.Title ?? string.Empty, options);
+            var request = DBusHelper.Connection!.CreateProxy<IRequest>("org.freedesktop.portal.Request", objectPath);
+            var tsc = new TaskCompletionSource<string[]?>();
+            using var disposable = await request.WatchResponseAsync(x => tsc.SetResult(x.results["uris"] as string[]), tsc.SetException);
+            var uris = await tsc.Task;
+            if (uris is null)
+                return null;
+            return uris.Length != 1 ? string.Empty : new Uri(uris[0]).AbsolutePath;
+        }
+
+        private static (string name, (uint style, string extension)[])[] ParseFilters(FileDialog dialog)
+        {
+            var filters = new (string name, (uint style, string extension)[])[dialog.Filters!.Count];
+            for (var i = 0; i < filters.Length; i++)
+            {
+                var extensions = dialog.Filters[i].Extensions.Select(static x => (0u, x)).ToArray();
+                filters[i] = (dialog.Filters[i].Name ?? string.Empty, extensions);
+            }
+
+            return filters;
+        }
+    }
+}
diff --git a/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs b/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
index a7cc4f4cc2..4a55212de3 100644
--- a/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
+++ b/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
@@ -12,10 +12,6 @@ using Tmds.DBus;
 
 [assembly: InternalsVisibleTo(Connection.DynamicAssemblyName)]
 
-[assembly:
-    InternalsVisibleTo(
-        "Avalonia.X11, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
 namespace Avalonia.FreeDesktop
 {
     internal class DBusTrayIconImpl : ITrayIconImpl
diff --git a/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs b/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs
index f9737b461d..39ddd9d769 100644
--- a/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs
+++ b/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs
@@ -36,6 +36,13 @@ namespace Avalonia.FreeDesktop
 
         private string GetSymlinkTarget(string x) => Path.GetFullPath(Path.Combine(DevByLabelDir, NativeMethods.ReadLink(x)));
 
+        private string UnescapeString(string input, string regexText, int escapeBase) =>
+            new Regex(regexText).Replace(input, m => Convert.ToChar(Convert.ToByte(m.Groups[1].Value, escapeBase)).ToString());
+
+        private string UnescapePathFromProcMounts(string input) => UnescapeString(input, @"\\(\d{3})", 8);
+
+        private string UnescapeDeviceLabel(string input) => UnescapeString(input, @"\\x([0-9a-f]{2})", 16);
+
         private void Poll(long _)
         {
             var fProcPartitions = File.ReadAllLines(ProcPartitionsDir)
@@ -47,14 +54,14 @@ namespace Avalonia.FreeDesktop
 
             var fProcMounts = File.ReadAllLines(ProcMountsDir)
                                   .Select(x => x.Split(' '))
-                                  .Select(x => (x[0], x[1]))
+                                  .Select(x => (x[0], UnescapePathFromProcMounts(x[1])))
                                   .Where(x => !x.Item2.StartsWith("/snap/", StringComparison.InvariantCultureIgnoreCase));
 
             var labelDirEnum = Directory.Exists(DevByLabelDir) ?
                                new DirectoryInfo(DevByLabelDir).GetFiles() : Enumerable.Empty<FileInfo>();
 
             var labelDevPathPairs = labelDirEnum
-                                    .Select(x => (GetSymlinkTarget(x.FullName), x.Name));
+                                    .Select(x => (GetSymlinkTarget(x.FullName), UnescapeDeviceLabel(x.Name)));
 
             var q1 = from mount in fProcMounts
                      join device in fProcPartitions on mount.Item1 equals device.Item2
@@ -64,7 +71,7 @@ namespace Avalonia.FreeDesktop
                      {
                          VolumePath = mount.Item2,
                          VolumeSizeBytes = device.Item1,
-                         VolumeLabel = x.Name
+                         VolumeLabel = x.Item2
                      };
 
             var mountVolInfos = q1.ToArray();
diff --git a/src/Avalonia.FreeDesktop/NativeMethods.cs b/src/Avalonia.FreeDesktop/NativeMethods.cs
index 8bbda98bb2..147955b6a3 100644
--- a/src/Avalonia.FreeDesktop/NativeMethods.cs
+++ b/src/Avalonia.FreeDesktop/NativeMethods.cs
@@ -14,15 +14,15 @@ namespace Avalonia.FreeDesktop
 
         public static string ReadLink(string path)
         {
-            var symlinkMaxSize = Encoding.ASCII.GetMaxByteCount(path.Length);
+            var symlinkSize = Encoding.UTF8.GetByteCount(path);
             var bufferSize = 4097; // PATH_MAX is (usually?) 4096, but we need to know if the result was truncated
 
-            var symlink = ArrayPool<byte>.Shared.Rent(symlinkMaxSize + 1);
+            var symlink = ArrayPool<byte>.Shared.Rent(symlinkSize + 1);
             var buffer = ArrayPool<byte>.Shared.Rent(bufferSize);
 
             try
             {
-                var symlinkSize = Encoding.UTF8.GetBytes(path, 0, path.Length, symlink, 0);
+                Encoding.UTF8.GetBytes(path, 0, path.Length, symlink, 0);
                 symlink[symlinkSize] = 0;
 
                 var size = readlink(symlink, buffer, bufferSize);
diff --git a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
index 90221bb922..6471b87bfd 100644
--- a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
+++ b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
@@ -7,7 +7,7 @@ using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 
 namespace Avalonia.Headless
 {
@@ -114,6 +114,13 @@ namespace Avalonia.Headless
             return new HeadlessGlyphRunStub();
         }
 
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun, out Matrix scale)
+        {
+            scale = Matrix.Identity;
+
+            return new HeadlessGeometryStub(new Rect(glyphRun.Size));
+        }
+
         class HeadlessGeometryStub : IGeometryImpl
         {
             public HeadlessGeometryStub(Rect bounds)
diff --git a/src/Avalonia.Headless/HeadlessPlatformStubs.cs b/src/Avalonia.Headless/HeadlessPlatformStubs.cs
index 9ac74e5e78..22ff8e8f97 100644
--- a/src/Avalonia.Headless/HeadlessPlatformStubs.cs
+++ b/src/Avalonia.Headless/HeadlessPlatformStubs.cs
@@ -133,9 +133,12 @@ namespace Avalonia.Headless
 
     class HeadlessTextShaperStub : ITextShaperImpl
     {
-        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize,
-            CultureInfo culture, sbyte bidiLevel)
+        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options)
         {
+            var typeface = options.Typeface;
+            var fontRenderingEmSize = options.FontRenderingEmSize;
+            var bidiLevel = options.BidiLevel;
+
             return new ShapedBuffer(text, text.Length, typeface, fontRenderingEmSize, bidiLevel);
         }
     }
@@ -200,5 +203,20 @@ namespace Avalonia.Headless
             new Screen(1, new PixelRect(0, 0, 1920, 1280),
                 new PixelRect(0, 0, 1920, 1280), true),
         };
+
+        public Screen ScreenFromPoint(PixelPoint point)
+        {
+            return ScreenHelper.ScreenFromPoint(point, AllScreens);
+        }
+
+        public Screen ScreenFromRect(PixelRect rect)
+        {
+            return ScreenHelper.ScreenFromRect(rect, AllScreens);
+        }
+
+        public Screen ScreenFromWindow(IWindowBaseImpl window)
+        {
+            return ScreenHelper.ScreenFromWindow(window, AllScreens);
+        }
     }
 }
diff --git a/src/Avalonia.Input/ApiCompatBaseline.txt b/src/Avalonia.Input/ApiCompatBaseline.txt
deleted file mode 100644
index 270c5305e5..0000000000
--- a/src/Avalonia.Input/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Compat issues with assembly Avalonia.Input:
-MembersMustExist : Member 'public Avalonia.Platform.IPlatformHandle Avalonia.Input.Cursor.PlatformCursor.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Input.Gestures.DoubleTappedEvent' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Input.Gestures.RightTappedEvent' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Input.Gestures.TappedEvent' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Input.IFocusManager.RemoveFocusScope(Avalonia.Input.IFocusScope)' is present in the implementation but not in the contract.
-MembersMustExist : Member 'public Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Input.InputElement.DoubleTappedEvent' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Interactivity.RoutedEvent<Avalonia.Interactivity.RoutedEventArgs> Avalonia.Input.InputElement.TappedEvent' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Input.InputElement.add_DoubleTapped(System.EventHandler<Avalonia.Interactivity.RoutedEventArgs>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Input.InputElement.add_Tapped(System.EventHandler<Avalonia.Interactivity.RoutedEventArgs>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Input.InputElement.remove_DoubleTapped(System.EventHandler<Avalonia.Interactivity.RoutedEventArgs>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Input.InputElement.remove_Tapped(System.EventHandler<Avalonia.Interactivity.RoutedEventArgs>)' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Platform.IStandardCursorFactory' does not exist in the implementation but it does exist in the contract.
-Total Issues: 12
diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj
deleted file mode 100644
index e66d1d7e7c..0000000000
--- a/src/Avalonia.Input/Avalonia.Input.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-  </ItemGroup>  
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
diff --git a/src/Avalonia.Input/FocusManager.cs b/src/Avalonia.Input/FocusManager.cs
deleted file mode 100644
index 30301788bc..0000000000
--- a/src/Avalonia.Input/FocusManager.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Manages focus for the application.
-    /// </summary>
-    public class FocusManager : IFocusManager
-    {
-        /// <summary>
-        /// The focus scopes in which the focus is currently defined.
-        /// </summary>
-        private readonly ConditionalWeakTable<IFocusScope, IInputElement?> _focusScopes =
-            new ConditionalWeakTable<IFocusScope, IInputElement?>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FocusManager"/> class.
-        /// </summary>
-        static FocusManager()
-        {
-            InputElement.PointerPressedEvent.AddClassHandler(
-                typeof(IInputElement),
-                new EventHandler<RoutedEventArgs>(OnPreviewPointerPressed),
-                RoutingStrategies.Tunnel);
-        }
-
-        /// <summary>
-        /// Gets the instance of the <see cref="IFocusManager"/>.
-        /// </summary>
-        public static IFocusManager? Instance => AvaloniaLocator.Current.GetService<IFocusManager>();
-
-        /// <summary>
-        /// Gets the currently focused <see cref="IInputElement"/>.
-        /// </summary>
-        public IInputElement? Current => KeyboardDevice.Instance?.FocusedElement;
-
-        /// <summary>
-        /// Gets the current focus scope.
-        /// </summary>
-        public IFocusScope? Scope
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Focuses a control.
-        /// </summary>
-        /// <param name="control">The control to focus.</param>
-        /// <param name="method">The method by which focus was changed.</param>
-        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
-        public void Focus(
-            IInputElement? control, 
-            NavigationMethod method = NavigationMethod.Unspecified,
-            KeyModifiers keyModifiers = KeyModifiers.None)
-        {
-            if (control != null)
-            {
-                var scope = GetFocusScopeAncestors(control)
-                    .FirstOrDefault();
-
-                if (scope != null)
-                {
-                    Scope = scope;
-                    SetFocusedElement(scope, control, method, keyModifiers);
-                }
-            }
-            else if (Current != null)
-            {
-                // If control is null, set focus to the topmost focus scope.
-                foreach (var scope in GetFocusScopeAncestors(Current).Reverse().ToList())
-                {
-                    if (scope != Scope &&
-                        _focusScopes.TryGetValue(scope, out var element) &&
-                        element != null)
-                    {
-                        Focus(element, method);
-                        return;
-                    }
-                }
-
-                if (Scope is object)
-                {
-                    // Couldn't find a focus scope, clear focus.
-                    SetFocusedElement(Scope, null);
-                }
-            }
-        }
-
-        public IInputElement? GetFocusedElement(IInputElement e)
-        {
-            if (e is IFocusScope scope)
-            {
-                _focusScopes.TryGetValue(scope, out var result);
-                return result;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Sets the currently focused element in the specified scope.
-        /// </summary>
-        /// <param name="scope">The focus scope.</param>
-        /// <param name="element">The element to focus. May be null.</param>
-        /// <param name="method">The method by which focus was changed.</param>
-        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
-        /// <remarks>
-        /// If the specified scope is the current <see cref="Scope"/> then the keyboard focus
-        /// will change.
-        /// </remarks>
-        public void SetFocusedElement(
-            IFocusScope scope,
-            IInputElement? element,
-            NavigationMethod method = NavigationMethod.Unspecified,
-            KeyModifiers keyModifiers = KeyModifiers.None)
-        {
-            scope = scope ?? throw new ArgumentNullException(nameof(scope));
-
-            if (_focusScopes.TryGetValue(scope, out var existingElement))
-            {
-                if (element != existingElement)
-                {
-                    _focusScopes.Remove(scope);
-                    _focusScopes.Add(scope, element);
-                }
-            }
-            else
-            {
-                _focusScopes.Add(scope, element);
-            }
-
-            if (Scope == scope)
-            {
-                KeyboardDevice.Instance?.SetFocusedElement(element, method, keyModifiers);
-            }
-        }
-
-        /// <summary>
-        /// Notifies the focus manager of a change in focus scope.
-        /// </summary>
-        /// <param name="scope">The new focus scope.</param>
-        public void SetFocusScope(IFocusScope scope)
-        {
-            scope = scope ?? throw new ArgumentNullException(nameof(scope));
-
-            if (!_focusScopes.TryGetValue(scope, out var e))
-            {
-                // TODO: Make this do something useful, i.e. select the first focusable
-                // control, select a control that the user has specified to have default
-                // focus etc.
-                e = scope as IInputElement;
-                _focusScopes.Add(scope, e);
-            }
-
-            Scope = scope;
-            Focus(e);
-        }
-
-        public void RemoveFocusScope(IFocusScope scope)
-        {
-            scope = scope ?? throw new ArgumentNullException(nameof(scope));
-            
-            if (_focusScopes.TryGetValue(scope, out _))
-            {
-                SetFocusedElement(scope, null);
-                _focusScopes.Remove(scope);
-            }
-
-            if (Scope == scope)
-            {
-                Scope = null;
-            }
-        }
-
-        public static bool GetIsFocusScope(IInputElement e) => e is IFocusScope;
-
-        /// <summary>
-        /// Checks if the specified element can be focused.
-        /// </summary>
-        /// <param name="e">The element.</param>
-        /// <returns>True if the element can be focused.</returns>
-        private static bool CanFocus(IInputElement e) => e.Focusable && e.IsEffectivelyEnabled && e.IsVisible;
-
-        /// <summary>
-        /// Gets the focus scope ancestors of the specified control, traversing popups.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The focus scopes.</returns>
-        private static IEnumerable<IFocusScope> GetFocusScopeAncestors(IInputElement control)
-        {
-            IInputElement? c = control;
-
-            while (c != null)
-            {
-                var scope = c as IFocusScope;
-
-                if (scope != null && c.VisualRoot?.IsVisible == true)
-                {
-                    yield return scope;
-                }
-
-                c = c.GetVisualParent<IInputElement>() ??
-                    ((c as IHostedVisualTreeRoot)?.Host as IInputElement);
-            }
-        }
-
-        /// <summary>
-        /// Global handler for pointer pressed events.
-        /// </summary>
-        /// <param name="sender">The event sender.</param>
-        /// <param name="e">The event args.</param>
-        private static void OnPreviewPointerPressed(object? sender, RoutedEventArgs e)
-        {
-            if (sender is null)
-                return;
-
-            var ev = (PointerPressedEventArgs)e;
-            var visual = (IVisual)sender;
-
-            if (sender == e.Source && ev.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
-            {
-                IVisual? element = ev.Pointer?.Captured ?? e.Source as IInputElement;
-
-                while (element != null)
-                {
-                    if (element is IInputElement inputElement && CanFocus(inputElement))
-                    {
-                        Instance?.Focus(inputElement, NavigationMethod.Pointer, ev.KeyModifiers);
-
-                        break;
-                    }
-                    
-                    element = element.VisualParent;
-                }
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Input/Gestures.cs b/src/Avalonia.Input/Gestures.cs
deleted file mode 100644
index 86e6e96a71..0000000000
--- a/src/Avalonia.Input/Gestures.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using System;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    public static class Gestures
-    {
-        private static bool s_isDoubleTapped = false;
-        public static readonly RoutedEvent<TappedEventArgs> TappedEvent = RoutedEvent.Register<TappedEventArgs>(
-            "Tapped",
-            RoutingStrategies.Bubble,
-            typeof(Gestures));
-
-        public static readonly RoutedEvent<TappedEventArgs> DoubleTappedEvent = RoutedEvent.Register<TappedEventArgs>(
-            "DoubleTapped",
-            RoutingStrategies.Bubble,
-            typeof(Gestures));
-
-        public static readonly RoutedEvent<TappedEventArgs> RightTappedEvent = RoutedEvent.Register<TappedEventArgs>(
-            "RightTapped",
-            RoutingStrategies.Bubble,
-            typeof(Gestures));
-
-        public static readonly RoutedEvent<ScrollGestureEventArgs> ScrollGestureEvent =
-            RoutedEvent.Register<ScrollGestureEventArgs>(
-                "ScrollGesture", RoutingStrategies.Bubble, typeof(Gestures));
-
-        public static readonly RoutedEvent<ScrollGestureEventArgs> ScrollGestureEndedEvent =
-            RoutedEvent.Register<ScrollGestureEventArgs>(
-                "ScrollGestureEnded", RoutingStrategies.Bubble, typeof(Gestures));
-        
-        public static readonly RoutedEvent<PointerDeltaEventArgs> PointerTouchPadGestureMagnifyEvent =
-            RoutedEvent.Register<PointerDeltaEventArgs>(
-                "PointerMagnifyGesture", RoutingStrategies.Bubble, typeof(Gestures));
-        
-        public static readonly RoutedEvent<PointerDeltaEventArgs> PointerTouchPadGestureRotateEvent =
-            RoutedEvent.Register<PointerDeltaEventArgs>(
-                "PointerRotateGesture", RoutingStrategies.Bubble, typeof(Gestures));
-        
-        public static readonly RoutedEvent<PointerDeltaEventArgs> PointerTouchPadGestureSwipeEvent =
-            RoutedEvent.Register<PointerDeltaEventArgs>(
-                "PointerSwipeGesture", RoutingStrategies.Bubble, typeof(Gestures));
-
-#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-        private static readonly WeakReference<IInteractive> s_lastPress = new WeakReference<IInteractive>(null);
-#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
-
-        static Gestures()
-        {
-            InputElement.PointerPressedEvent.RouteFinished.Subscribe(PointerPressed);
-            InputElement.PointerReleasedEvent.RouteFinished.Subscribe(PointerReleased);
-        }
-
-        public static void AddTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
-        {
-            element.AddHandler(TappedEvent, handler);
-        }
-
-        public static void AddDoubleTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
-        {
-            element.AddHandler(DoubleTappedEvent, handler);
-        }
-
-        public static void AddRightTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
-        {
-            element.AddHandler(RightTappedEvent, handler);
-        }
-
-        public static void RemoveTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
-        {
-            element.RemoveHandler(TappedEvent, handler);
-        }
-
-        public static void RemoveDoubleTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
-        {
-            element.RemoveHandler(DoubleTappedEvent, handler);
-        }
-
-        public static void RemoveRightTappedHandler(IInteractive element, EventHandler<RoutedEventArgs> handler)
-        {
-            element.RemoveHandler(RightTappedEvent, handler);
-        }
-
-        private static void PointerPressed(RoutedEventArgs ev)
-        {
-            if (ev.Source is null)
-            {
-                return;
-            }
-
-            if (ev.Route == RoutingStrategies.Bubble)
-            {
-                var e = (PointerPressedEventArgs)ev;
-                var visual = (IVisual)ev.Source;
-
-                if (e.ClickCount <= 1)
-                {
-                    s_isDoubleTapped = false;
-                    s_lastPress.SetTarget(ev.Source);
-                }
-                else if (e.ClickCount % 2 == 0 && e.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
-                {
-                    if (s_lastPress.TryGetTarget(out var target) && target == e.Source)
-                    {
-                        s_isDoubleTapped = true;
-                        e.Source.RaiseEvent(new TappedEventArgs(DoubleTappedEvent, e));
-                    }
-                }
-                else
-                {
-                    s_isDoubleTapped = false;
-                }
-            }
-        }
-
-        private static void PointerReleased(RoutedEventArgs ev)
-        {
-            if (ev.Route == RoutingStrategies.Bubble)
-            {
-                var e = (PointerReleasedEventArgs)ev;
-
-                if (s_lastPress.TryGetTarget(out var target) && target == e.Source)
-                {
-                    if (e.InitialPressMouseButton == MouseButton.Left || e.InitialPressMouseButton == MouseButton.Right)
-                    {
-                        if (e.InitialPressMouseButton == MouseButton.Right)
-                        {
-                            e.Source.RaiseEvent(new TappedEventArgs(RightTappedEvent, e));
-                        }
-                        //s_isDoubleTapped needed here to prevent invoking Tapped event when DoubleTapped is called.
-                        //This behaviour matches UWP behaviour.
-                        else if (s_isDoubleTapped == false)
-                        {
-                            e.Source.RaiseEvent(new TappedEventArgs(TappedEvent, e));
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Input/IAccessKeyHandler.cs b/src/Avalonia.Input/IAccessKeyHandler.cs
deleted file mode 100644
index e484d003c7..0000000000
--- a/src/Avalonia.Input/IAccessKeyHandler.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines the interface for classes that handle access keys for a window.
-    /// </summary>
-    public interface IAccessKeyHandler
-    {
-        /// <summary>
-        /// Gets or sets the window's main menu.
-        /// </summary>
-        IMainMenu? MainMenu { get; set; }
-
-        /// <summary>
-        /// Sets the owner of the access key handler.
-        /// </summary>
-        /// <param name="owner">The owner.</param>
-        /// <remarks>
-        /// This method can only be called once, typically by the owner itself on creation.
-        /// </remarks>
-        void SetOwner(IInputRoot owner);
-
-        /// <summary>
-        /// Registers an input element to be associated with an access key.
-        /// </summary>
-        /// <param name="accessKey">The access key.</param>
-        /// <param name="element">The input element.</param>
-        void Register(char accessKey, IInputElement element);
-
-        /// <summary>
-        /// Unregisters the access keys associated with the input element.
-        /// </summary>
-        /// <param name="element">The input element.</param>
-        void Unregister(IInputElement element);
-    }
-}
diff --git a/src/Avalonia.Input/IFocusManager.cs b/src/Avalonia.Input/IFocusManager.cs
deleted file mode 100644
index 2510479a8e..0000000000
--- a/src/Avalonia.Input/IFocusManager.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Manages focus for the application.
-    /// </summary>
-    public interface IFocusManager
-    {
-        /// <summary>
-        /// Gets the currently focused <see cref="IInputElement"/>.
-        /// </summary>
-        IInputElement? Current { get; }
-
-        /// <summary>
-        /// Gets the current focus scope.
-        /// </summary>
-        IFocusScope? Scope { get; }
-
-        /// <summary>
-        /// Focuses a control.
-        /// </summary>
-        /// <param name="control">The control to focus.</param>
-        /// <param name="method">The method by which focus was changed.</param>
-        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
-        void Focus(
-            IInputElement? control,
-            NavigationMethod method = NavigationMethod.Unspecified,
-            KeyModifiers keyModifiers = KeyModifiers.None);
-
-        /// <summary>
-        /// Notifies the focus manager of a change in focus scope.
-        /// </summary>
-        /// <param name="scope">The new focus scope.</param>
-        /// <remarks>
-        /// This should not be called by client code. It is called by an <see cref="IFocusScope"/>
-        /// when it activates, e.g. when a Window is activated.
-        /// </remarks>
-        void SetFocusScope(IFocusScope scope);
-
-        /// <summary>
-        /// Notifies the focus manager that a focus scope has been removed.
-        /// </summary>
-        /// <param name="scope">The focus scope to be removed.</param>
-        /// This should not be called by client code. It is called by an <see cref="IFocusScope"/>
-        /// when it deactivates or closes, e.g. when a Window is closed.
-        void RemoveFocusScope(IFocusScope scope);
-    }
-}
diff --git a/src/Avalonia.Input/IInputDevice.cs b/src/Avalonia.Input/IInputDevice.cs
deleted file mode 100644
index ab0fae65df..0000000000
--- a/src/Avalonia.Input/IInputDevice.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Avalonia.Input.Raw;
-
-namespace Avalonia.Input
-{
-    public interface IInputDevice
-    {
-        /// <summary>
-        /// Processes raw event. Is called after preprocessing by InputManager
-        /// </summary>
-        /// <param name="ev"></param>
-        void ProcessRawEvent(RawInputEventArgs ev);
-    }
-}
diff --git a/src/Avalonia.Input/IInputElement.cs b/src/Avalonia.Input/IInputElement.cs
deleted file mode 100644
index d1552a3a2a..0000000000
--- a/src/Avalonia.Input/IInputElement.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-#nullable enable
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines input-related functionality for a control.
-    /// </summary>
-    public interface IInputElement : IInteractive, IVisual
-    {
-        /// <summary>
-        /// Occurs when the control receives focus.
-        /// </summary>
-        event EventHandler<GotFocusEventArgs>? GotFocus;
-
-        /// <summary>
-        /// Occurs when the control loses focus.
-        /// </summary>
-        event EventHandler<RoutedEventArgs>? LostFocus;
-
-        /// <summary>
-        /// Occurs when a key is pressed while the control has focus.
-        /// </summary>
-        event EventHandler<KeyEventArgs>? KeyDown;
-
-        /// <summary>
-        /// Occurs when a key is released while the control has focus.
-        /// </summary>
-        event EventHandler<KeyEventArgs>? KeyUp;
-
-        /// <summary>
-        /// Occurs when a user typed some text while the control has focus.
-        /// </summary>
-        event EventHandler<TextInputEventArgs>? TextInput;
-
-        /// <summary>
-        /// Occurs when the pointer enters the control.
-        /// </summary>
-        event EventHandler<PointerEventArgs>? PointerEnter;
-
-        /// <summary>
-        /// Occurs when the pointer leaves the control.
-        /// </summary>
-        event EventHandler<PointerEventArgs>? PointerLeave;
-
-        /// <summary>
-        /// Occurs when the pointer is pressed over the control.
-        /// </summary>
-        event EventHandler<PointerPressedEventArgs>? PointerPressed;
-
-        /// <summary>
-        /// Occurs when the pointer moves over the control.
-        /// </summary>
-        event EventHandler<PointerEventArgs>? PointerMoved;
-
-        /// <summary>
-        /// Occurs when the pointer is released over the control.
-        /// </summary>
-        event EventHandler<PointerReleasedEventArgs>? PointerReleased;
-
-        /// <summary>
-        /// Occurs when the mouse wheel is scrolled over the control.
-        /// </summary>
-        event EventHandler<PointerWheelEventArgs>? PointerWheelChanged;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the control can receive keyboard focus.
-        /// </summary>
-        bool Focusable { get; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the control is enabled for user interaction.
-        /// </summary>
-        bool IsEnabled { get; }
-
-        /// <summary>
-        /// Gets or sets the associated mouse cursor.
-        /// </summary>
-        Cursor? Cursor { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this control and all its parents are enabled.
-        /// </summary>
-        /// <remarks>
-        /// The <see cref="IsEnabled"/> property is used to toggle the enabled state for individual
-        /// controls. The <see cref="IsEffectivelyEnabled"/> property takes into account the
-        /// <see cref="IsEnabled"/> value of this control and its parent controls.
-        /// </remarks>
-        bool IsEffectivelyEnabled { get; }
-        
-        /// <summary>
-        /// Gets a value indicating whether keyboard focus is anywhere within the element or its visual tree child elements.
-        /// </summary>
-        bool IsKeyboardFocusWithin { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the control is focused.
-        /// </summary>
-        bool IsFocused { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the control is considered for hit testing.
-        /// </summary>
-        bool IsHitTestVisible { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the pointer is currently over the control.
-        /// </summary>
-        bool IsPointerOver { get; }
-
-        /// <summary>
-        /// Focuses the control.
-        /// </summary>
-        void Focus();
-
-        /// <summary>
-        /// Gets the key bindings for the element.
-        /// </summary>
-        List<KeyBinding> KeyBindings { get; }
-    }
-}
diff --git a/src/Avalonia.Input/IInputManager.cs b/src/Avalonia.Input/IInputManager.cs
deleted file mode 100644
index 80b71d3e47..0000000000
--- a/src/Avalonia.Input/IInputManager.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using Avalonia.Input.Raw;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Receives input from the windowing subsystem and dispatches it to interested parties
-    /// for processing.
-    /// </summary>
-    public interface IInputManager
-    {
-        /// <summary>
-        /// Gets an observable that notifies on each input event received before
-        /// <see cref="Process"/>.
-        /// </summary>
-        IObservable<RawInputEventArgs> PreProcess { get; }
-
-        /// <summary>
-        /// Gets an observable that notifies on each input event received.
-        /// </summary>
-        IObservable<RawInputEventArgs> Process { get; }
-
-        /// <summary>
-        /// Gets an observable that notifies on each input event received after
-        /// <see cref="Process"/>.
-        /// </summary>
-        IObservable<RawInputEventArgs> PostProcess { get; }
-
-        /// <summary>
-        /// Processes a raw input event.
-        /// </summary>
-        /// <param name="e">The raw input event.</param>
-        void ProcessInput(RawInputEventArgs e);
-    }
-}
diff --git a/src/Avalonia.Input/IInputRoot.cs b/src/Avalonia.Input/IInputRoot.cs
deleted file mode 100644
index 3e2b8cc477..0000000000
--- a/src/Avalonia.Input/IInputRoot.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using JetBrains.Annotations;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines the interface for top-level input elements.
-    /// </summary>
-    public interface IInputRoot : IInputElement
-    {
-        /// <summary>
-        /// Gets or sets the access key handler.
-        /// </summary>
-        IAccessKeyHandler AccessKeyHandler { get; }
-
-        /// <summary>
-        /// Gets or sets the keyboard navigation handler.
-        /// </summary>
-        IKeyboardNavigationHandler KeyboardNavigationHandler { get; }
-
-        /// <summary>
-        /// Gets or sets the input element that the pointer is currently over.
-        /// </summary>
-        IInputElement? PointerOverElement { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether access keys are shown in the window.
-        /// </summary>
-        bool ShowAccessKeys { get; set; }
-
-        /// <summary>
-        /// Gets associated mouse device
-        /// </summary>
-        [CanBeNull]
-        IMouseDevice? MouseDevice { get; }
-    }
-}
diff --git a/src/Avalonia.Input/IKeyboardDevice.cs b/src/Avalonia.Input/IKeyboardDevice.cs
deleted file mode 100644
index 9506dc36fb..0000000000
--- a/src/Avalonia.Input/IKeyboardDevice.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace Avalonia.Input
-{
-    [Flags, Obsolete("Use KeyModifiers and PointerPointProperties")]
-    public enum InputModifiers
-    {
-        None = 0,
-        Alt = 1,
-        Control = 2,
-        Shift = 4,
-        Windows = 8,
-        LeftMouseButton = 16,
-        RightMouseButton = 32,
-        MiddleMouseButton = 64
-    }
-
-    [Flags]
-    public enum KeyModifiers
-    {
-        None = 0,
-        Alt = 1,
-        Control = 2,
-        Shift = 4,
-        Meta = 8,
-    }
-
-    [Flags]
-    public enum KeyStates
-    {
-        None = 0,
-        Down = 1,
-        Toggled = 2,
-    }
-
-    [Flags]
-    public enum RawInputModifiers
-    {
-        None = 0,
-        Alt = 1,
-        Control = 2,
-        Shift = 4,
-        Meta = 8,
-        LeftMouseButton = 16,
-        RightMouseButton = 32,
-        MiddleMouseButton = 64,
-        XButton1MouseButton = 128,
-        XButton2MouseButton = 256,
-        KeyboardMask = Alt | Control | Shift | Meta
-    }
-
-    internal static class KeyModifiersUtils
-    {
-        public static KeyModifiers ConvertToKey(RawInputModifiers modifiers) =>
-            (KeyModifiers)(modifiers & RawInputModifiers.KeyboardMask);
-    }
-
-    public interface IKeyboardDevice : IInputDevice, INotifyPropertyChanged
-    {
-        IInputElement? FocusedElement { get; }
-
-        void SetFocusedElement(
-            IInputElement? element, 
-            NavigationMethod method,
-            KeyModifiers modifiers);
-    }
-}
diff --git a/src/Avalonia.Input/IKeyboardNavigationHandler.cs b/src/Avalonia.Input/IKeyboardNavigationHandler.cs
deleted file mode 100644
index 88d00b3b50..0000000000
--- a/src/Avalonia.Input/IKeyboardNavigationHandler.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines the interface for classes that handle keyboard navigation for a window.
-    /// </summary>
-    public interface IKeyboardNavigationHandler
-    {
-        /// <summary>
-        /// Sets the owner of the keyboard navigation handler.
-        /// </summary>
-        /// <param name="owner">The owner.</param>
-        /// <remarks>
-        /// This method can only be called once, typically by the owner itself on creation.
-        /// </remarks>
-        void SetOwner(IInputRoot owner);
-
-        /// <summary>
-        /// Moves the focus in the specified direction.
-        /// </summary>
-        /// <param name="element">The current element.</param>
-        /// <param name="direction">The direction to move.</param>
-        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
-        void Move(
-            IInputElement element, 
-            NavigationDirection direction,
-            KeyModifiers keyModifiers = KeyModifiers.None);
-    }
-}
diff --git a/src/Avalonia.Input/IMainMenu.cs b/src/Avalonia.Input/IMainMenu.cs
deleted file mode 100644
index 67b58c0ffc..0000000000
--- a/src/Avalonia.Input/IMainMenu.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines the interface for a window's main menu.
-    /// </summary>
-    public interface IMainMenu : IVisual
-    {
-        /// <summary>
-        /// Gets a value indicating whether the menu is open.
-        /// </summary>
-        bool IsOpen { get; }
-
-        /// <summary>
-        /// Closes the menu.
-        /// </summary>
-        void Close();
-
-        /// <summary>
-        /// Opens the menu in response to the Alt/F10 key.
-        /// </summary>
-        void Open();
-
-        /// <summary>
-        /// Occurs when the main menu closes.
-        /// </summary>
-        event EventHandler<RoutedEventArgs>? MenuClosed;
-    }
-}
diff --git a/src/Avalonia.Input/IMouseDevice.cs b/src/Avalonia.Input/IMouseDevice.cs
deleted file mode 100644
index 272d1eb8d7..0000000000
--- a/src/Avalonia.Input/IMouseDevice.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Represents a mouse device.
-    /// </summary>
-    public interface IMouseDevice : IPointerDevice
-    {
-        /// <summary>
-        /// Gets the mouse position, in screen coordinates.
-        /// </summary>
-        [Obsolete("Use PointerEventArgs.GetPosition")]
-        PixelPoint Position { get; }
-
-        void TopLevelClosed(IInputRoot root);
-
-        void SceneInvalidated(IInputRoot root, Rect rect);
-    }
-}
diff --git a/src/Avalonia.Input/IPointer.cs b/src/Avalonia.Input/IPointer.cs
deleted file mode 100644
index 7af48cef82..0000000000
--- a/src/Avalonia.Input/IPointer.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Avalonia.Input
-{
-    public interface IPointer
-    {
-        int Id { get; }
-        void Capture(IInputElement? control);
-        IInputElement? Captured { get; }
-        PointerType Type { get; }
-        bool IsPrimary { get; }
-        
-    }
-
-    public enum PointerType
-    {
-        Mouse,
-        Touch
-    }
-}
diff --git a/src/Avalonia.Input/IPointerDevice.cs b/src/Avalonia.Input/IPointerDevice.cs
deleted file mode 100644
index 1f82cb1ed7..0000000000
--- a/src/Avalonia.Input/IPointerDevice.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    public interface IPointerDevice : IInputDevice
-    {
-        [Obsolete("Use IPointer")]
-        IInputElement? Captured { get; }
-        
-        [Obsolete("Use IPointer")]
-        void Capture(IInputElement? control);
-
-        [Obsolete("Use PointerEventArgs.GetPosition")]
-        Point GetPosition(IVisual relativeTo);
-    }
-}
diff --git a/src/Avalonia.Input/InputElement.cs b/src/Avalonia.Input/InputElement.cs
deleted file mode 100644
index 5ec0bd6ee4..0000000000
--- a/src/Avalonia.Input/InputElement.cs
+++ /dev/null
@@ -1,710 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Metadata;
-using Avalonia.Data;
-using Avalonia.Input.GestureRecognizers;
-using Avalonia.Input.TextInput;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-#nullable enable
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Implements input-related functionality for a control.
-    /// </summary>
-    [PseudoClasses(":disabled", ":focus", ":focus-visible", ":focus-within", ":pointerover")]
-    public class InputElement : Interactive, IInputElement
-    {
-        /// <summary>
-        /// Defines the <see cref="Focusable"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> FocusableProperty =
-            AvaloniaProperty.Register<InputElement, bool>(nameof(Focusable));
-
-        /// <summary>
-        /// Defines the <see cref="IsEnabled"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> IsEnabledProperty =
-            AvaloniaProperty.Register<InputElement, bool>(nameof(IsEnabled), true);
-
-        /// <summary>
-        /// Defines the <see cref="IsEffectivelyEnabled"/> property.
-        /// </summary>
-        public static readonly DirectProperty<InputElement, bool> IsEffectivelyEnabledProperty =
-            AvaloniaProperty.RegisterDirect<InputElement, bool>(
-                nameof(IsEffectivelyEnabled),
-                o => o.IsEffectivelyEnabled);
-
-        /// <summary>
-        /// Gets or sets associated mouse cursor.
-        /// </summary>
-        public static readonly StyledProperty<Cursor?> CursorProperty =
-            AvaloniaProperty.Register<InputElement, Cursor?>(nameof(Cursor), null, true);
-
-        /// <summary>
-        /// Defines the <see cref="IsKeyboardFocusWithin"/> property.
-        /// </summary>
-        public static readonly DirectProperty<InputElement, bool> IsKeyboardFocusWithinProperty =
-            AvaloniaProperty.RegisterDirect<InputElement, bool>(
-                nameof(IsKeyboardFocusWithin),
-                o => o.IsKeyboardFocusWithin);
-        
-        /// <summary>
-        /// Defines the <see cref="IsFocused"/> property.
-        /// </summary>
-        public static readonly DirectProperty<InputElement, bool> IsFocusedProperty =
-            AvaloniaProperty.RegisterDirect<InputElement, bool>(nameof(IsFocused), o => o.IsFocused);
-
-        /// <summary>
-        /// Defines the <see cref="IsHitTestVisible"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> IsHitTestVisibleProperty =
-            AvaloniaProperty.Register<InputElement, bool>(nameof(IsHitTestVisible), true);
-
-        /// <summary>
-        /// Defines the <see cref="IsPointerOver"/> property.
-        /// </summary>
-        public static readonly DirectProperty<InputElement, bool> IsPointerOverProperty =
-            AvaloniaProperty.RegisterDirect<InputElement, bool>(nameof(IsPointerOver), o => o.IsPointerOver);
-
-        /// <summary>
-        /// Defines the <see cref="IsTabStop"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> IsTabStopProperty =
-            KeyboardNavigation.IsTabStopProperty.AddOwner<InputElement>();
-
-        /// <summary>
-        /// Defines the <see cref="GotFocus"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<GotFocusEventArgs> GotFocusEvent =
-            RoutedEvent.Register<InputElement, GotFocusEventArgs>(nameof(GotFocus), RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="LostFocus"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<RoutedEventArgs> LostFocusEvent =
-            RoutedEvent.Register<InputElement, RoutedEventArgs>(nameof(LostFocus), RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="KeyDown"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<KeyEventArgs> KeyDownEvent =
-            RoutedEvent.Register<InputElement, KeyEventArgs>(
-                "KeyDown",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="KeyUp"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<KeyEventArgs> KeyUpEvent =
-            RoutedEvent.Register<InputElement, KeyEventArgs>(
-                "KeyUp",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="TabIndex"/> property.
-        /// </summary>
-        public static readonly StyledProperty<int> TabIndexProperty =
-            KeyboardNavigation.TabIndexProperty.AddOwner<InputElement>();
-
-        /// <summary>
-        /// Defines the <see cref="TextInput"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<TextInputEventArgs> TextInputEvent =
-            RoutedEvent.Register<InputElement, TextInputEventArgs>(
-                "TextInput",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-        
-        /// <summary>
-        /// Defines the <see cref="TextInputMethodClientRequested"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<TextInputMethodClientRequestedEventArgs> TextInputMethodClientRequestedEvent =
-            RoutedEvent.Register<InputElement, TextInputMethodClientRequestedEventArgs>(
-                "TextInputMethodClientRequested",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-        
-        /// <summary>
-        /// Defines the <see cref="TextInputOptionsQuery"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<TextInputOptionsQueryEventArgs> TextInputOptionsQueryEvent =
-            RoutedEvent.Register<InputElement, TextInputOptionsQueryEventArgs>(
-                "TextInputOptionsQuery",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="PointerEnter"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerEventArgs> PointerEnterEvent =
-            RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerEnter), RoutingStrategies.Direct);
-
-        /// <summary>
-        /// Defines the <see cref="PointerLeave"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerEventArgs> PointerLeaveEvent =
-            RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerLeave), RoutingStrategies.Direct);
-
-        /// <summary>
-        /// Defines the <see cref="PointerMoved"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerEventArgs> PointerMovedEvent =
-            RoutedEvent.Register<InputElement, PointerEventArgs>(
-                "PointerMove",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="PointerPressed"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerPressedEventArgs> PointerPressedEvent =
-            RoutedEvent.Register<InputElement, PointerPressedEventArgs>(
-                "PointerPressed",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="PointerReleased"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerReleasedEventArgs> PointerReleasedEvent =
-            RoutedEvent.Register<InputElement, PointerReleasedEventArgs>(
-                "PointerReleased",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-        
-        /// <summary>
-        /// Defines the <see cref="PointerCaptureLost"/> routed event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerCaptureLostEventArgs> PointerCaptureLostEvent =
-            RoutedEvent.Register<InputElement, PointerCaptureLostEventArgs>(
-                "PointerCaptureLost", 
-                RoutingStrategies.Direct);
-
-        /// <summary>
-        /// Defines the <see cref="PointerWheelChanged"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<PointerWheelEventArgs> PointerWheelChangedEvent =
-            RoutedEvent.Register<InputElement, PointerWheelEventArgs>(
-                "PointerWheelChanged",
-                RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="Tapped"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<TappedEventArgs> TappedEvent = Gestures.TappedEvent;
-
-        /// <summary>
-        /// Defines the <see cref="DoubleTapped"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<TappedEventArgs> DoubleTappedEvent = Gestures.DoubleTappedEvent;
-        
-        private bool _isEffectivelyEnabled = true;
-        private bool _isFocused;
-        private bool _isKeyboardFocusWithin;
-        private bool _isFocusVisible;
-        private bool _isPointerOver;
-        private GestureRecognizerCollection? _gestureRecognizers;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="InputElement"/> class.
-        /// </summary>
-        static InputElement()
-        {
-            IsEnabledProperty.Changed.Subscribe(IsEnabledChanged);
-
-            GotFocusEvent.AddClassHandler<InputElement>((x, e) => x.OnGotFocus(e));
-            LostFocusEvent.AddClassHandler<InputElement>((x, e) => x.OnLostFocus(e));
-            KeyDownEvent.AddClassHandler<InputElement>((x, e) => x.OnKeyDown(e));
-            KeyUpEvent.AddClassHandler<InputElement>((x, e) => x.OnKeyUp(e));
-            TextInputEvent.AddClassHandler<InputElement>((x, e) => x.OnTextInput(e));
-            PointerEnterEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerEnterCore(e));
-            PointerLeaveEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerLeaveCore(e));
-            PointerMovedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerMoved(e));
-            PointerPressedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerPressed(e));
-            PointerReleasedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerReleased(e));
-            PointerCaptureLostEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerCaptureLost(e));
-            PointerWheelChangedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerWheelChanged(e));
-        }
-
-        public InputElement()
-        {
-            UpdatePseudoClasses(IsFocused, IsPointerOver);
-        }
-
-        /// <summary>
-        /// Occurs when the control receives focus.
-        /// </summary>
-        public event EventHandler<GotFocusEventArgs>? GotFocus
-        {
-            add { AddHandler(GotFocusEvent, value); }
-            remove { RemoveHandler(GotFocusEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the control loses focus.
-        /// </summary>
-        public event EventHandler<RoutedEventArgs>? LostFocus
-        {
-            add { AddHandler(LostFocusEvent, value); }
-            remove { RemoveHandler(LostFocusEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when a key is pressed while the control has focus.
-        /// </summary>
-        public event EventHandler<KeyEventArgs>? KeyDown
-        {
-            add { AddHandler(KeyDownEvent, value); }
-            remove { RemoveHandler(KeyDownEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when a key is released while the control has focus.
-        /// </summary>
-        public event EventHandler<KeyEventArgs>? KeyUp
-        {
-            add { AddHandler(KeyUpEvent, value); }
-            remove { RemoveHandler(KeyUpEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when a user typed some text while the control has focus.
-        /// </summary>
-        public event EventHandler<TextInputEventArgs>? TextInput
-        {
-            add { AddHandler(TextInputEvent, value); }
-            remove { RemoveHandler(TextInputEvent, value); }
-        }
-        
-        /// <summary>
-        /// Occurs when an input element gains input focus and input method is looking for the corresponding client
-        /// </summary>
-        public event EventHandler<TextInputMethodClientRequestedEventArgs>? TextInputMethodClientRequested
-        {
-            add { AddHandler(TextInputMethodClientRequestedEvent, value); }
-            remove { RemoveHandler(TextInputMethodClientRequestedEvent, value); }
-        }
-        
-        /// <summary>
-        /// Occurs when an input element gains input focus and input method is asking for required content options
-        /// </summary>
-        public event EventHandler<TextInputOptionsQueryEventArgs>? TextInputOptionsQuery
-        {
-            add { AddHandler(TextInputOptionsQueryEvent, value); }
-            remove { RemoveHandler(TextInputOptionsQueryEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the pointer enters the control.
-        /// </summary>
-        public event EventHandler<PointerEventArgs>? PointerEnter
-        {
-            add { AddHandler(PointerEnterEvent, value); }
-            remove { RemoveHandler(PointerEnterEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the pointer leaves the control.
-        /// </summary>
-        public event EventHandler<PointerEventArgs>? PointerLeave
-        {
-            add { AddHandler(PointerLeaveEvent, value); }
-            remove { RemoveHandler(PointerLeaveEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the pointer moves over the control.
-        /// </summary>
-        public event EventHandler<PointerEventArgs>? PointerMoved
-        {
-            add { AddHandler(PointerMovedEvent, value); }
-            remove { RemoveHandler(PointerMovedEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the pointer is pressed over the control.
-        /// </summary>
-        public event EventHandler<PointerPressedEventArgs>? PointerPressed
-        {
-            add { AddHandler(PointerPressedEvent, value); }
-            remove { RemoveHandler(PointerPressedEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the pointer is released over the control.
-        /// </summary>
-        public event EventHandler<PointerReleasedEventArgs>? PointerReleased
-        {
-            add { AddHandler(PointerReleasedEvent, value); }
-            remove { RemoveHandler(PointerReleasedEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when the control or its child control loses the pointer capture for any reason,
-        /// event will not be triggered for a parent control if capture was transferred to another child of that parent control
-        /// </summary>
-        public event EventHandler<PointerCaptureLostEventArgs>? PointerCaptureLost
-        {
-            add => AddHandler(PointerCaptureLostEvent, value);
-            remove => RemoveHandler(PointerCaptureLostEvent, value);
-        }
-        
-        /// <summary>
-        /// Occurs when the mouse is scrolled over the control.
-        /// </summary>
-        public event EventHandler<PointerWheelEventArgs>? PointerWheelChanged
-        {
-            add { AddHandler(PointerWheelChangedEvent, value); }
-            remove { RemoveHandler(PointerWheelChangedEvent, value); }
-        }
-        
-        /// <summary>
-        /// Occurs when a tap gesture occurs on the control.
-        /// </summary>
-        public event EventHandler<TappedEventArgs>? Tapped
-        {
-            add { AddHandler(TappedEvent, value); }
-            remove { RemoveHandler(TappedEvent, value); }
-        }
-
-        /// <summary>
-        /// Occurs when a double-tap gesture occurs on the control.
-        /// </summary>
-        public event EventHandler<TappedEventArgs>? DoubleTapped
-        {
-            add { AddHandler(DoubleTappedEvent, value); }
-            remove { RemoveHandler(DoubleTappedEvent, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the control can receive focus.
-        /// </summary>
-        public bool Focusable
-        {
-            get { return GetValue(FocusableProperty); }
-            set { SetValue(FocusableProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the control is enabled for user interaction.
-        /// </summary>
-        public bool IsEnabled
-        {
-            get { return GetValue(IsEnabledProperty); }
-            set { SetValue(IsEnabledProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets associated mouse cursor.
-        /// </summary>
-        public Cursor? Cursor
-        {
-            get { return GetValue(CursorProperty); }
-            set { SetValue(CursorProperty, value); }
-        }
-        
-        /// <summary>
-        /// Gets a value indicating whether keyboard focus is anywhere within the element or its visual tree child elements.
-        /// </summary>
-        public bool IsKeyboardFocusWithin
-        {
-            get => _isKeyboardFocusWithin;
-            internal set => SetAndRaise(IsKeyboardFocusWithinProperty, ref _isKeyboardFocusWithin, value); 
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the control is focused.
-        /// </summary>
-        public bool IsFocused
-        {
-            get { return _isFocused; }
-            private set { SetAndRaise(IsFocusedProperty, ref _isFocused, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the control is considered for hit testing.
-        /// </summary>
-        public bool IsHitTestVisible
-        {
-            get { return GetValue(IsHitTestVisibleProperty); }
-            set { SetValue(IsHitTestVisibleProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the pointer is currently over the control.
-        /// </summary>
-        public bool IsPointerOver
-        {
-            get { return _isPointerOver; }
-            internal set { SetAndRaise(IsPointerOverProperty, ref _isPointerOver, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value that indicates whether the control is included in tab navigation.
-        /// </summary>
-        public bool IsTabStop
-        {
-            get => GetValue(IsTabStopProperty);
-            set => SetValue(IsTabStopProperty, value);
-        }
-
-        /// <inheritdoc/>
-        public bool IsEffectivelyEnabled
-        {
-            get => _isEffectivelyEnabled;
-            private set
-            {
-                SetAndRaise(IsEffectivelyEnabledProperty, ref _isEffectivelyEnabled, value);
-                PseudoClasses.Set(":disabled", !value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value that determines the order in which elements receive focus when the
-        /// user navigates through controls by pressing the Tab key.
-        /// </summary>
-        public int TabIndex
-        {
-            get => GetValue(TabIndexProperty);
-            set => SetValue(TabIndexProperty, value);
-        }
-
-        public List<KeyBinding> KeyBindings { get; } = new List<KeyBinding>();
-
-        /// <summary>
-        /// Allows a derived class to override the enabled state of the control.
-        /// </summary>
-        /// <remarks>
-        /// Derived controls may wish to disable the enabled state of the control without overwriting the
-        /// user-supplied <see cref="IsEnabled"/> setting. This can be done by overriding this property
-        /// to return the overridden enabled state. If the value returned from <see cref="IsEnabledCore"/>
-        /// should change, then the derived control should call <see cref="UpdateIsEffectivelyEnabled()"/>.
-        /// </remarks>
-        protected virtual bool IsEnabledCore => IsEnabled;
-
-        public GestureRecognizerCollection GestureRecognizers
-            => _gestureRecognizers ?? (_gestureRecognizers = new GestureRecognizerCollection(this));
-
-        /// <summary>
-        /// Focuses the control.
-        /// </summary>
-        public void Focus()
-        {
-            FocusManager.Instance?.Focus(this);
-        }
-
-        /// <inheritdoc/>
-        protected override void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
-        {
-            base.OnDetachedFromVisualTreeCore(e);
-
-            if (IsFocused)
-            {
-                FocusManager.Instance?.Focus(null);
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
-        {
-            base.OnAttachedToVisualTreeCore(e);
-            UpdateIsEffectivelyEnabled();
-        }
-
-        /// <summary>
-        /// Called before the <see cref="GotFocus"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnGotFocus(GotFocusEventArgs e)
-        {
-            var isFocused = e.Source == this;
-            _isFocusVisible = isFocused && (e.NavigationMethod == NavigationMethod.Directional || e.NavigationMethod == NavigationMethod.Tab);
-            IsFocused = isFocused;
-        }
-
-        /// <summary>
-        /// Called before the <see cref="LostFocus"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnLostFocus(RoutedEventArgs e)
-        {
-            _isFocusVisible = false;
-            IsFocused = false;
-        }
-
-        /// <summary>
-        /// Called before the <see cref="KeyDown"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnKeyDown(KeyEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called before the <see cref="KeyUp"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnKeyUp(KeyEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called before the <see cref="TextInput"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnTextInput(TextInputEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerEnter"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerEnter(PointerEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerLeave"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerLeave(PointerEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerMoved"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerMoved(PointerEventArgs e)
-        {
-            if (_gestureRecognizers?.HandlePointerMoved(e) == true)
-                e.Handled = true;
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerPressed"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerPressed(PointerPressedEventArgs e)
-        {
-            if (_gestureRecognizers?.HandlePointerPressed(e) == true)
-                e.Handled = true;
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerReleased"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerReleased(PointerReleasedEventArgs e)
-        {
-            if (_gestureRecognizers?.HandlePointerReleased(e) == true)
-                e.Handled = true;
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerCaptureLost"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
-        {
-            _gestureRecognizers?.HandlePointerCaptureLost(e);
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerWheelChanged"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnPointerWheelChanged(PointerWheelEventArgs e)
-        {
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == IsFocusedProperty)
-            {
-                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<bool>(), null);
-            }
-            else if (change.Property == IsPointerOverProperty)
-            {
-                UpdatePseudoClasses(null, change.NewValue.GetValueOrDefault<bool>());
-            }
-            else if (change.Property == IsKeyboardFocusWithinProperty)
-            {
-                PseudoClasses.Set(":focus-within", change.NewValue.GetValueOrDefault<bool>());
-            }
-        }
-
-        /// <summary>
-        /// Updates the <see cref="IsEffectivelyEnabled"/> property value according to the parent
-        /// control's enabled state and <see cref="IsEnabledCore"/>.
-        /// </summary>
-        protected void UpdateIsEffectivelyEnabled()
-        {
-            UpdateIsEffectivelyEnabled(this.GetVisualParent<InputElement>());
-        }
-
-        private static void IsEnabledChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            ((InputElement)e.Sender).UpdateIsEffectivelyEnabled();
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerEnter"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private void OnPointerEnterCore(PointerEventArgs e)
-        {
-            IsPointerOver = true;
-            OnPointerEnter(e);
-        }
-
-        /// <summary>
-        /// Called before the <see cref="PointerLeave"/> event occurs.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private void OnPointerLeaveCore(PointerEventArgs e)
-        {
-            IsPointerOver = false;
-            OnPointerLeave(e);
-        }
-
-        /// <summary>
-        /// Updates the <see cref="IsEffectivelyEnabled"/> property based on the parent's
-        /// <see cref="IsEffectivelyEnabled"/>.
-        /// </summary>
-        /// <param name="parent">The parent control.</param>
-        private void UpdateIsEffectivelyEnabled(InputElement? parent)
-        {
-            IsEffectivelyEnabled = IsEnabledCore && (parent?.IsEffectivelyEnabled ?? true);
-
-            // PERF-SENSITIVE: This is called on entire hierarchy and using foreach or LINQ
-            // will cause extra allocations and overhead.
-            
-            var children = VisualChildren;
-
-            // ReSharper disable once ForCanBeConvertedToForeach
-            for (int i = 0; i < children.Count; ++i)
-            {
-                var child = children[i] as InputElement;
-
-                child?.UpdateIsEffectivelyEnabled(this);
-            }
-        }
-
-        private void UpdatePseudoClasses(bool? isFocused, bool? isPointerOver)
-        {
-            if (isFocused.HasValue)
-            {
-                PseudoClasses.Set(":focus", isFocused.Value);
-                PseudoClasses.Set(":focus-visible", _isFocusVisible);
-            }
-            
-            if (isPointerOver.HasValue)
-            {
-                PseudoClasses.Set(":pointerover", isPointerOver.Value);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Input/KeyGesture.cs b/src/Avalonia.Input/KeyGesture.cs
deleted file mode 100644
index 0adbe73263..0000000000
--- a/src/Avalonia.Input/KeyGesture.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines a keyboard input combination.
-    /// </summary>
-    public sealed class KeyGesture : IEquatable<KeyGesture>
-    {
-        private static readonly Dictionary<string, Key> s_keySynonyms = new Dictionary<string, Key>
-        {
-            { "+", Key.OemPlus }, { "-", Key.OemMinus }, { ".", Key.OemPeriod }, { ",", Key.OemComma }
-        };
-
-        [Obsolete("Use constructor taking KeyModifiers")]
-        public KeyGesture(Key key, InputModifiers modifiers)
-        {
-            Key = key;
-            KeyModifiers = (KeyModifiers)(((int)modifiers) & 0xf);
-        }
-
-        public KeyGesture(Key key, KeyModifiers modifiers = KeyModifiers.None)
-        {
-            Key = key;
-            KeyModifiers = modifiers;
-        }
-
-        public bool Equals(KeyGesture? other)
-        {
-            if (ReferenceEquals(null, other)) return false;
-            if (ReferenceEquals(this, other)) return true;
-
-            return Key == other.Key && KeyModifiers == other.KeyModifiers;
-        }
-
-        public override bool Equals(object? obj)
-        {
-            if (ReferenceEquals(null, obj)) return false;
-            if (ReferenceEquals(this, obj)) return true;
-
-            return obj is KeyGesture gesture && Equals(gesture);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return ((int)Key * 397) ^ (int)KeyModifiers;
-            }
-        }
-
-        public static bool operator ==(KeyGesture? left, KeyGesture? right)
-        {
-            return Equals(left, right);
-        }
-
-        public static bool operator !=(KeyGesture? left, KeyGesture? right)
-        {
-            return !Equals(left, right);
-        }
-
-        public Key Key { get; }
-
-        [Obsolete("Use KeyModifiers")]
-        public InputModifiers Modifiers => (InputModifiers)KeyModifiers;
-
-        public KeyModifiers KeyModifiers { get; }
-
-        public static KeyGesture Parse(string gesture)
-        {
-            // string.Split can't be used here because "Ctrl++" is a perfectly valid key gesture
-
-            var key = Key.None;
-            var keyModifiers = KeyModifiers.None;
-
-            var cstart = 0;
-
-            for (var c = 0; c <= gesture.Length; c++)
-            {
-                var ch = c == gesture.Length ? '\0' : gesture[c];
-                bool isLast = c == gesture.Length;
-
-                if (isLast || (ch == '+' && cstart != c))
-                {
-                    var partSpan = gesture.AsSpan(cstart, c - cstart).Trim();
-
-                    if (isLast)
-                    {
-                        key = ParseKey(partSpan.ToString());
-                    }
-                    else
-                    {
-                        keyModifiers |= ParseModifier(partSpan);
-                    }
-
-                    cstart = c + 1;
-                }
-            }
-
-
-            return new KeyGesture(key, keyModifiers);
-        }
-
-        public override string ToString()
-        {
-            var s = new StringBuilder();
-
-            static void Plus(StringBuilder s)
-            {
-                if (s.Length > 0)
-                {
-                    s.Append("+");
-                }
-            }
-
-            if (KeyModifiers.HasAllFlags(KeyModifiers.Control))
-            {
-                s.Append("Ctrl");
-            }
-
-            if (KeyModifiers.HasAllFlags(KeyModifiers.Shift))
-            {
-                Plus(s);
-                s.Append("Shift");
-            }
-
-            if (KeyModifiers.HasAllFlags(KeyModifiers.Alt))
-            {
-                Plus(s);
-                s.Append("Alt");
-            }
-
-            if (KeyModifiers.HasAllFlags(KeyModifiers.Meta))
-            {
-                Plus(s);
-                s.Append("Cmd");
-            }
-
-            Plus(s);
-            s.Append(Key);
-
-            return s.ToString();
-        }
-
-        public bool Matches(KeyEventArgs keyEvent) =>
-            keyEvent != null &&
-            keyEvent.KeyModifiers == KeyModifiers &&
-            ResolveNumPadOperationKey(keyEvent.Key) == ResolveNumPadOperationKey(Key);
-
-        // TODO: Move that to external key parser
-        private static Key ParseKey(string key)
-        {
-            if (s_keySynonyms.TryGetValue(key.ToLower(), out Key rv))
-                return rv;
-
-            return (Key)Enum.Parse(typeof(Key), key, true);
-        }
-
-        private static KeyModifiers ParseModifier(ReadOnlySpan<char> modifier)
-        {
-            if (modifier.Equals("ctrl".AsSpan(), StringComparison.OrdinalIgnoreCase))
-            {
-                return KeyModifiers.Control;
-            }
-
-            if (modifier.Equals("cmd".AsSpan(), StringComparison.OrdinalIgnoreCase) ||
-                modifier.Equals("win".AsSpan(), StringComparison.OrdinalIgnoreCase) ||
-                modifier.Equals("⌘".AsSpan(), StringComparison.OrdinalIgnoreCase))
-            {
-                return KeyModifiers.Meta;
-            }
-
-            return (KeyModifiers)Enum.Parse(typeof(KeyModifiers), modifier.ToString(), true);
-        }
-
-        private Key ResolveNumPadOperationKey(Key key)
-        {
-            switch (key)
-            {
-                case Key.Add:
-                    return Key.OemPlus;
-                case Key.Subtract:
-                    return Key.OemMinus;
-                case Key.Decimal:
-                    return Key.OemPeriod;
-                default:
-                    return key;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Input/KeyboardDevice.cs b/src/Avalonia.Input/KeyboardDevice.cs
deleted file mode 100644
index 3df717b8c4..0000000000
--- a/src/Avalonia.Input/KeyboardDevice.cs
+++ /dev/null
@@ -1,249 +0,0 @@
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using Avalonia.Input.Raw;
-using Avalonia.Input.TextInput;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    public class KeyboardDevice : IKeyboardDevice, INotifyPropertyChanged
-    {
-        private IInputElement? _focusedElement;
-        private IInputRoot? _focusedRoot;
-
-        public event PropertyChangedEventHandler? PropertyChanged;
-
-        public static IKeyboardDevice? Instance => AvaloniaLocator.Current.GetService<IKeyboardDevice>();
-
-        public IInputManager? InputManager => AvaloniaLocator.Current.GetService<IInputManager>();
-
-        public IFocusManager? FocusManager => AvaloniaLocator.Current.GetService<IFocusManager>();
-        
-        // This should live in the FocusManager, but with the current outdated architecture
-        // the source of truth about the input focus is in KeyboardDevice
-        private readonly TextInputMethodManager _textInputManager = new TextInputMethodManager();
-
-        public IInputElement? FocusedElement => _focusedElement;
-
-        private void ClearFocusWithinAncestors(IInputElement? element)
-        {
-            var el = element;
-            
-            while (el != null)
-            {
-                if (el is InputElement ie)
-                {
-                    ie.IsKeyboardFocusWithin = false;
-                }
-
-                el = (IInputElement?)el.VisualParent;
-            }
-        }
-        
-        private void ClearFocusWithin(IInputElement element, bool clearRoot)
-        {
-            foreach (var visual in element.VisualChildren)
-            {
-                if (visual is IInputElement el && el.IsKeyboardFocusWithin)
-                {
-                    ClearFocusWithin(el, true);
-                    break;
-                }
-            }
-            
-            if (clearRoot)
-            {
-                if (element is InputElement ie)
-                {
-                    ie.IsKeyboardFocusWithin = false;
-                }
-            }
-        }
-
-        private void SetIsFocusWithin(IInputElement? oldElement, IInputElement? newElement)
-        {
-            if (newElement == null && oldElement != null)
-            {
-                ClearFocusWithinAncestors(oldElement);
-                return;
-            }
-            
-            IInputElement? branch = null;
-
-            var el = newElement;
-
-            while (el != null)
-            {
-                if (el.IsKeyboardFocusWithin)
-                {
-                    branch = el;
-                    break;
-                }
-
-                el = el.VisualParent as IInputElement;
-            }
-
-            el = oldElement;
-
-            if (el != null && branch != null)
-            {
-                ClearFocusWithin(branch, false);
-            }
-
-            el = newElement;
-            
-            while (el != null && el != branch)
-            {
-                if (el is InputElement ie)
-                {
-                    ie.IsKeyboardFocusWithin = true;
-                }
-
-                el = el.VisualParent as IInputElement;
-            }
-        }
-        
-        private void ClearChildrenFocusWithin(IInputElement element, bool clearRoot)
-        {
-            foreach (var visual in element.VisualChildren)
-            {
-                if (visual is IInputElement el && el.IsKeyboardFocusWithin)
-                {
-                    ClearChildrenFocusWithin(el, true);
-                    break;
-                }
-            }
-            
-            if (clearRoot && element is InputElement ie)
-            {
-                ie.IsKeyboardFocusWithin = false;
-            }
-        }
-
-        public void SetFocusedElement(
-            IInputElement? element, 
-            NavigationMethod method,
-            KeyModifiers keyModifiers)
-        {
-            if (element != FocusedElement)
-            {
-                var interactive = FocusedElement as IInteractive;
-
-                if (FocusedElement != null && 
-                    (!FocusedElement.IsAttachedToVisualTree ||
-                     _focusedRoot != element?.VisualRoot as IInputRoot) &&
-                    _focusedRoot != null)
-                {
-                    ClearChildrenFocusWithin(_focusedRoot, true);
-                }
-                
-                SetIsFocusWithin(FocusedElement, element);
-                _focusedElement = element;
-                _focusedRoot = _focusedElement?.VisualRoot as IInputRoot;
-
-                interactive?.RaiseEvent(new RoutedEventArgs
-                {
-                    RoutedEvent = InputElement.LostFocusEvent,
-                });
-
-                interactive = element as IInteractive;
-
-                interactive?.RaiseEvent(new GotFocusEventArgs
-                {
-                    RoutedEvent = InputElement.GotFocusEvent,
-                    NavigationMethod = method,
-                    KeyModifiers = keyModifiers,
-                });
-
-                _textInputManager.SetFocusedElement(element);
-                RaisePropertyChanged(nameof(FocusedElement));
-            }
-        }
-
-        protected void RaisePropertyChanged([CallerMemberName] string propertyName = "")
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        public void ProcessRawEvent(RawInputEventArgs e)
-        {
-            if(e.Handled)
-                return;
-
-            var element = FocusedElement ?? e.Root;
-
-            if (e is RawKeyEventArgs keyInput)
-            {
-                switch (keyInput.Type)
-                {
-                    case RawKeyEventType.KeyDown:
-                    case RawKeyEventType.KeyUp:
-                        var routedEvent = keyInput.Type == RawKeyEventType.KeyDown
-                            ? InputElement.KeyDownEvent
-                            : InputElement.KeyUpEvent;
-
-                        KeyEventArgs ev = new KeyEventArgs
-                        {
-                            RoutedEvent = routedEvent,
-                            Device = this,
-                            Key = keyInput.Key,
-                            KeyModifiers = KeyModifiersUtils.ConvertToKey(keyInput.Modifiers),
-                            Source = element,
-                        };
-
-                        IVisual? currentHandler = element;
-                        while (currentHandler != null && !ev.Handled && keyInput.Type == RawKeyEventType.KeyDown)
-                        {
-                            var bindings = (currentHandler as IInputElement)?.KeyBindings;
-                            if (bindings != null)
-                            {
-                                KeyBinding[]? bindingsCopy = null;
-
-                                // Create a copy of the KeyBindings list if there's a binding which matches the event.
-                                // If we don't do this the foreach loop will throw an InvalidOperationException when the KeyBindings list is changed.
-                                // This can happen when a new view is loaded which adds its own KeyBindings to the handler.
-                                foreach (var binding in bindings)
-                                {
-                                    if (binding.Gesture?.Matches(ev) == true)
-                                    {
-                                        bindingsCopy = bindings.ToArray();
-                                        break;
-                                    }
-                                }
-
-                                if (bindingsCopy is object)
-                                {
-                                    foreach (var binding in bindingsCopy)
-                                    {
-                                        if (ev.Handled)
-                                            break;
-                                        binding.TryHandle(ev);
-                                    }
-                                }
-                            }
-                            currentHandler = currentHandler.VisualParent;
-                        }
-
-                        element.RaiseEvent(ev);
-                        e.Handled = ev.Handled;
-                        break;
-                }
-            }
-
-            if (e is RawTextInputEventArgs text)
-            {
-                var ev = new TextInputEventArgs()
-                {
-                    Device = this,
-                    Text = text.Text,
-                    Source = element,
-                    RoutedEvent = InputElement.TextInputEvent
-                };
-
-                element.RaiseEvent(ev);
-                e.Handled = ev.Handled;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Input/KeyboardNavigation.cs b/src/Avalonia.Input/KeyboardNavigation.cs
deleted file mode 100644
index a25aed6811..0000000000
--- a/src/Avalonia.Input/KeyboardNavigation.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Defines attached properties that control keyboard navigation behaviour for a container.
-    /// </summary>
-    public static class KeyboardNavigation
-    {
-        /// <summary>
-        /// Defines the TabIndex attached property.
-        /// </summary>
-        public static readonly AttachedProperty<int> TabIndexProperty =
-            AvaloniaProperty.RegisterAttached<StyledElement, int>(
-                "TabIndex",
-                typeof(KeyboardNavigation),
-                int.MaxValue);
-
-        /// <summary>
-        /// Defines the TabNavigation attached property.
-        /// </summary>
-        /// <remarks>
-        /// The TabNavigation attached property defines how pressing the Tab key causes focus to
-        /// be navigated between the children of the container.
-        /// </remarks>
-        public static readonly AttachedProperty<KeyboardNavigationMode> TabNavigationProperty =
-            AvaloniaProperty.RegisterAttached<InputElement, KeyboardNavigationMode>(
-                "TabNavigation",
-                typeof(KeyboardNavigation));
-
-        /// <summary>
-        /// Defines the TabOnceActiveElement attached property.
-        /// </summary>
-        /// <remarks>
-        /// When focus enters a container which has its <see cref="TabNavigationProperty"/>
-        /// attached property set to <see cref="KeyboardNavigationMode.Once"/>, this property
-        /// defines to which child the focus should move.
-        /// </remarks>
-        public static readonly AttachedProperty<IInputElement?> TabOnceActiveElementProperty =
-            AvaloniaProperty.RegisterAttached<InputElement, IInputElement?>(
-                "TabOnceActiveElement",
-                typeof(KeyboardNavigation));
-
-        /// <summary>
-        /// Defines the IsTabStop attached property.
-        /// </summary>
-        /// <remarks>
-        /// The IsTabStop attached property determines whether the control is focusable by tab navigation. 
-        /// </remarks>
-        public static readonly AttachedProperty<bool> IsTabStopProperty =
-            AvaloniaProperty.RegisterAttached<InputElement, bool>(
-                "IsTabStop",
-                typeof(KeyboardNavigation), 
-                true);
-
-        /// <summary>
-        /// Gets the <see cref="TabIndexProperty"/> for an element.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <returns>The <see cref="KeyboardNavigationMode"/> for the container.</returns>
-        public static int GetTabIndex(IInputElement element)
-        {
-            return ((IAvaloniaObject)element).GetValue(TabIndexProperty);
-        }
-
-        /// <summary>
-        /// Sets the <see cref="TabIndexProperty"/> for an element.
-        /// </summary>
-        /// <param name="element">The element.</param>
-        /// <param name="value">The tab index.</param>
-        public static void SetTabIndex(IInputElement element, int value)
-        {
-            ((IAvaloniaObject)element).SetValue(TabIndexProperty, value);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="TabNavigationProperty"/> for a container.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <returns>The <see cref="KeyboardNavigationMode"/> for the container.</returns>
-        public static KeyboardNavigationMode GetTabNavigation(InputElement element)
-        {
-            return element.GetValue(TabNavigationProperty);
-        }
-
-        /// <summary>
-        /// Sets the <see cref="TabNavigationProperty"/> for a container.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <param name="value">The <see cref="KeyboardNavigationMode"/> for the container.</param>
-        public static void SetTabNavigation(InputElement element, KeyboardNavigationMode value)
-        {
-            element.SetValue(TabNavigationProperty, value);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="TabOnceActiveElementProperty"/> for a container.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <returns>The active element for the container.</returns>
-        public static IInputElement? GetTabOnceActiveElement(InputElement element)
-        {
-            return element.GetValue(TabOnceActiveElementProperty);
-        }
-
-        /// <summary>
-        /// Sets the <see cref="TabOnceActiveElementProperty"/> for a container.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <param name="value">The active element for the container.</param>
-        public static void SetTabOnceActiveElement(InputElement element, IInputElement? value)
-        {
-            element.SetValue(TabOnceActiveElementProperty, value);
-        }
-
-        /// <summary>
-        /// Sets the <see cref="IsTabStopProperty"/> for an element.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <param name="value">Value indicating whether the container is a tab stop.</param>
-        public static void SetIsTabStop(InputElement element, bool value)
-        {
-            element.SetValue(IsTabStopProperty, value);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="IsTabStopProperty"/> for an element.
-        /// </summary>
-        /// <param name="element">The container.</param>
-        /// <returns>Whether the container is a tab stop.</returns>
-        public static bool GetIsTabStop(InputElement element)
-        {
-            return element.GetValue(IsTabStopProperty);
-        }
-    }
-}
diff --git a/src/Avalonia.Input/MouseDevice.cs b/src/Avalonia.Input/MouseDevice.cs
deleted file mode 100644
index eed51e6c4a..0000000000
--- a/src/Avalonia.Input/MouseDevice.cs
+++ /dev/null
@@ -1,569 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Linq;
-using Avalonia.Input.Raw;
-using Avalonia.Interactivity;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Represents a mouse device.
-    /// </summary>
-    public class MouseDevice : IMouseDevice, IDisposable
-    {
-        private int _clickCount;
-        private Rect _lastClickRect;
-        private ulong _lastClickTime;
-
-        private readonly Pointer _pointer;
-        private bool _disposed;
-        private PixelPoint? _position; 
-
-        public MouseDevice(Pointer? pointer = null)
-        {
-            _pointer = pointer ?? new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
-        }
-        
-        /// <summary>
-        /// Gets the control that is currently capturing by the mouse, if any.
-        /// </summary>
-        /// <remarks>
-        /// When an element captures the mouse, it receives mouse input whether the cursor is 
-        /// within the control's bounds or not. To set the mouse capture, call the 
-        /// <see cref="Capture"/> method.
-        /// </remarks>
-        [Obsolete("Use IPointer instead")]
-        public IInputElement? Captured => _pointer.Captured;
-
-        /// <summary>
-        /// Gets the mouse position, in screen coordinates.
-        /// </summary>
-        [Obsolete("Use events instead")]
-        public PixelPoint Position
-        {
-            get => _position ?? new PixelPoint(-1, -1);
-            protected set => _position = value;
-        }
-
-        /// <summary>
-        /// Captures mouse input to the specified control.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <remarks>
-        /// When an element captures the mouse, it receives mouse input whether the cursor is 
-        /// within the control's bounds or not. The current mouse capture control is exposed
-        /// by the <see cref="Captured"/> property.
-        /// </remarks>
-        public void Capture(IInputElement? control)
-        {
-            _pointer.Capture(control);
-        }
-
-        /// <summary>
-        /// Gets the mouse position relative to a control.
-        /// </summary>
-        /// <param name="relativeTo">The control.</param>
-        /// <returns>The mouse position in the control's coordinates.</returns>
-        public Point GetPosition(IVisual relativeTo)
-        {
-            relativeTo = relativeTo ?? throw new ArgumentNullException(nameof(relativeTo));
-
-            if (relativeTo.VisualRoot == null)
-            {
-                throw new InvalidOperationException("Control is not attached to visual tree.");
-            }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-            var rootPoint = relativeTo.VisualRoot.PointToClient(Position);
-#pragma warning restore CS0618 // Type or member is obsolete
-            var transform = relativeTo.VisualRoot.TransformToVisual(relativeTo);
-            return rootPoint * transform!.Value;
-        }
-
-        public void ProcessRawEvent(RawInputEventArgs e)
-        {
-            if (!e.Handled && e is RawPointerEventArgs margs)
-                ProcessRawEvent(margs);
-        }
-
-        public void TopLevelClosed(IInputRoot root)
-        {
-            ClearPointerOver(this, 0, root, PointerPointProperties.None, KeyModifiers.None);
-        }
-
-        public void SceneInvalidated(IInputRoot root, Rect rect)
-        {
-            // Pointer is outside of the target area
-            if (_position == null )
-            {
-                if (root.PointerOverElement != null)
-                    ClearPointerOver(this, 0, root, PointerPointProperties.None, KeyModifiers.None);
-                return;
-            }
-            
-            
-            var clientPoint = root.PointToClient(_position.Value);
-
-            if (rect.Contains(clientPoint))
-            {
-                if (_pointer.Captured == null)
-                {
-                    SetPointerOver(this, 0 /* TODO: proper timestamp */, root, clientPoint,
-                        PointerPointProperties.None, KeyModifiers.None);
-                }
-                else
-                {
-                    SetPointerOver(this, 0 /* TODO: proper timestamp */, root, _pointer.Captured,
-                        PointerPointProperties.None, KeyModifiers.None);
-                }
-            }
-        }
-
-        int ButtonCount(PointerPointProperties props)
-        {
-            var rv = 0;
-            if (props.IsLeftButtonPressed)
-                rv++;
-            if (props.IsMiddleButtonPressed)
-                rv++;
-            if (props.IsRightButtonPressed)
-                rv++;
-            if (props.IsXButton1Pressed)
-                rv++;
-            if (props.IsXButton2Pressed)
-                rv++;
-            return rv;
-        }
-        
-        private void ProcessRawEvent(RawPointerEventArgs e)
-        {
-            e = e ?? throw new ArgumentNullException(nameof(e));
-
-            var mouse = (MouseDevice)e.Device;
-            if(mouse._disposed)
-                return;
-
-            _position = e.Root.PointToScreen(e.Position);
-            var props = CreateProperties(e);
-            var keyModifiers = KeyModifiersUtils.ConvertToKey(e.InputModifiers);
-            switch (e.Type)
-            {
-                case RawPointerEventType.LeaveWindow:
-                    LeaveWindow(mouse, e.Timestamp, e.Root, props, keyModifiers);
-                    break;
-                case RawPointerEventType.LeftButtonDown:
-                case RawPointerEventType.RightButtonDown:
-                case RawPointerEventType.MiddleButtonDown:
-                case RawPointerEventType.XButton1Down:
-                case RawPointerEventType.XButton2Down:
-                    if (ButtonCount(props) > 1)
-                        e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints);
-                    else
-                        e.Handled = MouseDown(mouse, e.Timestamp, e.Root, e.Position,
-                            props, keyModifiers);
-                    break;
-                case RawPointerEventType.LeftButtonUp:
-                case RawPointerEventType.RightButtonUp:
-                case RawPointerEventType.MiddleButtonUp:
-                case RawPointerEventType.XButton1Up:
-                case RawPointerEventType.XButton2Up:
-                    if (ButtonCount(props) != 0)
-                        e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints);
-                    else
-                        e.Handled = MouseUp(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers);
-                    break;
-                case RawPointerEventType.Move:
-                    e.Handled = MouseMove(mouse, e.Timestamp, e.Root, e.Position, props, keyModifiers, e.IntermediatePoints);
-                    break;
-                case RawPointerEventType.Wheel:
-                    e.Handled = MouseWheel(mouse, e.Timestamp, e.Root, e.Position, props, ((RawMouseWheelEventArgs)e).Delta, keyModifiers);
-                    break;
-                case RawPointerEventType.Magnify:
-                    e.Handled = GestureMagnify(mouse, e.Timestamp, e.Root, e.Position, props, ((RawPointerGestureEventArgs)e).Delta, keyModifiers);
-                    break;
-                case RawPointerEventType.Rotate:
-                    e.Handled = GestureRotate(mouse, e.Timestamp, e.Root, e.Position, props, ((RawPointerGestureEventArgs)e).Delta, keyModifiers);
-                    break;
-                case RawPointerEventType.Swipe:
-                    e.Handled = GestureSwipe(mouse, e.Timestamp, e.Root, e.Position, props, ((RawPointerGestureEventArgs)e).Delta, keyModifiers);
-                    break;
-            }
-        }
-
-        private void LeaveWindow(IMouseDevice device, ulong timestamp, IInputRoot root, PointerPointProperties properties,
-            KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            _position = null;
-            ClearPointerOver(this, timestamp, root, properties, inputModifiers);
-        }
-
-
-        PointerPointProperties CreateProperties(RawPointerEventArgs args)
-        {
-
-            var kind = PointerUpdateKind.Other;
-
-            if (args.Type == RawPointerEventType.LeftButtonDown)
-                kind = PointerUpdateKind.LeftButtonPressed;
-            if (args.Type == RawPointerEventType.MiddleButtonDown)
-                kind = PointerUpdateKind.MiddleButtonPressed;
-            if (args.Type == RawPointerEventType.RightButtonDown)
-                kind = PointerUpdateKind.RightButtonPressed;
-            if (args.Type == RawPointerEventType.XButton1Down)
-                kind = PointerUpdateKind.XButton1Pressed;
-            if (args.Type == RawPointerEventType.XButton2Down)
-                kind = PointerUpdateKind.XButton2Pressed;
-            if (args.Type == RawPointerEventType.LeftButtonUp)
-                kind = PointerUpdateKind.LeftButtonReleased;
-            if (args.Type == RawPointerEventType.MiddleButtonUp)
-                kind = PointerUpdateKind.MiddleButtonReleased;
-            if (args.Type == RawPointerEventType.RightButtonUp)
-                kind = PointerUpdateKind.RightButtonReleased;
-            if (args.Type == RawPointerEventType.XButton1Up)
-                kind = PointerUpdateKind.XButton1Released;
-            if (args.Type == RawPointerEventType.XButton2Up)
-                kind = PointerUpdateKind.XButton2Released;
-            
-            return new PointerPointProperties(args.InputModifiers, kind);
-        }
-
-        private MouseButton _lastMouseDownButton;
-        private bool MouseDown(IMouseDevice device, ulong timestamp, IInputElement root, Point p,
-            PointerPointProperties properties,
-            KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var hit = HitTest(root, p);
-
-            if (hit != null)
-            {
-                _pointer.Capture(hit);
-                var source = GetSource(hit);
-                if (source != null)
-                {
-                    var settings = AvaloniaLocator.Current.GetService<IPlatformSettings>();
-                    var doubleClickTime = settings?.DoubleClickTime.TotalMilliseconds ?? 500;
-                    var doubleClickSize = settings?.DoubleClickSize ?? new Size(4, 4);
-
-                    if (!_lastClickRect.Contains(p) || timestamp - _lastClickTime > doubleClickTime)
-                    {
-                        _clickCount = 0;
-                    }
-
-                    ++_clickCount;
-                    _lastClickTime = timestamp;
-                    _lastClickRect = new Rect(p, new Size())
-                        .Inflate(new Thickness(doubleClickSize.Width / 2, doubleClickSize.Height / 2));
-                    _lastMouseDownButton = properties.PointerUpdateKind.GetMouseButton();
-                    var e = new PointerPressedEventArgs(source, _pointer, root, p, timestamp, properties, inputModifiers, _clickCount);
-                    source.RaiseEvent(e);
-                    return e.Handled;
-                }
-            }
-
-            return false;
-        }
-
-        private bool MouseMove(IMouseDevice device, ulong timestamp, IInputRoot root, Point p, PointerPointProperties properties,
-            KeyModifiers inputModifiers, Lazy<IReadOnlyList<RawPointerPoint>?>? intermediatePoints)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            IInputElement? source;
-
-            if (_pointer.Captured == null)
-            {
-                source = SetPointerOver(this, timestamp, root, p,  properties, inputModifiers);
-            }
-            else
-            {
-                SetPointerOver(this, timestamp, root, _pointer.Captured, properties, inputModifiers);
-                source = _pointer.Captured;
-            }
-
-            if (source is object)
-            {
-                var e = new PointerEventArgs(InputElement.PointerMovedEvent, source, _pointer, root,
-                    p, timestamp, properties, inputModifiers, intermediatePoints);
-
-                source.RaiseEvent(e);
-                return e.Handled;
-            }
-
-            return false;
-        }
-
-        private bool MouseUp(IMouseDevice device, ulong timestamp, IInputRoot root, Point p, PointerPointProperties props,
-            KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var hit = HitTest(root, p);
-            var source = GetSource(hit);
-
-            if (source is not null)
-            {
-                var e = new PointerReleasedEventArgs(source, _pointer, root, p, timestamp, props, inputModifiers,
-                    _lastMouseDownButton);
-
-                source?.RaiseEvent(e);
-                _pointer.Capture(null);
-                return e.Handled;
-            }
-
-            return false;
-        }
-
-        private bool MouseWheel(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
-            PointerPointProperties props,
-            Vector delta, KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var hit = HitTest(root, p);
-            var source = GetSource(hit);
-
-            // KeyModifiers.Shift should scroll in horizontal direction. This does not work on every platform. 
-            // If Shift-Key is pressed and X is close to 0 we swap the Vector.
-            if (inputModifiers == KeyModifiers.Shift && MathUtilities.IsZero(delta.X))
-            {
-                delta = new Vector(delta.Y, delta.X);
-            }
-
-            if (source is not null)
-            {
-                var e = new PointerWheelEventArgs(source, _pointer, root, p, timestamp, props, inputModifiers, delta);
-
-                source?.RaiseEvent(e);
-                return e.Handled;
-            }
-
-            return false;
-        }
-        
-        private bool GestureMagnify(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
-            PointerPointProperties props, Vector delta, KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var hit = HitTest(root, p);
-
-            if (hit != null)
-            {
-                var source = GetSource(hit);
-                var e = new PointerDeltaEventArgs(Gestures.PointerTouchPadGestureMagnifyEvent, source,
-                    _pointer, root, p, timestamp, props, inputModifiers, delta);
-
-                source?.RaiseEvent(e);
-                return e.Handled;
-            }
-
-            return false;
-        }
-        
-        private bool GestureRotate(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
-            PointerPointProperties props, Vector delta, KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var hit = HitTest(root, p);
-
-            if (hit != null)
-            {
-                var source = GetSource(hit);
-                var e = new PointerDeltaEventArgs(Gestures.PointerTouchPadGestureRotateEvent, source,
-                    _pointer, root, p, timestamp, props, inputModifiers, delta);
-
-                source?.RaiseEvent(e);
-                return e.Handled;
-            }
-
-            return false;
-        }
-        
-        private bool GestureSwipe(IMouseDevice device, ulong timestamp, IInputRoot root, Point p,
-            PointerPointProperties props, Vector delta, KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var hit = HitTest(root, p);
-
-            if (hit != null)
-            {
-                var source = GetSource(hit);
-                var e = new PointerDeltaEventArgs(Gestures.PointerTouchPadGestureSwipeEvent, source, 
-                    _pointer, root, p, timestamp, props, inputModifiers, delta);
-
-                source?.RaiseEvent(e);
-                return e.Handled;
-            }
-
-            return false;
-        }
-
-        private IInteractive? GetSource(IVisual? hit)
-        {
-            if (hit is null)
-                return null;
-
-            return _pointer.Captured ??
-                (hit as IInteractive) ??
-                hit.GetSelfAndVisualAncestors().OfType<IInteractive>().FirstOrDefault();
-        }
-
-        private IInputElement? HitTest(IInputElement root, Point p)
-        {
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            return _pointer.Captured ?? root.InputHitTest(p);
-        }
-
-        PointerEventArgs CreateSimpleEvent(RoutedEvent ev, ulong timestamp, IInteractive? source,
-            PointerPointProperties properties,
-            KeyModifiers inputModifiers)
-        {
-            return new PointerEventArgs(ev, source, _pointer, null, default,
-                timestamp, properties, inputModifiers);
-        }
-
-        private void ClearPointerOver(IPointerDevice device, ulong timestamp, IInputRoot root,
-            PointerPointProperties properties,
-            KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var element = root.PointerOverElement;
-            var e = CreateSimpleEvent(InputElement.PointerLeaveEvent, timestamp, element, properties, inputModifiers);
-
-            if (element!=null && !element.IsAttachedToVisualTree)
-            {
-                // element has been removed from visual tree so do top down cleanup
-                if (root.IsPointerOver)
-                    ClearChildrenPointerOver(e, root,true);
-            }
-            while (element != null)
-            {
-                e.Source = element;
-                e.Handled = false;
-                element.RaiseEvent(e);
-                element = (IInputElement?)element.VisualParent;
-            }
-            
-            root.PointerOverElement = null;
-        }
-
-        private void ClearChildrenPointerOver(PointerEventArgs e, IInputElement element,bool clearRoot)
-        {
-            foreach (IInputElement el in element.VisualChildren)
-            {
-                if (el.IsPointerOver)
-                {
-                    ClearChildrenPointerOver(e, el, true);
-                    break;
-                }
-            }
-            if(clearRoot)
-            {
-                e.Source = element;
-                e.Handled = false;
-                element.RaiseEvent(e);
-            }
-        }
-
-        private IInputElement? SetPointerOver(IPointerDevice device, ulong timestamp, IInputRoot root, Point p, 
-            PointerPointProperties properties,
-            KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-
-            var element = root.InputHitTest(p);
-
-            if (element != root.PointerOverElement)
-            {
-                if (element != null)
-                {
-                    SetPointerOver(device, timestamp, root, element, properties, inputModifiers);
-                }
-                else
-                {
-                    ClearPointerOver(device, timestamp, root, properties, inputModifiers);
-                }
-            }
-
-            return element;
-        }
-
-        private void SetPointerOver(IPointerDevice device, ulong timestamp, IInputRoot root, IInputElement element,
-            PointerPointProperties properties,
-            KeyModifiers inputModifiers)
-        {
-            device = device ?? throw new ArgumentNullException(nameof(device));
-            root = root ?? throw new ArgumentNullException(nameof(root));
-            element = element ?? throw new ArgumentNullException(nameof(element));
-
-            IInputElement? branch = null;
-
-            IInputElement? el = element;
-
-            while (el != null)
-            {
-                if (el.IsPointerOver)
-                {
-                    branch = el;
-                    break;
-                }
-                el = (IInputElement?)el.VisualParent;
-            }
-
-            el = root.PointerOverElement;
-
-            var e = CreateSimpleEvent(InputElement.PointerLeaveEvent, timestamp, el, properties, inputModifiers);
-            if (el!=null && branch!=null && !el.IsAttachedToVisualTree)
-            {
-                ClearChildrenPointerOver(e,branch,false);
-            }
-            
-            while (el != null && el != branch)
-            {
-                e.Source = el;
-                e.Handled = false;
-                el.RaiseEvent(e);
-                el = (IInputElement?)el.VisualParent;
-            }            
-
-            el = root.PointerOverElement = element;
-            e.RoutedEvent = InputElement.PointerEnterEvent;
-
-            while (el != null && el != branch)
-            {
-                e.Source = el;
-                e.Handled = false;
-                el.RaiseEvent(e);
-                el = (IInputElement?)el.VisualParent;
-            }
-        }
-
-        public void Dispose()
-        {
-            _disposed = true;
-            _pointer?.Dispose();
-        }
-    }
-}
diff --git a/src/Avalonia.Input/Navigation/TabNavigation.cs b/src/Avalonia.Input/Navigation/TabNavigation.cs
deleted file mode 100644
index c8290cb3b7..0000000000
--- a/src/Avalonia.Input/Navigation/TabNavigation.cs
+++ /dev/null
@@ -1,673 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input.Navigation
-{
-    /// <summary>
-    /// The implementation for default tab navigation.
-    /// </summary>
-    internal static class TabNavigation
-    {
-        public static IInputElement? GetNextTab(IInputElement e, bool goDownOnly)
-        {
-            return GetNextTab(e, GetGroupParent(e), goDownOnly);
-        }
-
-        public static IInputElement? GetNextTab(IInputElement? e, IInputElement container, bool goDownOnly)
-        {
-            var tabbingType = GetKeyNavigationMode(container);
-
-            if (e == null)
-            {
-                if (IsTabStop(container))
-                    return container;
-
-                // Using ActiveElement if set
-                var activeElement = GetActiveElement(container);
-                if (activeElement != null)
-                    return GetNextTab(null, activeElement, true);
-            }
-            else
-            {
-                if (tabbingType == KeyboardNavigationMode.Once || tabbingType == KeyboardNavigationMode.None)
-                {
-                    if (container != e)
-                    {
-                        if (goDownOnly)
-                            return null;
-                        var parentContainer = GetGroupParent(container);
-                        return GetNextTab(container, parentContainer, goDownOnly);
-                    }
-                }
-            }
-
-            // All groups
-            IInputElement? loopStartElement = null;
-            var nextTabElement = e;
-            var currentTabbingType = tabbingType;
-
-            // Search down inside the container
-            while ((nextTabElement = GetNextTabInGroup(nextTabElement, container, currentTabbingType)) != null)
-            {
-                // Avoid the endless loop here for Cycle groups
-                if (loopStartElement == nextTabElement)
-                    break;
-                if (loopStartElement == null)
-                    loopStartElement = nextTabElement;
-
-                var firstTabElementInside = GetNextTab(null, nextTabElement, true);
-                if (firstTabElementInside != null)
-                    return firstTabElementInside;
-
-                // If we want to continue searching inside the Once groups, we should change the navigation mode
-                if (currentTabbingType == KeyboardNavigationMode.Once)
-                    currentTabbingType = KeyboardNavigationMode.Contained;
-            }
-
-            // If there is no next element in the group (nextTabElement == null)
-
-            // Search up in the tree if allowed
-            // consider: Use original tabbingType instead of currentTabbingType
-            if (!goDownOnly && currentTabbingType != KeyboardNavigationMode.Contained && GetParent(container) != null)
-            {
-                return GetNextTab(container, GetGroupParent(container), false);
-            }
-
-            return null;
-        }
-
-        public static IInputElement? GetNextTabOutside(ICustomKeyboardNavigation e)
-        {
-            if (e is IInputElement container)
-            {
-                var last = GetLastInTree(container);
-
-                if (last is object)
-                    return GetNextTab(last, false);
-            }
-
-            return null;
-        }
-
-        public static IInputElement? GetPrevTab(IInputElement? e, IInputElement? container, bool goDownOnly)
-        {
-            if (e is null && container is null)
-                throw new InvalidOperationException("Either 'e' or 'container' must be non-null.");
-
-            if (container is null)
-                container = GetGroupParent(e!);
-
-            KeyboardNavigationMode tabbingType = GetKeyNavigationMode(container);
-
-            if (e == null)
-            {
-                // Using ActiveElement if set
-                var activeElement = GetActiveElement(container);
-                if (activeElement != null)
-                    return GetPrevTab(null, activeElement, true);
-                else
-                {
-                    // If we Shift+Tab on a container with KeyboardNavigationMode=Once, and ActiveElement is null
-                    // then we want to go to the first item (not last) within the container
-                    if (tabbingType == KeyboardNavigationMode.Once)
-                    {
-                        var firstTabElement = GetNextTabInGroup(null, container, tabbingType);
-                        if (firstTabElement == null)
-                        {
-                            if (IsTabStop(container))
-                                return container;
-                            if (goDownOnly)
-                                return null;
-
-                            return GetPrevTab(container, null, false);
-                        }
-                        else
-                        {
-                            return GetPrevTab(null, firstTabElement, true);
-                        }
-                    }
-                }
-            }
-            else
-            {
-                if (tabbingType == KeyboardNavigationMode.Once || tabbingType == KeyboardNavigationMode.None)
-                {
-                    if (goDownOnly || container == e)
-                        return null;
-
-                    // FocusedElement should not be e otherwise we will delegate focus to the same element
-                    if (IsTabStop(container))
-                        return container;
-
-                    return GetPrevTab(container, null, false);
-                }
-            }
-
-            // All groups (except Once) - continue
-            IInputElement? loopStartElement = null;
-            IInputElement? nextTabElement = e;
-
-            // Look for element with the same TabIndex before the current element
-            while ((nextTabElement = GetPrevTabInGroup(nextTabElement, container, tabbingType)) != null)
-            {
-                if (nextTabElement == container && tabbingType == KeyboardNavigationMode.Local)
-                    break;
-
-                // At this point nextTabElement is TabStop or TabGroup
-                // In case it is a TabStop only return the element
-                if (IsTabStop(nextTabElement) && !IsGroup(nextTabElement))
-                    return nextTabElement;
-
-                // Avoid the endless loop here
-                if (loopStartElement == nextTabElement)
-                    break;
-                if (loopStartElement == null)
-                    loopStartElement = nextTabElement;
-
-                // At this point nextTabElement is TabGroup
-                var lastTabElementInside = GetPrevTab(null, nextTabElement, true);
-                if (lastTabElementInside != null)
-                    return lastTabElementInside;
-            }
-
-            if (tabbingType == KeyboardNavigationMode.Contained)
-                return null;
-
-            if (e != container && IsTabStop(container))
-                return container;
-
-            // If end of the subtree is reached or there no other elements above
-            if (!goDownOnly && GetParent(container) != null)
-            {
-                return GetPrevTab(container, null, false);
-            }
-
-            return null;
-        }
-
-        public static IInputElement? GetPrevTabOutside(ICustomKeyboardNavigation e)
-        {
-            if (e is IInputElement container)
-            {
-                var first = GetFirstChild(container);
-
-                if (first is object)
-                    return GetPrevTab(first, null, false);
-            }
-
-            return null;
-        }
-
-        private static IInputElement? FocusedElement(IInputElement e)
-        {
-            var iie = e;
-            // Focus delegation is enabled only if keyboard focus is outside the container
-            if (iie != null && !iie.IsKeyboardFocusWithin)
-            {
-                var focusedElement = (FocusManager.Instance as FocusManager)?.GetFocusedElement(e);
-                if (focusedElement != null)
-                {
-                    if (!IsFocusScope(e))
-                    {
-                        // Verify if focusedElement is a visual descendant of e
-                        if (focusedElement is IVisual visualFocusedElement &&
-                            visualFocusedElement != e &&
-                            e.IsVisualAncestorOf(visualFocusedElement))
-                        {
-                            return focusedElement;
-                        }
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private static IInputElement? GetFirstChild(IInputElement e)
-        {
-            // If the element has a FocusedElement it should be its first child
-            if (FocusedElement(e) is IInputElement focusedElement)
-                return focusedElement;
-
-            // Return the first visible element.
-            var uiElement = e as InputElement;
-
-            if (uiElement is null || IsVisibleAndEnabled(uiElement))
-            {
-                if (e is IVisual elementAsVisual)
-                {
-                    var children = elementAsVisual.VisualChildren;
-                    var count = children.Count;
-
-                    for (int i = 0; i < count; i++)
-                    {
-                        if (children[i] is InputElement ie)
-                        {
-                            if (IsVisibleAndEnabled(ie))
-                                return ie;
-                            else
-                            {
-                                var firstChild = GetFirstChild(ie);
-                                if (firstChild != null)
-                                    return firstChild;
-                            }
-                        }
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private static IInputElement? GetLastChild(IInputElement e)
-        {
-            // If the element has a FocusedElement it should be its last child
-            if (FocusedElement(e) is IInputElement focusedElement)
-                return focusedElement;
-
-            // Return the last visible element.
-            var uiElement = e as InputElement;
-
-            if (uiElement == null || IsVisibleAndEnabled(uiElement))
-            {
-                var elementAsVisual = e as IVisual;
-
-                if (elementAsVisual != null)
-                {
-                    var children = elementAsVisual.VisualChildren;
-                    var count = children.Count;
-
-                    for (int i = count - 1; i >= 0; i--)
-                    {
-                        if (children[i] is InputElement ie)
-                        {
-                            if (IsVisibleAndEnabled(ie))
-                                return ie;
-                            else
-                            {
-                                var lastChild = GetLastChild(ie);
-                                if (lastChild != null)
-                                    return lastChild;
-                            }
-                        }
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private static IInputElement? GetFirstTabInGroup(IInputElement container)
-        {
-            IInputElement? firstTabElement = null;
-            int minIndexFirstTab = int.MinValue;
-
-            var currElement = container;
-            while ((currElement = GetNextInTree(currElement, container)) != null)
-            {
-                if (IsTabStopOrGroup(currElement))
-                {
-                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
-
-                    if (currPriority < minIndexFirstTab || firstTabElement == null)
-                    {
-                        minIndexFirstTab = currPriority;
-                        firstTabElement = currElement;
-                    }
-                }
-            }
-            return firstTabElement;
-        }
-
-        private static IInputElement? GetLastInTree(IInputElement container)
-        {
-            IInputElement? result;
-            IInputElement? c = container;
-
-            do
-            {
-                result = c;
-                c = GetLastChild(c);
-            } while (c != null && !IsGroup(c));
-
-            if (c != null)
-                return c;
-
-            return result;
-        }
-
-        private static IInputElement? GetLastTabInGroup(IInputElement container)
-        {
-            IInputElement? lastTabElement = null;
-            int maxIndexFirstTab = int.MaxValue;
-            var currElement = GetLastInTree(container);
-            while (currElement != null && currElement != container)
-            {
-                if (IsTabStopOrGroup(currElement))
-                {
-                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
-
-                    if (currPriority > maxIndexFirstTab || lastTabElement == null)
-                    {
-                        maxIndexFirstTab = currPriority;
-                        lastTabElement = currElement;
-                    }
-                }
-                currElement = GetPreviousInTree(currElement, container);
-            }
-            return lastTabElement;
-        }
-
-        private static IInputElement? GetNextInTree(IInputElement e, IInputElement container)
-        {
-            IInputElement? result = null;
-
-            if (e == container || !IsGroup(e))
-                result = GetFirstChild(e);
-
-            if (result != null || e == container)
-                return result;
-
-            IInputElement? parent = e;
-            do
-            {
-                var sibling = GetNextSibling(parent);
-                if (sibling != null)
-                    return sibling;
-
-                parent = GetParent(parent);
-            } while (parent != null && parent != container);
-
-            return null;
-        }
-
-        private static IInputElement? GetNextSibling(IInputElement e)
-        {
-            if (GetParent(e) is IVisual parentAsVisual && e is IVisual elementAsVisual)
-            {
-                var children = parentAsVisual.VisualChildren;
-                var count = children.Count;
-                var i = 0;
-
-                //go till itself
-                for (; i < count; i++)
-                {
-                    var vchild = children[i];
-                    if (vchild == elementAsVisual)
-                        break;
-                }
-                i++;
-                //search ahead
-                for (; i < count; i++)
-                {
-                    var visual = children[i];
-                    if (visual is IInputElement ie)
-                        return ie;
-                }
-            }
-
-            return null;
-        }
-
-        private static IInputElement? GetNextTabInGroup(IInputElement? e, IInputElement container, KeyboardNavigationMode tabbingType)
-        {
-            // None groups: Tab navigation is not supported
-            if (tabbingType == KeyboardNavigationMode.None)
-                return null;
-
-            // e == null or e == container -> return the first TabStopOrGroup
-            if (e == null || e == container)
-            {
-                return GetFirstTabInGroup(container);
-            }
-
-            if (tabbingType == KeyboardNavigationMode.Once)
-                return null;
-
-            var nextTabElement = GetNextTabWithSameIndex(e, container);
-            if (nextTabElement != null)
-                return nextTabElement;
-
-            return GetNextTabWithNextIndex(e, container, tabbingType);
-        }
-
-        private static IInputElement? GetNextTabWithSameIndex(IInputElement e, IInputElement container)
-        {
-            var elementTabPriority = KeyboardNavigation.GetTabIndex(e);
-            var currElement = e;
-            while ((currElement = GetNextInTree(currElement, container)) != null)
-            {
-                if (IsTabStopOrGroup(currElement) && KeyboardNavigation.GetTabIndex(currElement) == elementTabPriority)
-                {
-                    return currElement;
-                }
-            }
-
-            return null;
-        }
-
-        private static IInputElement? GetNextTabWithNextIndex(IInputElement e, IInputElement container, KeyboardNavigationMode tabbingType)
-        {
-            // Find the next min index in the tree
-            // min (index>currentTabIndex)
-            IInputElement? nextTabElement = null;
-            IInputElement? firstTabElement = null;
-            int minIndexFirstTab = int.MinValue;
-            int minIndex = int.MinValue;
-            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
-
-            IInputElement? currElement = container;
-            while ((currElement = GetNextInTree(currElement, container)) != null)
-            {
-                if (IsTabStopOrGroup(currElement))
-                {
-                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
-                    if (currPriority > elementTabPriority)
-                    {
-                        if (currPriority < minIndex || nextTabElement == null)
-                        {
-                            minIndex = currPriority;
-                            nextTabElement = currElement;
-                        }
-                    }
-
-                    if (currPriority < minIndexFirstTab || firstTabElement == null)
-                    {
-                        minIndexFirstTab = currPriority;
-                        firstTabElement = currElement;
-                    }
-                }
-            }
-
-            // Cycle groups: if not found - return first element
-            if (tabbingType == KeyboardNavigationMode.Cycle && nextTabElement == null)
-                nextTabElement = firstTabElement;
-
-            return nextTabElement;
-        }
-
-        private static IInputElement? GetPrevTabInGroup(IInputElement? e, IInputElement container, KeyboardNavigationMode tabbingType)
-        {
-            // None groups: Tab navigation is not supported
-            if (tabbingType == KeyboardNavigationMode.None)
-                return null;
-
-            // Search the last index inside the group
-            if (e == null)
-            {
-                return GetLastTabInGroup(container);
-            }
-
-            if (tabbingType == KeyboardNavigationMode.Once)
-                return null;
-
-            if (e == container)
-                return null;
-
-            var nextTabElement = GetPrevTabWithSameIndex(e, container);
-            if (nextTabElement != null)
-                return nextTabElement;
-
-            return GetPrevTabWithPrevIndex(e, container, tabbingType);
-        }
-
-        private static IInputElement? GetPrevTabWithSameIndex(IInputElement e, IInputElement container)
-        {
-            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
-            var currElement = GetPreviousInTree(e, container);
-            while (currElement != null)
-            {
-                if (IsTabStopOrGroup(currElement) && KeyboardNavigation.GetTabIndex(currElement) == elementTabPriority && currElement != container)
-                {
-                    return currElement;
-                }
-                currElement = GetPreviousInTree(currElement, container);
-            }
-            return null;
-        }
-
-        private static IInputElement? GetPrevTabWithPrevIndex(IInputElement e, IInputElement container, KeyboardNavigationMode tabbingType)
-        {
-            // Find the next max index in the tree
-            // max (index<currentTabIndex)
-            IInputElement? lastTabElement = null;
-            IInputElement? nextTabElement = null;
-            int elementTabPriority = KeyboardNavigation.GetTabIndex(e);
-            int maxIndexFirstTab = Int32.MaxValue;
-            int maxIndex = Int32.MaxValue;
-            var currElement = GetLastInTree(container);
-            while (currElement != null)
-            {
-                if (IsTabStopOrGroup(currElement) && currElement != container)
-                {
-                    int currPriority = KeyboardNavigation.GetTabIndex(currElement);
-                    if (currPriority < elementTabPriority)
-                    {
-                        if (currPriority > maxIndex || nextTabElement == null)
-                        {
-                            maxIndex = currPriority;
-                            nextTabElement = currElement;
-                        }
-                    }
-
-                    if (currPriority > maxIndexFirstTab || lastTabElement == null)
-                    {
-                        maxIndexFirstTab = currPriority;
-                        lastTabElement = currElement;
-                    }
-                }
-
-                currElement = GetPreviousInTree(currElement, container);
-            }
-
-            // Cycle groups: if not found - return first element
-            if (tabbingType == KeyboardNavigationMode.Cycle && nextTabElement == null)
-                nextTabElement = lastTabElement;
-
-            return nextTabElement;
-        }
-
-        private static IInputElement? GetPreviousInTree(IInputElement e, IInputElement container)
-        {
-            if (e == container)
-                return null;
-
-            var result = GetPreviousSibling(e);
-
-            if (result != null)
-            {
-                if (IsGroup(result))
-                    return result;
-                else
-                    return GetLastInTree(result);
-            }
-            else
-                return GetParent(e);
-        }
-
-        private static IInputElement? GetPreviousSibling(IInputElement e)
-        {
-            if (GetParent(e) is IVisual parentAsVisual && e is IVisual elementAsVisual)
-            {
-                var children = parentAsVisual.VisualChildren;
-                var count = children.Count;
-                IInputElement? prev = null;
-                
-                for (int i = 0; i < count; i++)
-                {
-                    var vchild = children[i];
-                    if (vchild == elementAsVisual)
-                        break;
-                    if (vchild is IInputElement ie && IsVisibleAndEnabled(ie))
-                        prev = ie;
-                }
-                return prev;
-            }
-            return null;
-        }
-
-        private static IInputElement? GetActiveElement(IInputElement e)
-        {
-            return ((IAvaloniaObject)e).GetValue(KeyboardNavigation.TabOnceActiveElementProperty);
-        }
-
-        private static IInputElement GetGroupParent(IInputElement e) => GetGroupParent(e, false);
-
-        private static IInputElement GetGroupParent(IInputElement element, bool includeCurrent)
-        {
-            var result = element; // Keep the last non null element
-            var e = element;
-
-            // If we don't want to include the current element,
-            // start at the parent of the element.  If the element
-            // is the root, then just return it as the group parent.
-            if (!includeCurrent)
-            {
-                result = e;
-                e = GetParent(e);
-                if (e == null)
-                    return result;
-            }
-
-            while (e != null)
-            {
-                if (IsGroup(e))
-                    return e;
-
-                result = e;
-                e = GetParent(e);
-            }
-
-            return result;
-        }
-
-        private static IInputElement? GetParent(IInputElement e)
-        {
-            // For Visual - go up the visual parent chain until we find Visual.
-            if (e is IVisual v)
-                return v.FindAncestorOfType<IInputElement>();
-
-            // This will need to be implemented when we have non-visual input elements.
-            throw new NotSupportedException();
-        }
-
-        private static KeyboardNavigationMode GetKeyNavigationMode(IInputElement e)
-        {
-            return ((IAvaloniaObject)e).GetValue(KeyboardNavigation.TabNavigationProperty);
-        }
-        private static bool IsFocusScope(IInputElement e) => FocusManager.GetIsFocusScope(e) || GetParent(e) == null;
-        private static bool IsGroup(IInputElement e) => GetKeyNavigationMode(e) != KeyboardNavigationMode.Continue;
-
-        private static bool IsTabStop(IInputElement e)
-        {
-            if (e is InputElement ie)
-                return ie.Focusable && KeyboardNavigation.GetIsTabStop(ie) && ie.IsVisible && ie.IsEnabled;
-            return false;
-        }
-
-        private static bool IsTabStopOrGroup(IInputElement e) => IsTabStop(e) || IsGroup(e);
-        private static bool IsVisibleAndEnabled(IInputElement e) => e.IsVisible && e.IsEnabled;
-    }
-}
diff --git a/src/Avalonia.Input/Platform/IClipboard.cs b/src/Avalonia.Input/Platform/IClipboard.cs
deleted file mode 100644
index eb880904eb..0000000000
--- a/src/Avalonia.Input/Platform/IClipboard.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Avalonia.Input.Platform
-{
-    public interface IClipboard
-    {
-        Task<string> GetTextAsync();
-
-        Task SetTextAsync(string text);
-
-        Task ClearAsync();
-
-        Task SetDataObjectAsync(IDataObject data);
-        
-        Task<string[]> GetFormatsAsync();
-        
-        Task<object> GetDataAsync(string format);
-    }
-}
diff --git a/src/Avalonia.Input/Platform/ICursorImpl.cs b/src/Avalonia.Input/Platform/ICursorImpl.cs
deleted file mode 100644
index 14235869f7..0000000000
--- a/src/Avalonia.Input/Platform/ICursorImpl.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using Avalonia.Input;
-
-#nullable enable
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Represents a platform implementation of a <see cref="Cursor"/>.
-    /// </summary>
-    public interface ICursorImpl : IDisposable
-    {
-    }
-}
diff --git a/src/Avalonia.Input/Platform/IPlatformDragSource.cs b/src/Avalonia.Input/Platform/IPlatformDragSource.cs
deleted file mode 100644
index 30d8ee5337..0000000000
--- a/src/Avalonia.Input/Platform/IPlatformDragSource.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Avalonia.Input.Platform
-{
-    public interface IPlatformDragSource
-    {
-        Task<DragDropEffects> DoDragDrop(PointerEventArgs triggerEvent, IDataObject data, DragDropEffects allowedEffects);
-    }
-}
diff --git a/src/Avalonia.Input/PointerEventArgs.cs b/src/Avalonia.Input/PointerEventArgs.cs
deleted file mode 100644
index 0604d09dc4..0000000000
--- a/src/Avalonia.Input/PointerEventArgs.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Input.Raw;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input
-{
-    public class PointerEventArgs : RoutedEventArgs
-    {
-        private readonly IVisual? _rootVisual;
-        private readonly Point _rootVisualPosition;
-        private readonly PointerPointProperties _properties;
-        private Lazy<IReadOnlyList<RawPointerPoint>?>? _previousPoints;
-
-        public PointerEventArgs(RoutedEvent routedEvent,
-            IInteractive? source,
-            IPointer pointer,
-            IVisual? rootVisual, Point rootVisualPosition,
-            ulong timestamp,
-            PointerPointProperties properties,
-            KeyModifiers modifiers)
-           : base(routedEvent)
-        {
-            Source = source;
-            _rootVisual = rootVisual;
-            _rootVisualPosition = rootVisualPosition;
-            _properties = properties;
-            Pointer = pointer;
-            Timestamp = timestamp;
-            KeyModifiers = modifiers;
-        }
-        
-        public PointerEventArgs(RoutedEvent routedEvent,
-            IInteractive? source,
-            IPointer pointer,
-            IVisual? rootVisual, Point rootVisualPosition,
-            ulong timestamp,
-            PointerPointProperties properties,
-            KeyModifiers modifiers,
-            Lazy<IReadOnlyList<RawPointerPoint>?>? previousPoints)
-            : this(routedEvent, source, pointer, rootVisual, rootVisualPosition, timestamp, properties, modifiers)
-        {
-            _previousPoints = previousPoints;
-        }
-        
-
-        class EmulatedDevice : IPointerDevice
-        {
-            private readonly PointerEventArgs _ev;
-
-            public EmulatedDevice(PointerEventArgs ev)
-            {
-                _ev = ev;
-            }
-            
-            public void ProcessRawEvent(RawInputEventArgs ev) => throw new NotSupportedException();
-
-            public IInputElement? Captured => _ev.Pointer.Captured;
-            public void Capture(IInputElement? control)
-            {
-                _ev.Pointer.Capture(control);
-            }
-
-            public Point GetPosition(IVisual relativeTo) => _ev.GetPosition(relativeTo);
-        }
-
-        public IPointer Pointer { get; }
-        public ulong Timestamp { get; }
-
-        private IPointerDevice? _device;
-
-        [Obsolete("Use Pointer to get pointer-specific information")]
-        public IPointerDevice Device => _device ?? (_device = new EmulatedDevice(this));
-
-        [Obsolete("Use KeyModifiers and PointerPointProperties")]
-        public InputModifiers InputModifiers 
-        {
-            get
-            {
-                var mods = (InputModifiers)KeyModifiers;
-                if (_properties.IsLeftButtonPressed)
-                    mods |= InputModifiers.LeftMouseButton;
-                if (_properties.IsMiddleButtonPressed)
-                    mods |= InputModifiers.MiddleMouseButton;
-                if (_properties.IsRightButtonPressed)
-                    mods |= InputModifiers.RightMouseButton;
-                
-                return mods;
-            }
-        }
-        
-        public KeyModifiers KeyModifiers { get; }
-
-        private Point GetPosition(Point pt, IVisual? relativeTo)
-        {
-            if (_rootVisual == null)
-                return default;
-            if (relativeTo == null)
-                return pt;
-            return pt * _rootVisual.TransformToVisual(relativeTo) ?? default;
-        }
-        
-        public Point GetPosition(IVisual? relativeTo) => GetPosition(_rootVisualPosition, relativeTo);
-
-        [Obsolete("Use GetCurrentPoint")]
-        public PointerPoint GetPointerPoint(IVisual? relativeTo) => GetCurrentPoint(relativeTo);
-        
-        /// <summary>
-        /// Returns the PointerPoint associated with the current event
-        /// </summary>
-        /// <param name="relativeTo">The visual which coordinate system to use. Pass null for toplevel coordinate system</param>
-        /// <returns></returns>
-        public PointerPoint GetCurrentPoint(IVisual? relativeTo)
-            => new PointerPoint(Pointer, GetPosition(relativeTo), _properties);
-
-        /// <summary>
-        /// Returns the PointerPoint associated with the current event
-        /// </summary>
-        /// <param name="relativeTo">The visual which coordinate system to use. Pass null for toplevel coordinate system</param>
-        /// <returns></returns>
-        public IReadOnlyList<PointerPoint> GetIntermediatePoints(IVisual? relativeTo)
-        {
-            var previousPoints = _previousPoints?.Value;            
-            if (previousPoints == null || previousPoints.Count == 0)
-                return new[] { GetCurrentPoint(relativeTo) };
-            var points = new PointerPoint[previousPoints.Count + 1];
-            for (var c = 0; c < previousPoints.Count; c++)
-            {
-                var pt = previousPoints[c];
-                points[c] = new PointerPoint(Pointer, GetPosition(pt.Position, relativeTo), _properties);
-            }
-
-            points[points.Length - 1] = GetCurrentPoint(relativeTo);
-            return points;
-        }
-
-        /// <summary>
-        /// Returns the current pointer point properties
-        /// </summary>
-        protected PointerPointProperties Properties => _properties;
-    }
-    
-    public enum MouseButton
-    {
-        None,
-        Left,
-        Right,
-        Middle,
-        XButton1,
-        XButton2
-    }
-
-    public class PointerPressedEventArgs : PointerEventArgs
-    {
-        private readonly int _clickCount;
-
-        public PointerPressedEventArgs(
-            IInteractive source,
-            IPointer pointer,
-            IVisual rootVisual, Point rootVisualPosition,
-            ulong timestamp,
-            PointerPointProperties properties,
-            KeyModifiers modifiers,
-            int clickCount = 1)
-            : base(InputElement.PointerPressedEvent, source, pointer, rootVisual, rootVisualPosition,
-                timestamp, properties, modifiers)
-        {
-            _clickCount = clickCount;
-        }
-
-        public int ClickCount => _clickCount;
-
-        [Obsolete("Use PointerPressedEventArgs.GetCurrentPoint(this).Properties")]
-        public MouseButton MouseButton => Properties.PointerUpdateKind.GetMouseButton();
-    }
-
-    public class PointerReleasedEventArgs : PointerEventArgs
-    {
-        public PointerReleasedEventArgs(
-            IInteractive source, IPointer pointer,
-            IVisual rootVisual, Point rootVisualPosition, ulong timestamp,
-            PointerPointProperties properties, KeyModifiers modifiers,
-            MouseButton initialPressMouseButton)
-            : base(InputElement.PointerReleasedEvent, source, pointer, rootVisual, rootVisualPosition,
-                timestamp, properties, modifiers)
-        {
-            InitialPressMouseButton = initialPressMouseButton;
-        }
-
-        /// <summary>
-        /// Gets the mouse button that triggered the corresponding PointerPressed event
-        /// </summary>
-        public MouseButton InitialPressMouseButton { get; }
-
-        [Obsolete("Use InitialPressMouseButton")]
-        public MouseButton MouseButton => InitialPressMouseButton;
-    }
-
-    public class PointerCaptureLostEventArgs : RoutedEventArgs
-    {
-        public IPointer Pointer { get; }
-
-        public PointerCaptureLostEventArgs(IInteractive source, IPointer pointer) : base(InputElement.PointerCaptureLostEvent)
-        {
-            Pointer = pointer;
-            Source = source;
-        }
-    }
-}
diff --git a/src/Avalonia.Input/Properties/AssemblyInfo.cs b/src/Avalonia.Input/Properties/AssemblyInfo.cs
deleted file mode 100644
index 433f821ca3..0000000000
--- a/src/Avalonia.Input/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System.Reflection;
-using Avalonia.Metadata;
-
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input.GestureRecognizers")]
diff --git a/src/Avalonia.Input/Raw/IDragDropDevice.cs b/src/Avalonia.Input/Raw/IDragDropDevice.cs
deleted file mode 100644
index f7b7914bd1..0000000000
--- a/src/Avalonia.Input/Raw/IDragDropDevice.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Avalonia.Input.Raw
-{
-    public interface IDragDropDevice : IInputDevice
-    {
-    }
-}
diff --git a/src/Avalonia.Input/Raw/RawDragEvent.cs b/src/Avalonia.Input/Raw/RawDragEvent.cs
deleted file mode 100644
index 6e9ce20ff1..0000000000
--- a/src/Avalonia.Input/Raw/RawDragEvent.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-
-namespace Avalonia.Input.Raw
-{
-    public class RawDragEvent : RawInputEventArgs
-    {
-        public Point Location { get; set; }
-        public IDataObject Data { get; }
-        public DragDropEffects Effects { get; set; }
-        public RawDragEventType Type { get; }
-        [Obsolete("Use KeyModifiers")]
-        public InputModifiers Modifiers { get; }
-        public KeyModifiers KeyModifiers { get; }
-
-        public RawDragEvent(IDragDropDevice inputDevice, RawDragEventType type, 
-            IInputRoot root, Point location, IDataObject data, DragDropEffects effects, RawInputModifiers modifiers)
-            :base(inputDevice, 0, root)
-        {
-            Type = type;
-            Location = location;
-            Data = data;
-            Effects = effects;
-            KeyModifiers = KeyModifiersUtils.ConvertToKey(modifiers);
-#pragma warning disable CS0618 // Type or member is obsolete
-            Modifiers = (InputModifiers)modifiers;
-#pragma warning restore CS0618 // Type or member is obsolete
-        }
-    }
-}
diff --git a/src/Avalonia.Input/Raw/RawPointerEventArgs.cs b/src/Avalonia.Input/Raw/RawPointerEventArgs.cs
deleted file mode 100644
index c157fa059c..0000000000
--- a/src/Avalonia.Input/Raw/RawPointerEventArgs.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Avalonia.Input.Raw
-{
-    public enum RawPointerEventType
-    {
-        LeaveWindow,
-        LeftButtonDown,
-        LeftButtonUp,
-        RightButtonDown,
-        RightButtonUp,
-        MiddleButtonDown,
-        MiddleButtonUp,
-        XButton1Down,
-        XButton1Up,
-        XButton2Down,
-        XButton2Up,
-        Move,
-        Wheel,
-        NonClientLeftButtonDown,
-        TouchBegin,
-        TouchUpdate,
-        TouchEnd,
-        TouchCancel,
-        Magnify,
-        Rotate,
-        Swipe
-    }
-
-    /// <summary>
-    /// A raw mouse event.
-    /// </summary>
-    public class RawPointerEventArgs : RawInputEventArgs
-    {
-        private RawPointerPoint _point;
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RawPointerEventArgs"/> class.
-        /// </summary>
-        /// <param name="device">The associated device.</param>
-        /// <param name="timestamp">The event timestamp.</param>
-        /// <param name="root">The root from which the event originates.</param>
-        /// <param name="type">The type of the event.</param>
-        /// <param name="position">The mouse position, in client DIPs.</param>
-        /// <param name="inputModifiers">The input modifiers.</param>
-        public RawPointerEventArgs(
-            IInputDevice device,
-            ulong timestamp,
-            IInputRoot root,
-            RawPointerEventType type,
-            Point position, 
-            RawInputModifiers inputModifiers)
-            : base(device, timestamp, root)
-        {
-            Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
-
-            Position = position;
-            Type = type;
-            InputModifiers = inputModifiers;
-        }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RawPointerEventArgs"/> class.
-        /// </summary>
-        /// <param name="device">The associated device.</param>
-        /// <param name="timestamp">The event timestamp.</param>
-        /// <param name="root">The root from which the event originates.</param>
-        /// <param name="type">The type of the event.</param>
-        /// <param name="point">The point properties and position, in client DIPs.</param>
-        /// <param name="inputModifiers">The input modifiers.</param>
-        public RawPointerEventArgs(
-            IInputDevice device,
-            ulong timestamp,
-            IInputRoot root,
-            RawPointerEventType type,
-            RawPointerPoint point, 
-            RawInputModifiers inputModifiers)
-            : base(device, timestamp, root)
-        {
-            Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
-
-            Point = point;
-            Type = type;
-            InputModifiers = inputModifiers;
-        }
-
-        /// <summary>
-        /// Gets the pointer properties and position, in client DIPs.
-        /// </summary>
-        public RawPointerPoint Point
-        {
-            get => _point;
-            set => _point = value;
-        }
-
-        /// <summary>
-        /// Gets the mouse position, in client DIPs.
-        /// </summary>
-        public Point Position
-        {
-            get => _point.Position;
-            set => _point.Position = value;
-        }
-
-        /// <summary>
-        /// Gets the type of the event.
-        /// </summary>
-        public RawPointerEventType Type { get; set; }
-
-        /// <summary>
-        /// Gets the input modifiers.
-        /// </summary>
-        public RawInputModifiers InputModifiers { get; set; }
-        
-        /// <summary>
-        /// Points that were traversed by a pointer since the previous relevant event,
-        /// only valid for Move and TouchUpdate
-        /// </summary>
-        public Lazy<IReadOnlyList<RawPointerPoint>?>? IntermediatePoints { get; set; }
-    }
-
-    public struct RawPointerPoint
-    {
-        /// <summary>
-        /// Pointer position, in client DIPs.
-        /// </summary>
-        public Point Position { get; set; }
-        
-        public RawPointerPoint()
-        {
-            Position = default;
-        }
-    }
-}
diff --git a/src/Avalonia.Input/TextInput/ITextInputMethodImpl.cs b/src/Avalonia.Input/TextInput/ITextInputMethodImpl.cs
deleted file mode 100644
index 2d24ed30a0..0000000000
--- a/src/Avalonia.Input/TextInput/ITextInputMethodImpl.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Avalonia.Input.TextInput
-{
-    public interface ITextInputMethodImpl
-    {
-        void SetActive(bool active);
-        void SetCursorRect(Rect rect);
-        void SetOptions(TextInputOptionsQueryEventArgs options);
-        void Reset();
-    }
-    
-    public interface ITextInputMethodRoot : IInputRoot
-    {
-        ITextInputMethodImpl? InputMethod { get; }
-    }
-}
diff --git a/src/Avalonia.Input/TextInput/InputMethodManager.cs b/src/Avalonia.Input/TextInput/InputMethodManager.cs
deleted file mode 100644
index 64422a7fdf..0000000000
--- a/src/Avalonia.Input/TextInput/InputMethodManager.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Input.TextInput
-{
-    internal class TextInputMethodManager
-    {
-        private ITextInputMethodImpl? _im;
-        private IInputElement? _focusedElement;
-        private ITextInputMethodClient? _client;
-        private readonly TransformTrackingHelper _transformTracker = new TransformTrackingHelper();
-
-        public TextInputMethodManager()
-        {
-            _transformTracker.MatrixChanged += UpdateCursorRect;
-            InputMethod.IsInputMethodEnabledProperty.Changed.Subscribe(OnIsInputMethodEnabledChanged);
-        }
-
-        private ITextInputMethodClient? Client
-        {
-            get => _client;
-            set
-            {
-                if(_client == value)
-                    return;
-                if (_client != null)
-                {
-                    _client.CursorRectangleChanged -= OnCursorRectangleChanged;
-                    _client.TextViewVisualChanged -= OnTextViewVisualChanged;
-                }
-
-                _client = value;
-                
-                if (_client != null)
-                {
-                    _client.CursorRectangleChanged += OnCursorRectangleChanged;
-                    _client.TextViewVisualChanged += OnTextViewVisualChanged;
-                    var optionsQuery = new TextInputOptionsQueryEventArgs
-                    {
-                        RoutedEvent = InputElement.TextInputOptionsQueryEvent
-                    };
-                    _focusedElement?.RaiseEvent(optionsQuery);
-                    _im?.Reset();
-                    _im?.SetOptions(optionsQuery);
-                    _transformTracker?.SetVisual(_client?.TextViewVisual);
-                    UpdateCursorRect();
-                    
-                    _im?.SetActive(true);
-                }
-                else
-                {
-                    _im?.SetActive(false);
-                    _transformTracker.SetVisual(null);
-                }
-            }
-        }
-
-        private void OnIsInputMethodEnabledChanged(AvaloniaPropertyChangedEventArgs<bool> obj)
-        {
-            if (ReferenceEquals(obj.Sender, _focusedElement))
-            {
-                TryFindAndApplyClient();
-            }
-        }
-
-        private void OnTextViewVisualChanged(object? sender, EventArgs e) 
-            => _transformTracker.SetVisual(_client?.TextViewVisual);
-
-        private void UpdateCursorRect()
-        {
-            if (_im == null || _client == null || _focusedElement?.VisualRoot == null)
-                return;
-
-            var transform = _focusedElement.TransformToVisual(_focusedElement.VisualRoot);
-            if (transform == null)
-                _im.SetCursorRect(default);
-            else
-                _im.SetCursorRect(_client.CursorRectangle.TransformToAABB(transform.Value));
-        }
-
-        private void OnCursorRectangleChanged(object? sender, EventArgs e)
-        {
-            if (sender == _client)
-                UpdateCursorRect();
-        }
-        
-        public void SetFocusedElement(IInputElement? element)
-        {
-            if(_focusedElement == element)
-                return;
-            _focusedElement = element;
-
-            var inputMethod = (element?.VisualRoot as ITextInputMethodRoot)?.InputMethod;
-            if (_im != inputMethod)
-                _im?.SetActive(false);
-
-            _im = inputMethod;
-
-            TryFindAndApplyClient();
-        }
-
-        private void TryFindAndApplyClient()
-        {
-            if (_focusedElement is not InputElement focused ||
-                _im == null ||
-                !InputMethod.GetIsInputMethodEnabled(focused))
-            {
-                Client = null;
-                return;
-            }
-
-            var clientQuery = new TextInputMethodClientRequestedEventArgs
-            {
-                RoutedEvent = InputElement.TextInputMethodClientRequestedEvent
-            };
-
-            _focusedElement.RaiseEvent(clientQuery);
-            Client = clientQuery.Client;
-        }
-    }
-}
diff --git a/src/Avalonia.Input/TextInput/TextInputContentType.cs b/src/Avalonia.Input/TextInput/TextInputContentType.cs
deleted file mode 100644
index 5d73fc1552..0000000000
--- a/src/Avalonia.Input/TextInput/TextInputContentType.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Avalonia.Input.TextInput
-{
-    public enum TextInputContentType
-    {
-        Normal = 0,
-        Email = 1,
-        Phone = 2,
-        Number = 3,
-        Url = 4,
-        Password = 5
-    }
-}
diff --git a/src/Avalonia.Input/TextInput/TextInputOptionsQueryEventArgs.cs b/src/Avalonia.Input/TextInput/TextInputOptionsQueryEventArgs.cs
deleted file mode 100644
index 924d0eb166..0000000000
--- a/src/Avalonia.Input/TextInput/TextInputOptionsQueryEventArgs.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Avalonia.Interactivity;
-
-namespace Avalonia.Input.TextInput
-{
-    public class TextInputOptionsQueryEventArgs : RoutedEventArgs
-    {
-        /// <summary>
-        /// The content type (mostly for determining the shape of the virtual keyboard)
-        /// </summary>
-        public TextInputContentType ContentType { get; set; }
-        /// <summary>
-        /// Text is multiline
-        /// </summary>
-        public bool Multiline { get; set; }
-        /// <summary>
-        /// Text is in lower case
-        /// </summary>
-        public bool Lowercase { get; set; }
-        /// <summary>
-        /// Text is in upper case
-        /// </summary>
-        public bool Uppercase { get; set; }
-        /// <summary>
-        /// Automatically capitalize letters at the start of the sentence
-        /// </summary>
-        public bool AutoCapitalization { get; set; }
-        /// <summary>
-        /// Text contains sensitive data like card numbers and should not be stored  
-        /// </summary>
-        public bool IsSensitive { get; set; }
-    }
-}
diff --git a/src/Avalonia.Input/TouchDevice.cs b/src/Avalonia.Input/TouchDevice.cs
deleted file mode 100644
index 12ad182bf8..0000000000
--- a/src/Avalonia.Input/TouchDevice.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Input.Raw;
-using Avalonia.Platform;
-
-namespace Avalonia.Input
-{
-    /// <summary>
-    /// Handles raw touch events
-    /// <remarks>
-    /// This class is supposed to be used on per-toplevel basis, don't use a shared one
-    /// </remarks>
-    /// </summary>
-    public class TouchDevice : IInputDevice, IDisposable
-    {
-        private readonly Dictionary<long, Pointer> _pointers = new Dictionary<long, Pointer>();
-        private bool _disposed;
-        private int _clickCount;
-        private Rect _lastClickRect;
-        private ulong _lastClickTime;
-        KeyModifiers GetKeyModifiers(RawInputModifiers modifiers) =>
-            (KeyModifiers)(modifiers & RawInputModifiers.KeyboardMask);
-
-        RawInputModifiers GetModifiers(RawInputModifiers modifiers, bool isLeftButtonDown)
-        {
-            var rv = modifiers &= RawInputModifiers.KeyboardMask;
-            if (isLeftButtonDown)
-                rv |= RawInputModifiers.LeftMouseButton;
-            return rv;
-        }
-
-        public void ProcessRawEvent(RawInputEventArgs ev)
-        {
-            if (_disposed)
-                return;
-            var args = (RawTouchEventArgs)ev;
-            if (!_pointers.TryGetValue(args.TouchPointId, out var pointer))
-            {
-                if (args.Type == RawPointerEventType.TouchEnd)
-                    return;
-                var hit = args.Root.InputHitTest(args.Position);
-
-                _pointers[args.TouchPointId] = pointer = new Pointer(Pointer.GetNextFreeId(),
-                    PointerType.Touch, _pointers.Count == 0);
-                pointer.Capture(hit);
-            }
-
-
-            var target = pointer.Captured ?? args.Root;
-            if (args.Type == RawPointerEventType.TouchBegin)
-            {
-                if (_pointers.Count > 1)
-                {
-                    _clickCount = 1;
-                    _lastClickTime = 0;
-                    _lastClickRect = new Rect();
-                }
-                else
-                {
-                    var settings = AvaloniaLocator.Current.GetRequiredService<IPlatformSettings>();
-
-                    if (!_lastClickRect.Contains(args.Position)
-                        || ev.Timestamp - _lastClickTime > settings.TouchDoubleClickTime.TotalMilliseconds)
-                    {
-                        _clickCount = 0;
-                    }
-                    ++_clickCount;
-                    _lastClickTime = ev.Timestamp;
-                    _lastClickRect = new Rect(args.Position, new Size())
-                        .Inflate(new Thickness(settings.TouchDoubleClickSize.Width / 2, settings.TouchDoubleClickSize.Height / 2));
-                }
-
-                target.RaiseEvent(new PointerPressedEventArgs(target, pointer,
-                    args.Root, args.Position, ev.Timestamp,
-                    new PointerPointProperties(GetModifiers(args.InputModifiers, true),
-                        PointerUpdateKind.LeftButtonPressed),
-                    GetKeyModifiers(args.InputModifiers), _clickCount));
-            }
-
-            if (args.Type == RawPointerEventType.TouchEnd)
-            {
-                _pointers.Remove(args.TouchPointId);
-                using (pointer)
-                {
-                    target.RaiseEvent(new PointerReleasedEventArgs(target, pointer,
-                        args.Root, args.Position, ev.Timestamp,
-                        new PointerPointProperties(GetModifiers(args.InputModifiers, false),
-                            PointerUpdateKind.LeftButtonReleased),
-                        GetKeyModifiers(args.InputModifiers), MouseButton.Left));
-                }
-            }
-
-            if (args.Type == RawPointerEventType.TouchCancel)
-            {
-                _pointers.Remove(args.TouchPointId);
-                using (pointer)
-                    pointer.Capture(null);
-            }
-
-            if (args.Type == RawPointerEventType.TouchUpdate)
-            {
-                var modifiers = GetModifiers(args.InputModifiers, pointer.IsPrimary);
-                target.RaiseEvent(new PointerEventArgs(InputElement.PointerMovedEvent, target, pointer, args.Root,
-                    args.Position, ev.Timestamp,
-                    new PointerPointProperties(GetModifiers(args.InputModifiers, true), PointerUpdateKind.Other),
-                    GetKeyModifiers(args.InputModifiers), args.IntermediatePoints));
-            }
-
-
-        }
-
-        public void Dispose()
-        {
-            if (_disposed)
-                return;
-            var values = _pointers.Values.ToList();
-            _pointers.Clear();
-            _disposed = true;
-            foreach (var p in values)
-                p.Dispose();
-        }
-
-    }
-}
diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
deleted file mode 100644
index 03a53f7d86..0000000000
--- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-  </ItemGroup>
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
\ No newline at end of file
diff --git a/src/Avalonia.Interactivity/IInteractive.cs b/src/Avalonia.Interactivity/IInteractive.cs
deleted file mode 100644
index afda29e329..0000000000
--- a/src/Avalonia.Interactivity/IInteractive.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Interactivity
-{
-    /// <summary>
-    /// Interface for objects that raise routed events.
-    /// </summary>
-    public interface IInteractive
-    {
-        /// <summary>
-        /// Gets the interactive parent of the object for bubbling and tunneling events.
-        /// </summary>
-        IInteractive? InteractiveParent { get; }
-
-        /// <summary>
-        /// Adds a handler for the specified routed event.
-        /// </summary>
-        /// <param name="routedEvent">The routed event.</param>
-        /// <param name="handler">The handler.</param>
-        /// <param name="routes">The routing strategies to listen to.</param>
-        /// <param name="handledEventsToo">Whether handled events should also be listened for.</param>
-        /// <returns>A disposable that terminates the event subscription.</returns>
-        void AddHandler(
-            RoutedEvent routedEvent,
-            Delegate handler,
-            RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
-            bool handledEventsToo = false);
-
-        /// <summary>
-        /// Adds a handler for the specified routed event.
-        /// </summary>
-        /// <typeparam name="TEventArgs">The type of the event's args.</typeparam>
-        /// <param name="routedEvent">The routed event.</param>
-        /// <param name="handler">The handler.</param>
-        /// <param name="routes">The routing strategies to listen to.</param>
-        /// <param name="handledEventsToo">Whether handled events should also be listened for.</param>
-        /// <returns>A disposable that terminates the event subscription.</returns>
-        void AddHandler<TEventArgs>(
-            RoutedEvent<TEventArgs> routedEvent,
-            EventHandler<TEventArgs> handler,
-            RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
-            bool handledEventsToo = false) where TEventArgs : RoutedEventArgs;
-
-        /// <summary>
-        /// Removes a handler for the specified routed event.
-        /// </summary>
-        /// <param name="routedEvent">The routed event.</param>
-        /// <param name="handler">The handler.</param>
-        void RemoveHandler(RoutedEvent routedEvent, Delegate handler);
-
-        /// <summary>
-        /// Removes a handler for the specified routed event.
-        /// </summary>
-        /// <typeparam name="TEventArgs">The type of the event's args.</typeparam>
-        /// <param name="routedEvent">The routed event.</param>
-        /// <param name="handler">The handler.</param>
-        void RemoveHandler<TEventArgs>(RoutedEvent<TEventArgs> routedEvent, EventHandler<TEventArgs> handler)
-            where TEventArgs : RoutedEventArgs;
-
-        /// <summary>
-        /// Adds the object's handlers for a routed event to an event route.
-        /// </summary>
-        /// <param name="routedEvent">The event.</param>
-        /// <param name="route">The event route.</param>
-        void AddToEventRoute(RoutedEvent routedEvent, EventRoute route);
-
-        /// <summary>
-        /// Raises a routed event.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        void RaiseEvent(RoutedEventArgs e);
-    }
-}
diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj
deleted file mode 100644
index f2c4b0540b..0000000000
--- a/src/Avalonia.Layout/Avalonia.Layout.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-  </ItemGroup>  
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
diff --git a/src/Avalonia.Layout/ILayoutManager.cs b/src/Avalonia.Layout/ILayoutManager.cs
deleted file mode 100644
index 614670a53b..0000000000
--- a/src/Avalonia.Layout/ILayoutManager.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Manages measuring and arranging of controls.
-    /// </summary>
-    public interface ILayoutManager : IDisposable
-    {
-        /// <summary>
-        /// Raised when the layout manager completes a layout pass.
-        /// </summary>
-        event EventHandler LayoutUpdated;
-
-        /// <summary>
-        /// Notifies the layout manager that a control requires a measure.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        void InvalidateMeasure(ILayoutable control);
-
-        /// <summary>
-        /// Notifies the layout manager that a control requires an arrange.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        void InvalidateArrange(ILayoutable control);
-
-        /// <summary>
-        /// Executes a layout pass.
-        /// </summary>
-        /// <remarks>
-        /// You should not usually need to call this method explictly, the layout manager will
-        /// schedule layout passes itself.
-        /// </remarks>
-        void ExecuteLayoutPass();
-
-        /// <summary>
-        /// Executes the initial layout pass on a layout root.
-        /// </summary>
-        /// <remarks>
-        /// You should not usually need to call this method explictly, the layout root will call
-        /// it to carry out the initial layout of the control.
-        /// </remarks>
-        void ExecuteInitialLayoutPass();
-
-        /// <summary>
-        /// Executes the initial layout pass on a layout root.
-        /// </summary>
-        /// <param name="root">The control to lay out.</param>
-        /// <remarks>
-        /// You should not usually need to call this method explictly, the layout root will call
-        /// it to carry out the initial layout of the control.
-        /// </remarks>
-        [Obsolete("Call ExecuteInitialLayoutPass without parameter")]
-        void ExecuteInitialLayoutPass(ILayoutRoot root);
-
-        /// <summary>
-        /// Registers a control as wanting to receive effective viewport notifications.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        void RegisterEffectiveViewportListener(ILayoutable control);
-
-        /// <summary>
-        /// Registers a control as no longer wanting to receive effective viewport notifications.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        void UnregisterEffectiveViewportListener(ILayoutable control);
-    }
-}
diff --git a/src/Avalonia.Layout/ILayoutRoot.cs b/src/Avalonia.Layout/ILayoutRoot.cs
deleted file mode 100644
index e2f16b338a..0000000000
--- a/src/Avalonia.Layout/ILayoutRoot.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Defines the root of a layoutable tree.
-    /// </summary>
-    public interface ILayoutRoot : ILayoutable
-    {
-        /// <summary>
-        /// The size available to lay out the controls.
-        /// </summary>
-        Size ClientSize { get; }
-
-        /// <summary>
-        /// The scaling factor to use in layout.
-        /// </summary>
-        double LayoutScaling { get; }
-
-        /// <summary>
-        /// Associated instance of layout manager
-        /// </summary>
-        ILayoutManager LayoutManager { get; }
-    }
-}
diff --git a/src/Avalonia.Layout/ILayoutable.cs b/src/Avalonia.Layout/ILayoutable.cs
deleted file mode 100644
index 54d3ba6a11..0000000000
--- a/src/Avalonia.Layout/ILayoutable.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using Avalonia.VisualTree;
-
-#nullable enable
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Defines layout-related functionality for a control.
-    /// </summary>
-    public interface ILayoutable : IVisual
-    {
-        /// <summary>
-        /// Gets the size that this element computed during the measure pass of the layout process.
-        /// </summary>
-        Size DesiredSize { get; }
-
-        /// <summary>
-        /// Gets the width of the element.
-        /// </summary>
-        double Width { get; }
-
-        /// <summary>
-        /// Gets the height of the element.
-        /// </summary>
-        double Height { get; }
-
-        /// <summary>
-        /// Gets the minimum width of the element.
-        /// </summary>
-        double MinWidth { get; }
-
-        /// <summary>
-        /// Gets the maximum width of the element.
-        /// </summary>
-        double MaxWidth { get; }
-
-        /// <summary>
-        /// Gets the minimum height of the element.
-        /// </summary>
-        double MinHeight { get; }
-
-        /// <summary>
-        /// Gets the maximum height of the element.
-        /// </summary>
-        double MaxHeight { get; }
-
-        /// <summary>
-        /// Gets the margin around the element.
-        /// </summary>
-        Thickness Margin { get; }
-
-        /// <summary>
-        /// Gets the element's preferred horizontal alignment in its parent.
-        /// </summary>
-        HorizontalAlignment HorizontalAlignment { get; }
-
-        /// <summary>
-        /// Gets the element's preferred vertical alignment in its parent.
-        /// </summary>
-        VerticalAlignment VerticalAlignment { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the control's layout measure is valid.
-        /// </summary>
-        bool IsMeasureValid { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the control's layouts arrange is valid.
-        /// </summary>
-        bool IsArrangeValid { get; }
-
-        /// <summary>
-        /// Gets the available size passed in the previous layout pass, if any.
-        /// </summary>
-        Size? PreviousMeasure { get; }
-
-        /// <summary>
-        /// Gets the layout rect passed in the previous layout pass, if any.
-        /// </summary>
-        Rect? PreviousArrange { get; }
-
-        /// <summary>
-        /// Creates the visual children of the control, if necessary
-        /// </summary>
-        void ApplyTemplate();
-
-        /// <summary>
-        /// Carries out a measure of the control.
-        /// </summary>
-        /// <param name="availableSize">The available size for the control.</param>
-        void Measure(Size availableSize);
-
-        /// <summary>
-        /// Arranges the control and its children.
-        /// </summary>
-        /// <param name="rect">The control's new bounds.</param>
-        void Arrange(Rect rect);
-
-        /// <summary>
-        /// Invalidates the measurement of the control and queues a new layout pass.
-        /// </summary>
-        void InvalidateMeasure();
-
-        /// <summary>
-        /// Invalidates the arrangement of the control and queues a new layout pass.
-        /// </summary>
-        void InvalidateArrange();
-
-        /// <summary>
-        /// Called when a child control's desired size changes.
-        /// </summary>
-        /// <param name="control">The child control.</param>
-        void ChildDesiredSizeChanged(ILayoutable control);
-
-        /// <summary>
-        /// Used by the <see cref="LayoutManager"/> to notify the control that its effective
-        /// viewport is changed.
-        /// </summary>
-        /// <param name="e">The viewport information.</param>
-        void EffectiveViewportChanged(EffectiveViewportChangedEventArgs e);
-    }
-}
diff --git a/src/Avalonia.Layout/LayoutHelper.cs b/src/Avalonia.Layout/LayoutHelper.cs
deleted file mode 100644
index d4154a6d0c..0000000000
--- a/src/Avalonia.Layout/LayoutHelper.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-using System;
-using Avalonia.Utilities;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Provides helper methods needed for layout.
-    /// </summary>
-    public static class LayoutHelper
-    {
-        /// <summary>
-        /// Epsilon value used for certain layout calculations.
-        /// Based on the value in WPF LayoutDoubleUtil.
-        /// </summary>
-        public static double LayoutEpsilon { get; } = 0.00000153;
-
-        /// <summary>
-        /// Calculates a control's size based on its <see cref="ILayoutable.Width"/>,
-        /// <see cref="ILayoutable.Height"/>, <see cref="ILayoutable.MinWidth"/>,
-        /// <see cref="ILayoutable.MaxWidth"/>, <see cref="ILayoutable.MinHeight"/> and
-        /// <see cref="ILayoutable.MaxHeight"/>.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="constraints">The space available for the control.</param>
-        /// <returns>The control's size.</returns>
-        public static Size ApplyLayoutConstraints(ILayoutable control, Size constraints)
-        {
-            var minmax = new MinMax(control);
-
-            return new Size(
-                MathUtilities.Clamp(constraints.Width, minmax.MinWidth, minmax.MaxWidth),
-                MathUtilities.Clamp(constraints.Height, minmax.MinHeight, minmax.MaxHeight));
-        }
-
-        public static Size MeasureChild(ILayoutable? control, Size availableSize, Thickness padding,
-            Thickness borderThickness)
-        {
-            return MeasureChild(control, availableSize, padding + borderThickness);
-        }
-
-        public static Size MeasureChild(ILayoutable? control, Size availableSize, Thickness padding)
-        {
-            if (control != null)
-            {
-                control.Measure(availableSize.Deflate(padding));
-                return control.DesiredSize.Inflate(padding);
-            }
-
-            return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
-        }
-
-        public static Size ArrangeChild(ILayoutable? child, Size availableSize, Thickness padding, Thickness borderThickness)
-        {
-            return ArrangeChild(child, availableSize, padding + borderThickness);
-        }
-
-        public static Size ArrangeChild(ILayoutable? child, Size availableSize, Thickness padding)
-        {
-            child?.Arrange(new Rect(availableSize).Deflate(padding));
-
-            return availableSize;
-        }
-
-        /// <summary>
-        /// Invalidates measure for given control and all visual children recursively.
-        /// </summary>
-        public static void InvalidateSelfAndChildrenMeasure(ILayoutable control)
-        {
-            void InnerInvalidateMeasure(IVisual target)
-            {
-                if (target is ILayoutable targetLayoutable)
-                {
-                    targetLayoutable.InvalidateMeasure();
-                }
-
-                var visualChildren = target.VisualChildren;
-                var visualChildrenCount = visualChildren.Count;
-
-                for (int i = 0; i < visualChildrenCount; i++)
-                {
-                    IVisual child = visualChildren[i];
-
-                    InnerInvalidateMeasure(child);
-                }
-            }
-
-            InnerInvalidateMeasure(control);
-        }
-
-        /// <summary>
-        /// Obtains layout scale of the given control.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <exception cref="Exception">Thrown when control has no root or returned layout scaling is invalid.</exception>
-        public static double GetLayoutScale(ILayoutable control)
-        {
-            var visualRoot = control.VisualRoot;
-            
-            var result = (visualRoot as ILayoutRoot)?.LayoutScaling ?? 1.0;
-
-            if (result == 0 || double.IsNaN(result) || double.IsInfinity(result))
-            {
-                throw new Exception($"Invalid LayoutScaling returned from {visualRoot!.GetType()}");
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Rounds a size to integer values for layout purposes, compensating for high DPI screen
-        /// coordinates.
-        /// </summary>
-        /// <param name="size">Input size.</param>
-        /// <param name="dpiScaleX">DPI along x-dimension.</param>
-        /// <param name="dpiScaleY">DPI along y-dimension.</param>
-        /// <returns>Value of size that will be rounded under screen DPI.</returns>
-        /// <remarks>
-        /// This is a layout helper method. It takes DPI into account and also does not return
-        /// the rounded value if it is unacceptable for layout, e.g. Infinity or NaN. It's a helper
-        /// associated with the UseLayoutRounding property and should not be used as a general rounding
-        /// utility.
-        /// </remarks>
-        public static Size RoundLayoutSize(Size size, double dpiScaleX, double dpiScaleY)
-        {
-            return new Size(RoundLayoutValue(size.Width, dpiScaleX), RoundLayoutValue(size.Height, dpiScaleY));
-        }
-
-        /// <summary>
-        /// Calculates the value to be used for layout rounding at high DPI.
-        /// </summary>
-        /// <param name="value">Input value to be rounded.</param>
-        /// <param name="dpiScale">Ratio of screen's DPI to layout DPI</param>
-        /// <returns>Adjusted value that will produce layout rounding on screen at high dpi.</returns>
-        /// <remarks>
-        /// This is a layout helper method. It takes DPI into account and also does not return
-        /// the rounded value if it is unacceptable for layout, e.g. Infinity or NaN. It's a helper
-        /// associated with the UseLayoutRounding property and should not be used as a general rounding
-        /// utility.
-        /// </remarks>
-        public static double RoundLayoutValue(double value, double dpiScale)
-        {
-            double newValue;
-
-            // If DPI == 1, don't use DPI-aware rounding.
-            if (!MathUtilities.IsOne(dpiScale))
-            {
-                newValue = Math.Round(value * dpiScale) / dpiScale;
-
-                // If rounding produces a value unacceptable to layout (NaN, Infinity or MaxValue),
-                // use the original value.
-                if (double.IsNaN(newValue) ||
-                    double.IsInfinity(newValue) ||
-                    MathUtilities.AreClose(newValue, double.MaxValue))
-                {
-                    newValue = value;
-                }
-            }
-            else
-            {
-                newValue = Math.Round(value);
-            }
-
-            return newValue;
-        }
-
-
-        /// <summary>
-        /// Calculates the min and max height for a control. Ported from WPF.
-        /// </summary>
-        private readonly struct MinMax
-        {
-            public MinMax(ILayoutable e)
-            {
-                MaxHeight = e.MaxHeight;
-                MinHeight = e.MinHeight;
-                double l = e.Height;
-
-                double height = (double.IsNaN(l) ? double.PositiveInfinity : l);
-                MaxHeight = Math.Max(Math.Min(height, MaxHeight), MinHeight);
-
-                height = (double.IsNaN(l) ? 0 : l);
-                MinHeight = Math.Max(Math.Min(MaxHeight, height), MinHeight);
-
-                MaxWidth = e.MaxWidth;
-                MinWidth = e.MinWidth;
-                l = e.Width;
-
-                double width = (double.IsNaN(l) ? double.PositiveInfinity : l);
-                MaxWidth = Math.Max(Math.Min(width, MaxWidth), MinWidth);
-
-                width = (double.IsNaN(l) ? 0 : l);
-                MinWidth = Math.Max(Math.Min(MaxWidth, width), MinWidth);
-            }
-
-            public double MinWidth { get; }
-            public double MaxWidth { get; }
-            public double MinHeight { get; }
-            public double MaxHeight { get; }
-        }
-    }
-}
diff --git a/src/Avalonia.Layout/LayoutManager.cs b/src/Avalonia.Layout/LayoutManager.cs
deleted file mode 100644
index fc988a8d6c..0000000000
--- a/src/Avalonia.Layout/LayoutManager.cs
+++ /dev/null
@@ -1,419 +0,0 @@
-using System;
-using System.Buffers;
-using System.Collections.Generic;
-using System.Diagnostics;
-using Avalonia.Logging;
-using Avalonia.Threading;
-using Avalonia.VisualTree;
-
-#nullable enable
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Manages measuring and arranging of controls.
-    /// </summary>
-    public class LayoutManager : ILayoutManager, IDisposable
-    {
-        private const int MaxPasses = 3;
-        private readonly ILayoutRoot _owner;
-        private readonly LayoutQueue<ILayoutable> _toMeasure = new LayoutQueue<ILayoutable>(v => !v.IsMeasureValid);
-        private readonly LayoutQueue<ILayoutable> _toArrange = new LayoutQueue<ILayoutable>(v => !v.IsArrangeValid);
-        private readonly Action _executeLayoutPass;
-        private List<EffectiveViewportChangedListener>? _effectiveViewportChangedListeners;
-        private bool _disposed;
-        private bool _queued;
-        private bool _running;
-
-        public LayoutManager(ILayoutRoot owner)
-        {
-            _owner = owner ?? throw new ArgumentNullException(nameof(owner));
-            _executeLayoutPass = ExecuteLayoutPass;
-        }
-
-        public virtual event EventHandler? LayoutUpdated;
-
-        /// <inheritdoc/>
-        public virtual void InvalidateMeasure(ILayoutable control)
-        {
-            control = control ?? throw new ArgumentNullException(nameof(control));
-            Dispatcher.UIThread.VerifyAccess();
-
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (!control.IsAttachedToVisualTree)
-            {
-#if DEBUG
-                throw new AvaloniaInternalException(
-                    "LayoutManager.InvalidateMeasure called on a control that is detached from the visual tree.");
-#else
-                return;
-#endif
-            }
-
-            if (control.VisualRoot != _owner)
-            {
-                throw new ArgumentException("Attempt to call InvalidateMeasure on wrong LayoutManager.");
-            }
-
-            _toMeasure.Enqueue(control);
-            _toArrange.Enqueue(control);
-            QueueLayoutPass();
-        }
-
-        /// <inheritdoc/>
-        public virtual void InvalidateArrange(ILayoutable control)
-        {
-            control = control ?? throw new ArgumentNullException(nameof(control));
-            Dispatcher.UIThread.VerifyAccess();
-
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (!control.IsAttachedToVisualTree)
-            {
-#if DEBUG
-                throw new AvaloniaInternalException(
-                    "LayoutManager.InvalidateArrange called on a control that is detached from the visual tree.");
-#else
-                return;
-#endif
-            }
-
-            if (control.VisualRoot != _owner)
-            {
-                throw new ArgumentException("Attempt to call InvalidateArrange on wrong LayoutManager.");
-            }
-
-            _toArrange.Enqueue(control);
-            QueueLayoutPass();
-        }
-
-        /// <inheritdoc/>
-        public virtual void ExecuteLayoutPass()
-        {
-            Dispatcher.UIThread.VerifyAccess();
-
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (!_running)
-            {
-                Stopwatch? stopwatch = null;
-
-                const LogEventLevel timingLogLevel = LogEventLevel.Information;
-                bool captureTiming = Logger.IsEnabled(timingLogLevel, LogArea.Layout);
-
-                if (captureTiming)
-                {
-                    Logger.TryGet(timingLogLevel, LogArea.Layout)?.Log(
-                        this,
-                        "Started layout pass. To measure: {Measure} To arrange: {Arrange}",
-                        _toMeasure.Count,
-                        _toArrange.Count);
-
-                    stopwatch = new Stopwatch();
-                    stopwatch.Start();
-                }
-
-                _toMeasure.BeginLoop(MaxPasses);
-                _toArrange.BeginLoop(MaxPasses);
-
-                try
-                {
-                    _running = true;
-
-                    for (var pass = 0; pass < MaxPasses; ++pass)
-                    {
-                        InnerLayoutPass();
-
-                        if (!RaiseEffectiveViewportChanged())
-                        {
-                            break;
-                        }
-                    }
-                }
-                finally
-                {
-                    _running = false;
-                }
-
-                _toMeasure.EndLoop();
-                _toArrange.EndLoop();
-
-                if (captureTiming)
-                {
-                    stopwatch!.Stop();
-
-                    Logger.TryGet(timingLogLevel, LogArea.Layout)?.Log(this, "Layout pass finished in {Time}", stopwatch.Elapsed);
-                }
-            }
-
-            _queued = false;
-            LayoutUpdated?.Invoke(this, EventArgs.Empty);
-        }
-
-        /// <inheritdoc/>
-        public virtual void ExecuteInitialLayoutPass()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            try
-            {
-                _running = true;
-                Measure(_owner);
-                Arrange(_owner);
-            }
-            finally
-            {
-                _running = false;
-            }
-
-            // Running the initial layout pass may have caused some control to be invalidated
-            // so run a full layout pass now (this usually due to scrollbars; its not known
-            // whether they will need to be shown until the layout pass has run and if the
-            // first guess was incorrect the layout will need to be updated).
-            ExecuteLayoutPass();
-        }
-
-        [Obsolete("Call ExecuteInitialLayoutPass without parameter")]
-        public void ExecuteInitialLayoutPass(ILayoutRoot root)
-        {
-            if (root != _owner)
-            {
-                throw new ArgumentException("ExecuteInitialLayoutPass called with incorrect root.");
-            }
-
-            ExecuteInitialLayoutPass();
-        }
-
-        public void Dispose()
-        {
-            _disposed = true;
-            _toMeasure.Dispose();
-            _toArrange.Dispose();
-        }
-
-        void ILayoutManager.RegisterEffectiveViewportListener(ILayoutable control)
-        {
-            _effectiveViewportChangedListeners ??= new List<EffectiveViewportChangedListener>();
-            _effectiveViewportChangedListeners.Add(new EffectiveViewportChangedListener(
-                control,
-                CalculateEffectiveViewport(control)));
-        }
-
-        void ILayoutManager.UnregisterEffectiveViewportListener(ILayoutable control)
-        {
-            if (_effectiveViewportChangedListeners is object)
-            {
-                for (var i = _effectiveViewportChangedListeners.Count - 1; i >= 0; --i)
-                {
-                    if (_effectiveViewportChangedListeners[i].Listener == control)
-                    {
-                        _effectiveViewportChangedListeners.RemoveAt(i);
-                    }
-                }
-            }
-        }
-
-        private void InnerLayoutPass()
-        {
-            for (var pass = 0; pass < MaxPasses; ++pass)
-            {
-                ExecuteMeasurePass();
-                ExecuteArrangePass();
-
-                if (_toMeasure.Count == 0)
-                {
-                    break;
-                }
-            }
-        }
-
-        private void ExecuteMeasurePass()
-        {
-            while (_toMeasure.Count > 0)
-            {
-                var control = _toMeasure.Dequeue();
-
-                if (!control.IsMeasureValid && control.IsAttachedToVisualTree)
-                {
-                    Measure(control);
-                }
-            }
-        }
-
-        private void ExecuteArrangePass()
-        {
-            while (_toArrange.Count > 0)
-            {
-                var control = _toArrange.Dequeue();
-
-                if (!control.IsArrangeValid && control.IsAttachedToVisualTree)
-                {
-                    Arrange(control);
-                }
-            }
-        }
-
-        private void Measure(ILayoutable control)
-        {
-            // Controls closest to the visual root need to be arranged first. We don't try to store
-            // ordered invalidation lists, instead we traverse the tree upwards, measuring the
-            // controls closest to the root first. This has been shown by benchmarks to be the
-            // fastest and most memory-efficient algorithm.
-            if (control.VisualParent is ILayoutable parent)
-            {
-                Measure(parent);
-            }
-
-            // If the control being measured has IsMeasureValid == true here then its measure was
-            // handed by an ancestor and can be ignored. The measure may have also caused the
-            // control to be removed.
-            if (!control.IsMeasureValid && control.IsAttachedToVisualTree)
-            {
-                if (control is ILayoutRoot root)
-                {
-                    root.Measure(Size.Infinity);
-                }
-                else if (control.PreviousMeasure.HasValue)
-                {
-                    control.Measure(control.PreviousMeasure.Value);
-                }
-            }
-        }
-
-        private void Arrange(ILayoutable control)
-        {
-            if (control.VisualParent is ILayoutable parent)
-            {
-                Arrange(parent);
-            }
-
-            if (!control.IsArrangeValid && control.IsAttachedToVisualTree)
-            {
-                if (control is IEmbeddedLayoutRoot embeddedRoot)
-                    control.Arrange(new Rect(embeddedRoot.AllocatedSize));
-                else if (control is ILayoutRoot root)
-                    control.Arrange(new Rect(root.DesiredSize));
-                else if (control.PreviousArrange != null)
-                {
-                    // Has been observed that PreviousArrange sometimes is null, probably a bug somewhere else.
-                    // Condition observed: control.VisualParent is Scrollbar, control is Border.
-                    control.Arrange(control.PreviousArrange.Value);
-                }
-            }
-        }
-
-        private void QueueLayoutPass()
-        {
-            if (!_queued && !_running)
-            {
-                Dispatcher.UIThread.Post(_executeLayoutPass, DispatcherPriority.Layout);
-                _queued = true;
-            }
-        }
-
-        private bool RaiseEffectiveViewportChanged()
-        {
-            var startCount = _toMeasure.Count + _toArrange.Count;
-
-            if (_effectiveViewportChangedListeners is object)
-            {
-                var count = _effectiveViewportChangedListeners.Count;
-                var pool = ArrayPool<EffectiveViewportChangedListener>.Shared;
-                var listeners = pool.Rent(count);
-
-                _effectiveViewportChangedListeners.CopyTo(listeners);
-
-                try
-                {
-                    for (var i = 0; i < count; ++i)
-                    {
-                        var l = _effectiveViewportChangedListeners[i];
-
-                        if (!l.Listener.IsAttachedToVisualTree)
-                        {
-                            continue;
-                        }
-
-                        var viewport = CalculateEffectiveViewport(l.Listener);
-
-                        if (viewport != l.Viewport)
-                        {
-                            l.Listener.EffectiveViewportChanged(new EffectiveViewportChangedEventArgs(viewport));
-                            _effectiveViewportChangedListeners[i] = new EffectiveViewportChangedListener(l.Listener, viewport);
-                        }
-                    }
-                }
-                finally
-                {
-                    pool.Return(listeners, clearArray: true);
-                }
-            }
-
-            return startCount != _toMeasure.Count + _toArrange.Count;
-        }
-
-        private Rect CalculateEffectiveViewport(IVisual control)
-        {
-            var viewport = new Rect(0, 0, double.PositiveInfinity, double.PositiveInfinity);
-            CalculateEffectiveViewport(control, control, ref viewport);
-            return viewport;
-        }
-
-        private void CalculateEffectiveViewport(IVisual target, IVisual control, ref Rect viewport)
-        {
-            // Recurse until the top level control.
-            if (control.VisualParent is object)
-            {
-                CalculateEffectiveViewport(target, control.VisualParent, ref viewport);
-            }
-            else
-            {
-                viewport = new Rect(control.Bounds.Size);
-            }
-
-            // Apply the control clip bounds if it's not the target control. We don't apply it to
-            // the target control because it may itself be clipped to bounds and if so the viewport
-            // we calculate would be of no use.
-            if (control != target && control.ClipToBounds)
-            {
-                viewport = control.Bounds.Intersect(viewport);
-            }
-
-            // Translate the viewport into this control's coordinate space.
-            viewport = viewport.Translate(-control.Bounds.Position);
-
-            if (control != target && control.RenderTransform is object)
-            {
-                var origin = control.RenderTransformOrigin.ToPixels(control.Bounds.Size);
-                var offset = Matrix.CreateTranslation(origin);
-                var renderTransform = (-offset) * control.RenderTransform.Value.Invert() * (offset);
-                viewport = viewport.TransformToAABB(renderTransform);
-            }
-        }
-
-        private readonly struct EffectiveViewportChangedListener
-        {
-            public EffectiveViewportChangedListener(ILayoutable listener, Rect viewport)
-            {
-                Listener = listener;
-                Viewport = viewport;
-            }
-
-            public ILayoutable Listener { get; }
-            public Rect Viewport { get; }
-        }
-    }
-}
diff --git a/src/Avalonia.Layout/Layoutable.cs b/src/Avalonia.Layout/Layoutable.cs
deleted file mode 100644
index 09e0c4263a..0000000000
--- a/src/Avalonia.Layout/Layoutable.cs
+++ /dev/null
@@ -1,837 +0,0 @@
-using System;
-using Avalonia.Logging;
-using Avalonia.VisualTree;
-
-#nullable enable
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Defines how a control aligns itself horizontally in its parent control.
-    /// </summary>
-    public enum HorizontalAlignment
-    {
-        /// <summary>
-        /// The control stretches to fill the width of the parent control.
-        /// </summary>
-        Stretch,
-
-        /// <summary>
-        /// The control aligns itself to the left of the parent control.
-        /// </summary>
-        Left,
-
-        /// <summary>
-        /// The control centers itself in the parent control.
-        /// </summary>
-        Center,
-
-        /// <summary>
-        /// The control aligns itself to the right of the parent control.
-        /// </summary>
-        Right,
-    }
-
-    /// <summary>
-    /// Defines how a control aligns itself vertically in its parent control.
-    /// </summary>
-    public enum VerticalAlignment
-    {
-        /// <summary>
-        /// The control stretches to fill the height of the parent control.
-        /// </summary>
-        Stretch,
-
-        /// <summary>
-        /// The control aligns itself to the top of the parent control.
-        /// </summary>
-        Top,
-
-        /// <summary>
-        /// The control centers itself within the parent control.
-        /// </summary>
-        Center,
-
-        /// <summary>
-        /// The control aligns itself to the bottom of the parent control.
-        /// </summary>
-        Bottom,
-    }
-
-    /// <summary>
-    /// Implements layout-related functionality for a control.
-    /// </summary>
-    public class Layoutable : Visual, ILayoutable
-    {
-        /// <summary>
-        /// Defines the <see cref="DesiredSize"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Layoutable, Size> DesiredSizeProperty =
-            AvaloniaProperty.RegisterDirect<Layoutable, Size>(nameof(DesiredSize), o => o.DesiredSize);
-
-        /// <summary>
-        /// Defines the <see cref="Width"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> WidthProperty =
-            AvaloniaProperty.Register<Layoutable, double>(nameof(Width), double.NaN);
-
-        /// <summary>
-        /// Defines the <see cref="Height"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> HeightProperty =
-            AvaloniaProperty.Register<Layoutable, double>(nameof(Height), double.NaN);
-
-        /// <summary>
-        /// Defines the <see cref="MinWidth"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MinWidthProperty =
-            AvaloniaProperty.Register<Layoutable, double>(nameof(MinWidth));
-
-        /// <summary>
-        /// Defines the <see cref="MaxWidth"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MaxWidthProperty =
-            AvaloniaProperty.Register<Layoutable, double>(nameof(MaxWidth), double.PositiveInfinity);
-
-        /// <summary>
-        /// Defines the <see cref="MinHeight"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MinHeightProperty =
-            AvaloniaProperty.Register<Layoutable, double>(nameof(MinHeight));
-
-        /// <summary>
-        /// Defines the <see cref="MaxHeight"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MaxHeightProperty =
-            AvaloniaProperty.Register<Layoutable, double>(nameof(MaxHeight), double.PositiveInfinity);
-
-        /// <summary>
-        /// Defines the <see cref="Margin"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Thickness> MarginProperty =
-            AvaloniaProperty.Register<Layoutable, Thickness>(nameof(Margin));
-
-        /// <summary>
-        /// Defines the <see cref="HorizontalAlignment"/> property.
-        /// </summary>
-        public static readonly StyledProperty<HorizontalAlignment> HorizontalAlignmentProperty =
-            AvaloniaProperty.Register<Layoutable, HorizontalAlignment>(nameof(HorizontalAlignment));
-
-        /// <summary>
-        /// Defines the <see cref="VerticalAlignment"/> property.
-        /// </summary>
-        public static readonly StyledProperty<VerticalAlignment> VerticalAlignmentProperty =
-            AvaloniaProperty.Register<Layoutable, VerticalAlignment>(nameof(VerticalAlignment));
-
-        /// <summary>
-        /// Defines the <see cref="UseLayoutRoundingProperty"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> UseLayoutRoundingProperty =
-            AvaloniaProperty.Register<Layoutable, bool>(nameof(UseLayoutRounding), defaultValue: true, inherits: true);
-
-        private bool _measuring;
-        private Size? _previousMeasure;
-        private Rect? _previousArrange;
-        private EventHandler<EffectiveViewportChangedEventArgs>? _effectiveViewportChanged;
-        private EventHandler? _layoutUpdated;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="Layoutable"/> class.
-        /// </summary>
-        static Layoutable()
-        {
-            AffectsMeasure<Layoutable>(
-                IsVisibleProperty,
-                WidthProperty,
-                HeightProperty,
-                MinWidthProperty,
-                MaxWidthProperty,
-                MinHeightProperty,
-                MaxHeightProperty,
-                MarginProperty,
-                HorizontalAlignmentProperty,
-                VerticalAlignmentProperty);
-        }
-
-        /// <summary>
-        /// Occurs when the element's effective viewport changes.
-        /// </summary>
-        public event EventHandler<EffectiveViewportChangedEventArgs>? EffectiveViewportChanged
-        {
-            add
-            {
-                if (_effectiveViewportChanged is null && VisualRoot is ILayoutRoot r)
-                {
-                    r.LayoutManager.RegisterEffectiveViewportListener(this);
-                }
-
-                _effectiveViewportChanged += value;
-            }
-
-            remove
-            {
-                _effectiveViewportChanged -= value;
-
-                if (_effectiveViewportChanged is null && VisualRoot is ILayoutRoot r)
-                {
-                    r.LayoutManager.UnregisterEffectiveViewportListener(this);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Occurs when a layout pass completes for the control.
-        /// </summary>
-        public event EventHandler? LayoutUpdated
-        {
-            add
-            {
-                if (_layoutUpdated is null && VisualRoot is ILayoutRoot r)
-                {
-                    r.LayoutManager.LayoutUpdated += LayoutManagedLayoutUpdated;
-                }
-
-                _layoutUpdated += value;
-            }
-
-            remove
-            {
-                _layoutUpdated -= value;
-
-                if (_layoutUpdated is null && VisualRoot is ILayoutRoot r)
-                {
-                    r.LayoutManager.LayoutUpdated -= LayoutManagedLayoutUpdated;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the width of the element.
-        /// </summary>
-        public double Width
-        {
-            get { return GetValue(WidthProperty); }
-            set { SetValue(WidthProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the height of the element.
-        /// </summary>
-        public double Height
-        {
-            get { return GetValue(HeightProperty); }
-            set { SetValue(HeightProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum width of the element.
-        /// </summary>
-        public double MinWidth
-        {
-            get { return GetValue(MinWidthProperty); }
-            set { SetValue(MinWidthProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum width of the element.
-        /// </summary>
-        public double MaxWidth
-        {
-            get { return GetValue(MaxWidthProperty); }
-            set { SetValue(MaxWidthProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum height of the element.
-        /// </summary>
-        public double MinHeight
-        {
-            get { return GetValue(MinHeightProperty); }
-            set { SetValue(MinHeightProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum height of the element.
-        /// </summary>
-        public double MaxHeight
-        {
-            get { return GetValue(MaxHeightProperty); }
-            set { SetValue(MaxHeightProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the margin around the element.
-        /// </summary>
-        public Thickness Margin
-        {
-            get { return GetValue(MarginProperty); }
-            set { SetValue(MarginProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the element's preferred horizontal alignment in its parent.
-        /// </summary>
-        public HorizontalAlignment HorizontalAlignment
-        {
-            get { return GetValue(HorizontalAlignmentProperty); }
-            set { SetValue(HorizontalAlignmentProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the element's preferred vertical alignment in its parent.
-        /// </summary>
-        public VerticalAlignment VerticalAlignment
-        {
-            get { return GetValue(VerticalAlignmentProperty); }
-            set { SetValue(VerticalAlignmentProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets the size that this element computed during the measure pass of the layout process.
-        /// </summary>
-        public Size DesiredSize
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the control's layout measure is valid.
-        /// </summary>
-        public bool IsMeasureValid
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the control's layouts arrange is valid.
-        /// </summary>
-        public bool IsArrangeValid
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets or sets a value that determines whether the element should be snapped to pixel
-        /// boundaries at layout time.
-        /// </summary>
-        public bool UseLayoutRounding
-        {
-            get { return GetValue(UseLayoutRoundingProperty); }
-            set { SetValue(UseLayoutRoundingProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets the available size passed in the previous layout pass, if any.
-        /// </summary>
-        Size? ILayoutable.PreviousMeasure => _previousMeasure;
-
-        /// <summary>
-        /// Gets the layout rect passed in the previous layout pass, if any.
-        /// </summary>
-        Rect? ILayoutable.PreviousArrange => _previousArrange;
-
-        /// <summary>
-        /// Creates the visual children of the control, if necessary
-        /// </summary>
-        public virtual void ApplyTemplate()
-        {
-        }
-
-        /// <summary>
-        /// Carries out a measure of the control.
-        /// </summary>
-        /// <param name="availableSize">The available size for the control.</param>
-        public void Measure(Size availableSize)
-        {
-            if (double.IsNaN(availableSize.Width) || double.IsNaN(availableSize.Height))
-            {
-                throw new InvalidOperationException("Cannot call Measure using a size with NaN values.");
-            }
-
-            if (!IsMeasureValid || _previousMeasure != availableSize)
-            {
-                var previousDesiredSize = DesiredSize;
-                var desiredSize = default(Size);
-
-                IsMeasureValid = true;
-
-                try
-                {
-                    _measuring = true;
-                    desiredSize = MeasureCore(availableSize);
-                }
-                finally
-                {
-                    _measuring = false;
-                }
-
-                if (IsInvalidSize(desiredSize))
-                {
-                    throw new InvalidOperationException("Invalid size returned for Measure.");
-                }
-
-                DesiredSize = desiredSize;
-                _previousMeasure = availableSize;
-
-                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Measure requested {DesiredSize}", DesiredSize);
-
-                if (DesiredSize != previousDesiredSize)
-                {
-                    this.GetVisualParent<ILayoutable>()?.ChildDesiredSizeChanged(this);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Arranges the control and its children.
-        /// </summary>
-        /// <param name="rect">The control's new bounds.</param>
-        public void Arrange(Rect rect)
-        {
-            if (IsInvalidRect(rect))
-            {
-                throw new InvalidOperationException("Invalid Arrange rectangle.");
-            }
-
-            if (!IsMeasureValid)
-            {
-                Measure(_previousMeasure ?? rect.Size);
-            }
-
-            if (!IsArrangeValid || _previousArrange != rect)
-            {
-                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Arrange to {Rect} ", rect);
-
-                IsArrangeValid = true;
-                ArrangeCore(rect);
-                _previousArrange = rect;
-            }
-        }
-
-        /// <summary>
-        /// Invalidates the measurement of the control and queues a new layout pass.
-        /// </summary>
-        public void InvalidateMeasure()
-        {
-            if (IsMeasureValid)
-            {
-                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Invalidated measure");
-
-                IsMeasureValid = false;
-                IsArrangeValid = false;
-
-                if (((ILayoutable)this).IsAttachedToVisualTree)
-                {
-                    (VisualRoot as ILayoutRoot)?.LayoutManager.InvalidateMeasure(this);
-                    InvalidateVisual();
-                }
-                OnMeasureInvalidated();
-            }
-        }
-
-        /// <summary>
-        /// Invalidates the arrangement of the control and queues a new layout pass.
-        /// </summary>
-        public void InvalidateArrange()
-        {
-            if (IsArrangeValid)
-            {
-                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Invalidated arrange");
-
-                IsArrangeValid = false;
-                (VisualRoot as ILayoutRoot)?.LayoutManager?.InvalidateArrange(this);
-                InvalidateVisual();
-            }
-        }
-
-        /// <inheritdoc/>
-        void ILayoutable.ChildDesiredSizeChanged(ILayoutable control)
-        {
-            if (!_measuring)
-            {
-                InvalidateMeasure();
-            }
-        }
-
-        void ILayoutable.EffectiveViewportChanged(EffectiveViewportChangedEventArgs e)
-        {
-            _effectiveViewportChanged?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Marks a property as affecting the control's measurement.
-        /// </summary>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a control's static constructor, any change to the
-        /// property will cause <see cref="InvalidateMeasure"/> to be called on the element.
-        /// </remarks>
-        [Obsolete("Use AffectsMeasure<T> and specify the control type.")]
-        protected static void AffectsMeasure(params AvaloniaProperty[] properties)
-        {
-            AffectsMeasure<Layoutable>(properties);
-        }
-
-        /// <summary>
-        /// Marks a property as affecting the control's measurement.
-        /// </summary>
-        /// <typeparam name="T">The control which the property affects.</typeparam>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a control's static constructor, any change to the
-        /// property will cause <see cref="InvalidateMeasure"/> to be called on the element.
-        /// </remarks>
-        protected static void AffectsMeasure<T>(params AvaloniaProperty[] properties)
-            where T : class, ILayoutable
-        {
-            void Invalidate(AvaloniaPropertyChangedEventArgs e)
-            {
-                (e.Sender as T)?.InvalidateMeasure();
-            }
-
-            foreach (var property in properties)
-            {
-                property.Changed.Subscribe(Invalidate);
-            }
-        }
-
-        /// <summary>
-        /// Marks a property as affecting the control's arrangement.
-        /// </summary>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a control's static constructor, any change to the
-        /// property will cause <see cref="InvalidateArrange"/> to be called on the element.
-        /// </remarks>
-        [Obsolete("Use AffectsArrange<T> and specify the control type.")]
-        protected static void AffectsArrange(params AvaloniaProperty[] properties)
-        {
-            AffectsArrange<Layoutable>(properties);
-        }
-
-        /// <summary>
-        /// Marks a property as affecting the control's arrangement.
-        /// </summary>
-        /// <typeparam name="T">The control which the property affects.</typeparam>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a control's static constructor, any change to the
-        /// property will cause <see cref="InvalidateArrange"/> to be called on the element.
-        /// </remarks>
-        protected static void AffectsArrange<T>(params AvaloniaProperty[] properties)
-            where T : class, ILayoutable
-        {
-            void Invalidate(AvaloniaPropertyChangedEventArgs e)
-            {
-                (e.Sender as T)?.InvalidateArrange();
-            }
-
-            foreach (var property in properties)
-            {
-                property.Changed.Subscribe(Invalidate);
-            }
-        }
-
-        /// <summary>
-        /// The default implementation of the control's measure pass.
-        /// </summary>
-        /// <param name="availableSize">The size available to the control.</param>
-        /// <returns>The desired size for the control.</returns>
-        /// <remarks>
-        /// This method calls <see cref="MeasureOverride(Size)"/> which is probably the method you
-        /// want to override in order to modify a control's arrangement.
-        /// </remarks>
-        protected virtual Size MeasureCore(Size availableSize)
-        {
-            if (IsVisible)
-            {
-                var margin = Margin;
-
-                ApplyStyling();
-                ApplyTemplate();
-
-                var constrained = LayoutHelper.ApplyLayoutConstraints(
-                    this,
-                    availableSize.Deflate(margin));
-                var measured = MeasureOverride(constrained);
-
-                var width = measured.Width;
-                var height = measured.Height;
-
-                {
-                    double widthCache = Width;
-
-                    if (!double.IsNaN(widthCache))
-                    {
-                        width = widthCache;
-                    }
-                }
-
-                width = Math.Min(width, MaxWidth);
-                width = Math.Max(width, MinWidth);
-
-                {
-                    double heightCache = Height;
-
-                    if (!double.IsNaN(heightCache))
-                    {
-                        height = heightCache;
-                    }
-                }
-
-                height = Math.Min(height, MaxHeight);
-                height = Math.Max(height, MinHeight);
-
-                width = Math.Min(width, availableSize.Width);
-                height = Math.Min(height, availableSize.Height);
-
-                if (UseLayoutRounding)
-                {
-                    var scale = LayoutHelper.GetLayoutScale(this);
-                    width = LayoutHelper.RoundLayoutValue(width, scale);
-                    height = LayoutHelper.RoundLayoutValue(height, scale);
-                }
-
-                return NonNegative(new Size(width, height).Inflate(margin));
-            }
-            else
-            {
-                return new Size();
-            }
-        }
-
-        /// <summary>
-        /// Measures the control and its child elements as part of a layout pass.
-        /// </summary>
-        /// <param name="availableSize">The size available to the control.</param>
-        /// <returns>The desired size for the control.</returns>
-        protected virtual Size MeasureOverride(Size availableSize)
-        {
-            double width = 0;
-            double height = 0;
-
-            var visualChildren = VisualChildren;
-            var visualCount = visualChildren.Count;
-
-            for (var i = 0; i < visualCount; i++)
-            {
-                IVisual visual = visualChildren[i];
-
-                if (visual is ILayoutable layoutable)
-                {
-                    layoutable.Measure(availableSize);
-                    width = Math.Max(width, layoutable.DesiredSize.Width);
-                    height = Math.Max(height, layoutable.DesiredSize.Height);
-                }
-            }
-
-            return new Size(width, height);
-        }
-
-        /// <summary>
-        /// The default implementation of the control's arrange pass.
-        /// </summary>
-        /// <param name="finalRect">The control's new bounds.</param>
-        /// <remarks>
-        /// This method calls <see cref="ArrangeOverride(Size)"/> which is probably the method you
-        /// want to override in order to modify a control's arrangement.
-        /// </remarks>
-        protected virtual void ArrangeCore(Rect finalRect)
-        {
-            if (IsVisible)
-            {
-                var margin = Margin;
-                var originX = finalRect.X + margin.Left;
-                var originY = finalRect.Y + margin.Top;
-                var availableSizeMinusMargins = new Size(
-                    Math.Max(0, finalRect.Width - margin.Left - margin.Right),
-                    Math.Max(0, finalRect.Height - margin.Top - margin.Bottom));
-                var horizontalAlignment = HorizontalAlignment;
-                var verticalAlignment = VerticalAlignment;
-                var size = availableSizeMinusMargins;
-                var scale = LayoutHelper.GetLayoutScale(this);
-                var useLayoutRounding = UseLayoutRounding;
-
-                if (horizontalAlignment != HorizontalAlignment.Stretch)
-                {
-                    size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - margin.Left - margin.Right));
-                }
-
-                if (verticalAlignment != VerticalAlignment.Stretch)
-                {
-                    size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - margin.Top - margin.Bottom));
-                }
-
-                size = LayoutHelper.ApplyLayoutConstraints(this, size);
-
-                if (useLayoutRounding)
-                {
-                    size = LayoutHelper.RoundLayoutSize(size, scale, scale);
-                    availableSizeMinusMargins = LayoutHelper.RoundLayoutSize(availableSizeMinusMargins, scale, scale);
-                }
-
-                size = ArrangeOverride(size).Constrain(size);
-
-                switch (horizontalAlignment)
-                {
-                    case HorizontalAlignment.Center:
-                    case HorizontalAlignment.Stretch:
-                        originX += (availableSizeMinusMargins.Width - size.Width) / 2;
-                        break;
-                    case HorizontalAlignment.Right:
-                        originX += availableSizeMinusMargins.Width - size.Width;
-                        break;
-                }
-
-                switch (verticalAlignment)
-                {
-                    case VerticalAlignment.Center:
-                    case VerticalAlignment.Stretch:
-                        originY += (availableSizeMinusMargins.Height - size.Height) / 2;
-                        break;
-                    case VerticalAlignment.Bottom:
-                        originY += availableSizeMinusMargins.Height - size.Height;
-                        break;
-                }
-
-                if (useLayoutRounding)
-                {
-                    originX = LayoutHelper.RoundLayoutValue(originX, scale);
-                    originY = LayoutHelper.RoundLayoutValue(originY, scale);
-                }
-
-                Bounds = new Rect(originX, originY, size.Width, size.Height);
-            }
-        }
-
-        /// <summary>
-        /// Positions child elements as part of a layout pass.
-        /// </summary>
-        /// <param name="finalSize">The size available to the control.</param>
-        /// <returns>The actual size used.</returns>
-        protected virtual Size ArrangeOverride(Size finalSize)
-        {
-            var arrangeRect = new Rect(finalSize);
-
-            var visualChildren = VisualChildren;
-            var visualCount = visualChildren.Count;
-
-            for (var i = 0; i < visualCount; i++)
-            {
-                IVisual visual = visualChildren[i];
-
-                if (visual is ILayoutable layoutable)
-                {
-                    layoutable.Arrange(arrangeRect);
-                }
-            }
-
-            return finalSize;
-        }
-
-        protected sealed override void InvalidateStyles()
-        {
-            base.InvalidateStyles();
-            InvalidateMeasure();
-        }
-
-        protected override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
-        {
-            base.OnAttachedToVisualTreeCore(e);
-
-            if (e.Root is ILayoutRoot r)
-            {
-                if (_layoutUpdated is object)
-                {
-                    r.LayoutManager.LayoutUpdated += LayoutManagedLayoutUpdated;
-                }
-
-                if (_effectiveViewportChanged is object)
-                {
-                    r.LayoutManager.RegisterEffectiveViewportListener(this);
-                }
-            }
-        }
-
-        protected override void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
-        {
-            if (e.Root is ILayoutRoot r)
-            {
-                if (_layoutUpdated is object)
-                {
-                    r.LayoutManager.LayoutUpdated -= LayoutManagedLayoutUpdated;
-                }
-
-                if (_effectiveViewportChanged is object)
-                {
-                    r.LayoutManager.UnregisterEffectiveViewportListener(this);
-                }
-            }
-
-            base.OnDetachedFromVisualTreeCore(e);
-        }
-
-        /// <summary>
-        /// Called by InvalidateMeasure
-        /// </summary>
-        protected virtual void OnMeasureInvalidated()
-        {
-        }
-
-        /// <inheritdoc/>
-        protected sealed override void OnVisualParentChanged(IVisual? oldParent, IVisual? newParent)
-        {
-            LayoutHelper.InvalidateSelfAndChildrenMeasure(this);
-
-            base.OnVisualParentChanged(oldParent, newParent);
-        }
-
-        /// <summary>
-        /// Called when the layout manager raises a LayoutUpdated event.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="e">The event args.</param>
-        private void LayoutManagedLayoutUpdated(object? sender, EventArgs e) => _layoutUpdated?.Invoke(this, e);
-
-        /// <summary>
-        /// Tests whether any of a <see cref="Rect"/>'s properties include negative values,
-        /// a NaN or Infinity.
-        /// </summary>
-        /// <param name="rect">The rect.</param>
-        /// <returns>True if the rect is invalid; otherwise false.</returns>
-        private static bool IsInvalidRect(Rect rect)
-        {
-            return rect.Width < 0 || rect.Height < 0 ||
-                double.IsInfinity(rect.X) || double.IsInfinity(rect.Y) ||
-                double.IsInfinity(rect.Width) || double.IsInfinity(rect.Height) ||
-                double.IsNaN(rect.X) || double.IsNaN(rect.Y) ||
-                double.IsNaN(rect.Width) || double.IsNaN(rect.Height);
-        }
-
-        /// <summary>
-        /// Tests whether any of a <see cref="Size"/>'s properties include negative values,
-        /// a NaN or Infinity.
-        /// </summary>
-        /// <param name="size">The size.</param>
-        /// <returns>True if the size is invalid; otherwise false.</returns>
-        private static bool IsInvalidSize(Size size)
-        {
-            return size.Width < 0 || size.Height < 0 ||
-                double.IsInfinity(size.Width) || double.IsInfinity(size.Height) ||
-                double.IsNaN(size.Width) || double.IsNaN(size.Height);
-        }
-
-        /// <summary>
-        /// Ensures neither component of a <see cref="Size"/> is negative.
-        /// </summary>
-        /// <param name="size">The size.</param>
-        /// <returns>The non-negative size.</returns>
-        private static Size NonNegative(Size size)
-        {
-            return new Size(Math.Max(size.Width, 0), Math.Max(size.Height, 0));
-        }
-    }
-}
diff --git a/src/Avalonia.Layout/Properties/AssemblyInfo.cs b/src/Avalonia.Layout/Properties/AssemblyInfo.cs
deleted file mode 100644
index efcbf184b5..0000000000
--- a/src/Avalonia.Layout/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Runtime.CompilerServices;
-using Avalonia.Metadata;
-
-[assembly: InternalsVisibleTo("Avalonia.Layout.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Layout")]
-
diff --git a/src/Avalonia.Layout/StackLayout.cs b/src/Avalonia.Layout/StackLayout.cs
deleted file mode 100644
index c63fe5e405..0000000000
--- a/src/Avalonia.Layout/StackLayout.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-// This source file is adapted from the WinUI project.
-// (https://github.com/microsoft/microsoft-ui-xaml)
-//
-// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
-
-using System;
-using System.Collections.Specialized;
-using Avalonia.Data;
-using Avalonia.Logging;
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Arranges elements into a single line (with spacing) that can be oriented horizontally or vertically.
-    /// </summary>
-    public class StackLayout : VirtualizingLayout, IFlowLayoutAlgorithmDelegates
-    {
-        /// <summary>
-        /// Defines the <see cref="DisableVirtualization"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> DisableVirtualizationProperty =
-            AvaloniaProperty.Register<StackLayout, bool>(nameof(DisableVirtualization));
-
-        /// <summary>
-        /// Defines the <see cref="Orientation"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Orientation> OrientationProperty =
-            AvaloniaProperty.Register<StackLayout, Orientation>(nameof(Orientation), Orientation.Vertical);
-
-        /// <summary>
-        /// Defines the <see cref="Spacing"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> SpacingProperty =
-            AvaloniaProperty.Register<StackLayout, double>(nameof(Spacing));
-
-        private readonly OrientationBasedMeasures _orientation = new OrientationBasedMeasures();
-
-        /// <summary>
-        /// Initializes a new instance of the StackLayout class.
-        /// </summary>
-        public StackLayout()
-        {
-            LayoutId = "StackLayout";
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether virtualization is disabled on the layout.
-        /// </summary>
-        public bool DisableVirtualization
-        {
-            get => GetValue(DisableVirtualizationProperty);
-            set => SetValue(DisableVirtualizationProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the axis along which items are laid out.
-        /// </summary>
-        /// <value>
-        /// One of the enumeration values that specifies the axis along which items are laid out.
-        /// The default is Vertical.
-        /// </value>
-        public Orientation Orientation
-        {
-            get => GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets a uniform distance (in pixels) between stacked items. It is applied in the
-        /// direction of the StackLayout's Orientation.
-        /// </summary>
-        public double Spacing
-        {
-            get => GetValue(SpacingProperty);
-            set => SetValue(SpacingProperty, value);
-        }
-
-        internal Rect GetExtent(
-            Size availableSize,
-            VirtualizingLayoutContext context,
-            ILayoutable? firstRealized,
-            int firstRealizedItemIndex,
-            Rect firstRealizedLayoutBounds,
-            ILayoutable? lastRealized,
-            int lastRealizedItemIndex,
-            Rect lastRealizedLayoutBounds)
-        {
-            var extent = new Rect();
-
-            // Constants
-            int itemsCount = context.ItemCount;
-            var stackState = (StackLayoutState)context.LayoutState!;
-            double averageElementSize = GetAverageElementSize(availableSize, context, stackState) + Spacing;
-
-            _orientation.SetMinorSize(ref extent, stackState.MaxArrangeBounds);
-            _orientation.SetMajorSize(ref extent, Math.Max(0.0f, itemsCount * averageElementSize - Spacing));
-            if (itemsCount > 0)
-            {
-                if (firstRealized != null)
-                {
-                    _orientation.SetMajorStart(
-                        ref extent,
-                        _orientation.MajorStart(firstRealizedLayoutBounds) - firstRealizedItemIndex * averageElementSize);
-                    var remainingItems = itemsCount - lastRealizedItemIndex - 1;
-                    _orientation.SetMajorSize(
-                        ref extent,
-                        _orientation.MajorEnd(lastRealizedLayoutBounds) -
-                            _orientation.MajorStart(extent) + 
-                            (remainingItems * averageElementSize));
-                }
-                else
-                {
-                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Estimating extent with no realized elements",
-                        LayoutId);
-                }
-            }
-
-            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Extent is ({Size}). Based on average {Average}",
-                LayoutId, extent.Size, averageElementSize);
-            return extent;
-        }
-
-        internal void OnElementMeasured(
-            ILayoutable element,
-            int index,
-            Size availableSize,
-            Size measureSize,
-            Size desiredSize,
-            Size provisionalArrangeSize,
-            VirtualizingLayoutContext context)
-        {
-            if (context is VirtualizingLayoutContext virtualContext)
-            {
-                var stackState = (StackLayoutState)virtualContext.LayoutState!;
-                var provisionalArrangeSizeWinRt = provisionalArrangeSize;
-                stackState.OnElementMeasured(
-                    index,
-                    _orientation.Major(provisionalArrangeSizeWinRt),
-                    _orientation.Minor(provisionalArrangeSizeWinRt));
-            }
-        }
-
-        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetMeasureSize(
-            int index,
-            Size availableSize,
-            VirtualizingLayoutContext context) => availableSize;
-
-        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetProvisionalArrangeSize(
-            int index,
-            Size measureSize,
-            Size desiredSize,
-            VirtualizingLayoutContext context)
-        {
-            var measureSizeMinor = _orientation.Minor(measureSize);
-            return _orientation.MinorMajorSize(
-                !double.IsInfinity(measureSizeMinor) ?
-                    Math.Max(measureSizeMinor, _orientation.Minor(desiredSize)) :
-                    _orientation.Minor(desiredSize),
-                _orientation.Major(desiredSize));
-        }
-
-        bool IFlowLayoutAlgorithmDelegates.Algorithm_ShouldBreakLine(int index, double remainingSpace) => true;
-
-        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForRealizationRect(
-            Size availableSize,
-            VirtualizingLayoutContext context) => GetAnchorForRealizationRect(availableSize, context);
-
-        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForTargetElement(
-            int targetIndex,
-            Size availableSize,
-            VirtualizingLayoutContext context)
-        {
-            double offset = double.NaN;
-            int index = -1;
-            int itemsCount = context.ItemCount;
-
-            if (targetIndex >= 0 && targetIndex < itemsCount)
-            {
-                index = targetIndex;
-                var state = (StackLayoutState)context.LayoutState!;
-                double averageElementSize = GetAverageElementSize(availableSize, context, state) + Spacing;
-                offset = index * averageElementSize + _orientation.MajorStart(state.FlowAlgorithm.LastExtent);
-            }
-
-            return new FlowLayoutAnchorInfo { Index = index, Offset = offset };
-        }
-
-        Rect IFlowLayoutAlgorithmDelegates.Algorithm_GetExtent(
-            Size availableSize,
-            VirtualizingLayoutContext context,
-            ILayoutable? firstRealized,
-            int firstRealizedItemIndex,
-            Rect firstRealizedLayoutBounds,
-            ILayoutable? lastRealized,
-            int lastRealizedItemIndex,
-            Rect lastRealizedLayoutBounds)
-        {
-            return GetExtent(
-                availableSize,
-                context,
-                firstRealized,
-                firstRealizedItemIndex,
-                firstRealizedLayoutBounds,
-                lastRealized,
-                lastRealizedItemIndex,
-                lastRealizedLayoutBounds);
-        }
-
-        void IFlowLayoutAlgorithmDelegates.Algorithm_OnElementMeasured(ILayoutable element, int index, Size availableSize, Size measureSize, Size desiredSize, Size provisionalArrangeSize, VirtualizingLayoutContext context)
-        {
-            OnElementMeasured(
-                element,
-                index,
-                availableSize,
-                measureSize,
-                desiredSize,
-                provisionalArrangeSize,
-                context);
-        }
-
-        void IFlowLayoutAlgorithmDelegates.Algorithm_OnLineArranged(int startIndex, int countInLine, double lineSize, VirtualizingLayoutContext context)
-        {
-        }
-
-        internal FlowLayoutAnchorInfo GetAnchorForRealizationRect(
-            Size availableSize,
-            VirtualizingLayoutContext context)
-        {
-            int anchorIndex = -1;
-            double offset = double.NaN;
-
-            // Constants
-            int itemsCount = context.ItemCount;
-            if (itemsCount > 0)
-            {
-                var realizationRect = context.RealizationRect;
-                var state = (StackLayoutState)context.LayoutState!;
-                var lastExtent = state.FlowAlgorithm.LastExtent;
-
-                double averageElementSize = GetAverageElementSize(availableSize, context, state) + Spacing;
-                double realizationWindowOffsetInExtent = _orientation.MajorStart(realizationRect) - _orientation.MajorStart(lastExtent);
-                double majorSize = _orientation.MajorSize(lastExtent) == 0 ? Math.Max(0.0, averageElementSize * itemsCount - Spacing) : _orientation.MajorSize(lastExtent);
-                if (itemsCount > 0 &&
-                    _orientation.MajorSize(realizationRect) >= 0 &&
-                    // MajorSize = 0 will account for when a nested repeater is outside the realization rect but still being measured. Also,
-                    // note that if we are measuring this repeater, then we are already realizing an element to figure out the size, so we could
-                    // just keep that element alive. It also helps in XYFocus scenarios to have an element realized for XYFocus to find a candidate
-                    // in the navigating direction.
-                    realizationWindowOffsetInExtent + _orientation.MajorSize(realizationRect) >= 0 && realizationWindowOffsetInExtent <= majorSize)
-                {
-                    anchorIndex = (int) (realizationWindowOffsetInExtent / averageElementSize);
-                    anchorIndex = Math.Max(0, Math.Min(itemsCount - 1, anchorIndex));
-                    offset = anchorIndex* averageElementSize + _orientation.MajorStart(lastExtent);
-                }
-        }
-
-            return new FlowLayoutAnchorInfo { Index = anchorIndex, Offset = offset, };
-        }
-
-        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
-        {
-            var state = context.LayoutState;
-            var stackState = state as StackLayoutState;
-            
-            if (stackState == null)
-            {
-                if (state != null)
-                {
-                    throw new InvalidOperationException("LayoutState must derive from StackLayoutState.");
-                }
-
-                // Custom deriving layouts could potentially be stateful.
-                // If that is the case, we will just create the base state required by UniformGridLayout ourselves.
-                stackState = new StackLayoutState();
-            }
-
-            stackState.InitializeForContext(context, this);
-        }
-
-        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
-        {
-            var stackState = (StackLayoutState)context.LayoutState!;
-            stackState.UninitializeForContext(context);
-        }
-
-        protected internal override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
-        {
-            ((StackLayoutState)context.LayoutState!).OnMeasureStart();
-
-            var desiredSize = GetFlowAlgorithm(context).Measure(
-                availableSize,
-                context,
-                false,
-                0,
-                Spacing,
-                int.MaxValue,
-                _orientation.ScrollOrientation,
-                DisableVirtualization,
-                LayoutId);
-
-            return new Size(desiredSize.Width, desiredSize.Height);
-        }
-
-        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
-        {
-            var value = GetFlowAlgorithm(context).Arrange(
-               finalSize,
-               context,
-               false,
-               FlowLayoutAlgorithm.LineAlignment.Start,
-               LayoutId);
-
-            return new Size(value.Width, value.Height);
-        }
-
-        protected internal override void OnItemsChangedCore(VirtualizingLayoutContext context, object? source, NotifyCollectionChangedEventArgs args)
-        {
-            GetFlowAlgorithm(context).OnItemsSourceChanged(source, args, context);
-            // Always invalidate layout to keep the view accurate.
-            InvalidateLayout();
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            if (change.Property == OrientationProperty)
-            {
-                var orientation = change.NewValue.GetValueOrDefault<Orientation>();
-
-                //Note: For StackLayout Vertical Orientation means we have a Vertical ScrollOrientation.
-                //Horizontal Orientation means we have a Horizontal ScrollOrientation.
-                _orientation.ScrollOrientation = orientation == Orientation.Horizontal ? ScrollOrientation.Horizontal : ScrollOrientation.Vertical;
-            }
-
-            InvalidateLayout();
-        }
-
-        private double GetAverageElementSize(
-            Size availableSize,
-            VirtualizingLayoutContext context,
-            StackLayoutState stackLayoutState)
-        {
-            double averageElementSize = 0;
-
-            if (context.ItemCount > 0)
-            {
-                if (stackLayoutState.TotalElementsMeasured == 0)
-                {
-                    var tmpElement = context.GetOrCreateElementAt(0, ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle);
-                    stackLayoutState.FlowAlgorithm.MeasureElement(tmpElement, 0, availableSize, context);
-                    context.RecycleElement(tmpElement);
-                }
-
-                averageElementSize = Math.Round(stackLayoutState.TotalElementSize / stackLayoutState.TotalElementsMeasured);
-            }
-
-            return averageElementSize;
-        }
-
-        private void InvalidateLayout() => InvalidateMeasure();
-
-        private FlowLayoutAlgorithm GetFlowAlgorithm(VirtualizingLayoutContext context) => ((StackLayoutState)context.LayoutState!).FlowAlgorithm;
-    }
-}
diff --git a/src/Avalonia.Layout/UniformGridLayout.cs b/src/Avalonia.Layout/UniformGridLayout.cs
deleted file mode 100644
index 3b82ece886..0000000000
--- a/src/Avalonia.Layout/UniformGridLayout.cs
+++ /dev/null
@@ -1,561 +0,0 @@
-// This source file is adapted from the WinUI project.
-// (https://github.com/microsoft/microsoft-ui-xaml)
-//
-// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
-
-using System;
-using System.Collections.Specialized;
-using Avalonia.Data;
-using Avalonia.Logging;
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Defines constants that specify how items are aligned on the non-scrolling or non-virtualizing axis.
-    /// </summary>
-    public enum UniformGridLayoutItemsJustification
-    {
-        /// <summary>
-        /// Items are aligned with the start of the row or column, with extra space at the end.
-        /// Spacing between items does not change.
-        /// </summary>
-        Start = 0,
-
-        /// <summary>
-        /// Items are aligned in the center of the row or column, with extra space at the start and
-        /// end. Spacing between items does not change.
-        /// </summary>
-        Center = 1,
-
-        /// <summary>
-        /// Items are aligned with the end of the row or column, with extra space at the start.
-        /// Spacing between items does not change.
-        /// </summary>
-        End = 2,
-
-        /// <summary>
-        /// Items are aligned so that extra space is added evenly before and after each item.
-        /// </summary>
-        SpaceAround = 3,
-
-        /// <summary>
-        /// Items are aligned so that extra space is added evenly between adjacent items. No space
-        /// is added at the start or end.
-        /// </summary>
-        SpaceBetween = 4,
-
-        SpaceEvenly = 5,
-    };
-
-    /// <summary>
-    /// Defines constants that specify how items are sized to fill the available space.
-    /// </summary>
-    public enum UniformGridLayoutItemsStretch
-    {
-        /// <summary>
-        /// The item retains its natural size. Use of extra space is determined by the
-        /// <see cref="UniformGridLayout.ItemsJustification"/> property.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// The item is sized to fill the available space in the non-scrolling direction. Item size
-        /// in the scrolling direction is not changed.
-        /// </summary>
-        Fill = 1,
-
-        /// <summary>
-        /// The item is sized to both fill the available space in the non-scrolling direction and
-        /// maintain its aspect ratio.
-        /// </summary>
-        Uniform = 2,
-    };
-
-    /// <summary>
-    /// Positions elements sequentially from left to right or top to bottom in a wrapping layout.
-    /// </summary>
-    public class UniformGridLayout : VirtualizingLayout, IFlowLayoutAlgorithmDelegates
-    {
-        /// <summary>
-        /// Defines the <see cref="ItemsJustification"/> property.
-        /// </summary>
-        public static readonly StyledProperty<UniformGridLayoutItemsJustification> ItemsJustificationProperty =
-            AvaloniaProperty.Register<UniformGridLayout, UniformGridLayoutItemsJustification>(nameof(ItemsJustification));
-
-        /// <summary>
-        /// Defines the <see cref="ItemsStretch"/> property.
-        /// </summary>
-        public static readonly StyledProperty<UniformGridLayoutItemsStretch> ItemsStretchProperty =
-            AvaloniaProperty.Register<UniformGridLayout, UniformGridLayoutItemsStretch>(nameof(ItemsStretch));
-
-        /// <summary>
-        /// Defines the <see cref="MinColumnSpacing"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MinColumnSpacingProperty =
-            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinColumnSpacing));
-
-        /// <summary>
-        /// Defines the <see cref="MinItemHeight"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MinItemHeightProperty =
-            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinItemHeight));
-
-        /// <summary>
-        /// Defines the <see cref="MinItemWidth"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MinItemWidthProperty =
-            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinItemWidth));
-
-        /// <summary>
-        /// Defines the <see cref="MinRowSpacing"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MinRowSpacingProperty =
-            AvaloniaProperty.Register<UniformGridLayout, double>(nameof(MinRowSpacing));
-
-        /// <summary>
-        /// Defines the <see cref="MaximumRowsOrColumnsProperty"/> property.
-        /// </summary>
-        public static readonly StyledProperty<int> MaximumRowsOrColumnsProperty =
-            AvaloniaProperty.Register<UniformGridLayout, int>(nameof(MinItemWidth));
-
-        /// <summary>
-        /// Defines the <see cref="Orientation"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Orientation> OrientationProperty =
-            StackLayout.OrientationProperty.AddOwner<UniformGridLayout>();
-
-        private readonly OrientationBasedMeasures _orientation = new OrientationBasedMeasures();
-        private double _minItemWidth = double.NaN;
-        private double _minItemHeight = double.NaN;
-        private double _minRowSpacing;
-        private double _minColumnSpacing;
-        private UniformGridLayoutItemsJustification _itemsJustification;
-        private UniformGridLayoutItemsStretch _itemsStretch;
-        private int _maximumRowsOrColumns = int.MaxValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UniformGridLayout"/> class.
-        /// </summary>
-        public UniformGridLayout()
-        {
-            LayoutId = "UniformGridLayout";
-        } 
-
-        static UniformGridLayout()
-        {
-            OrientationProperty.OverrideDefaultValue<UniformGridLayout>(Orientation.Horizontal);
-        }
-
-        /// <summary>
-        /// Gets or sets a value that indicates how items are aligned on the non-scrolling or non-
-        /// virtualizing axis.
-        /// </summary>
-        /// <value>
-        /// An enumeration value that indicates how items are aligned. The default is Start.
-        /// </value>
-        public UniformGridLayoutItemsJustification ItemsJustification
-        {
-            get => GetValue(ItemsJustificationProperty);
-            set => SetValue(ItemsJustificationProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value that indicates how items are sized to fill the available space.
-        /// </summary>
-        /// <value>
-        /// An enumeration value that indicates how items are sized to fill the available space.
-        /// The default is None.
-        /// </value>
-        /// <remarks>
-        /// This property enables adaptive layout behavior where the items are sized to fill the
-        /// available space along the non-scrolling axis, and optionally maintain their aspect ratio.
-        /// </remarks>
-        public UniformGridLayoutItemsStretch ItemsStretch
-        {
-            get => GetValue(ItemsStretchProperty);
-            set => SetValue(ItemsStretchProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum space between items on the horizontal axis.
-        /// </summary>
-        /// <remarks>
-        /// The spacing may exceed this minimum value when <see cref="ItemsJustification"/> is set
-        /// to SpaceEvenly, SpaceAround, or SpaceBetween.
-        /// </remarks>
-        public double MinColumnSpacing
-        {
-            get => GetValue(MinColumnSpacingProperty);
-            set => SetValue(MinColumnSpacingProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum height of each item.
-        /// </summary>
-        /// <value>
-        /// The minimum height (in pixels) of each item. The default is NaN, in which case the
-        /// height of the first item is used as the minimum.
-        /// </value>
-        public double MinItemHeight
-        {
-            get => GetValue(MinItemHeightProperty);
-            set => SetValue(MinItemHeightProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum width of each item.
-        /// </summary>
-        /// <value>
-        /// The minimum width (in pixels) of each item. The default is NaN, in which case the width
-        /// of the first item is used as the minimum.
-        /// </value>
-        public double MinItemWidth
-        {
-            get => GetValue(MinItemWidthProperty);
-            set => SetValue(MinItemWidthProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum space between items on the vertical axis.
-        /// </summary>
-        /// <remarks>
-        /// The spacing may exceed this minimum value when <see cref="ItemsJustification"/> is set
-        /// to SpaceEvenly, SpaceAround, or SpaceBetween.
-        /// </remarks>
-        public double MinRowSpacing
-        {
-            get => GetValue(MinRowSpacingProperty);
-            set => SetValue(MinRowSpacingProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum row or column count.
-        /// </summary>
-        public int MaximumRowsOrColumns
-        {
-            get => GetValue(MaximumRowsOrColumnsProperty);
-            set => SetValue(MaximumRowsOrColumnsProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the axis along which items are laid out.
-        /// </summary>
-        /// <value>
-        /// One of the enumeration values that specifies the axis along which items are laid out.
-        /// The default is Vertical.
-        /// </value>
-        public Orientation Orientation
-        {
-            get => GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
-
-        internal double LineSpacing => Orientation == Orientation.Horizontal ? _minRowSpacing : _minColumnSpacing;
-        internal double MinItemSpacing => Orientation == Orientation.Horizontal ? _minColumnSpacing : _minRowSpacing;
-
-        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetMeasureSize(
-            int index,
-            Size availableSize,
-            VirtualizingLayoutContext context)
-        {
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            return new Size(gridState.EffectiveItemWidth, gridState.EffectiveItemHeight);
-        }
-
-        Size IFlowLayoutAlgorithmDelegates.Algorithm_GetProvisionalArrangeSize(
-            int index,
-            Size measureSize,
-            Size desiredSize,
-            VirtualizingLayoutContext context)
-        {
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            return new Size(gridState.EffectiveItemWidth, gridState.EffectiveItemHeight);
-        }
-
-        bool IFlowLayoutAlgorithmDelegates.Algorithm_ShouldBreakLine(int index, double remainingSpace) => remainingSpace < 0;
-
-        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForRealizationRect(
-            Size availableSize,
-            VirtualizingLayoutContext context)
-        {
-            Rect bounds = new Rect(double.NaN, double.NaN, double.NaN, double.NaN);
-            int anchorIndex = -1;
-
-            int itemsCount = context.ItemCount;
-            var realizationRect = context.RealizationRect;
-            if (itemsCount > 0 && _orientation.MajorSize(realizationRect) > 0)
-            {
-                var gridState = (UniformGridLayoutState)context.LayoutState!;
-                var lastExtent = gridState.FlowAlgorithm.LastExtent;
-                var itemsPerLine = Math.Min( // note use of unsigned ints
-                    Math.Max(1u, (uint)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context))),
-                    Math.Max(1u, (uint)_maximumRowsOrColumns));
-                var majorSize = (itemsCount / itemsPerLine) * GetMajorSizeWithSpacing(context);
-                var realizationWindowStartWithinExtent = _orientation.MajorStart(realizationRect) - _orientation.MajorStart(lastExtent);
-                if ((realizationWindowStartWithinExtent + _orientation.MajorSize(realizationRect)) >= 0 && realizationWindowStartWithinExtent <= majorSize)
-                {
-                    double offset = Math.Max(0.0, _orientation.MajorStart(realizationRect) - _orientation.MajorStart(lastExtent));
-                    int anchorRowIndex = (int)(offset / GetMajorSizeWithSpacing(context));
-
-                    anchorIndex = (int)Math.Max(0, Math.Min(itemsCount - 1, anchorRowIndex * itemsPerLine));
-                    bounds = GetLayoutRectForDataIndex(availableSize, anchorIndex, lastExtent, context);
-                }
-            }
-
-            return new FlowLayoutAnchorInfo
-            {
-                Index = anchorIndex,
-                Offset = _orientation.MajorStart(bounds)
-            };
-        }
-
-        FlowLayoutAnchorInfo IFlowLayoutAlgorithmDelegates.Algorithm_GetAnchorForTargetElement(
-            int targetIndex,
-            Size availableSize,
-            VirtualizingLayoutContext context)
-        {
-            int index = -1;
-            double offset = double.NaN;
-            int count = context.ItemCount;
-            if (targetIndex >= 0 && targetIndex < count)
-            {
-                int itemsPerLine = (int)Math.Min( // note use of unsigned ints
-                    Math.Max(1u, (uint)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context))),
-                    Math.Max(1u, _maximumRowsOrColumns));
-                int indexOfFirstInLine = (targetIndex / itemsPerLine) * itemsPerLine;
-                index = indexOfFirstInLine;
-                var state = (UniformGridLayoutState)context.LayoutState!;
-                offset = _orientation.MajorStart(GetLayoutRectForDataIndex(availableSize, indexOfFirstInLine, state.FlowAlgorithm.LastExtent, context));
-            }
-
-            return new FlowLayoutAnchorInfo
-            {
-                Index = index,
-                Offset = offset
-            };
-        }
-
-        Rect IFlowLayoutAlgorithmDelegates.Algorithm_GetExtent(
-            Size availableSize,
-            VirtualizingLayoutContext context,
-            ILayoutable? firstRealized,
-            int firstRealizedItemIndex,
-            Rect firstRealizedLayoutBounds,
-            ILayoutable? lastRealized,
-            int lastRealizedItemIndex,
-            Rect lastRealizedLayoutBounds)
-        {
-            var extent = new Rect();
-
-
-            // Constants
-            int itemsCount = context.ItemCount;
-            double availableSizeMinor = _orientation.Minor(availableSize);
-            int itemsPerLine =
-                (int)Math.Min( // note use of unsigned ints
-                    Math.Max(1u, !double.IsInfinity(availableSizeMinor)
-                        ? (uint)(availableSizeMinor / GetMinorSizeWithSpacing(context))
-                        : (uint)itemsCount),
-                Math.Max(1u, _maximumRowsOrColumns));
-            double lineSize = GetMajorSizeWithSpacing(context);
-
-            if (itemsCount > 0)
-            {
-                _orientation.SetMinorSize(
-                    ref extent,
-                    !double.IsInfinity(availableSizeMinor) && _itemsStretch == UniformGridLayoutItemsStretch.Fill ?
-                    availableSizeMinor :
-                    Math.Max(0.0, itemsPerLine * GetMinorSizeWithSpacing(context) - (double)MinItemSpacing));
-                _orientation.SetMajorSize(
-                    ref extent,
-                    Math.Max(0.0, (itemsCount / itemsPerLine) * lineSize - (double)LineSpacing));
-
-                if (firstRealized != null)
-                {
-                    _orientation.SetMajorStart(
-                        ref extent,
-                        _orientation.MajorStart(firstRealizedLayoutBounds) - (firstRealizedItemIndex / itemsPerLine) * lineSize);
-                    int remainingItems = itemsCount - lastRealizedItemIndex - 1;
-                    _orientation.SetMajorSize(
-                        ref extent,
-                        _orientation.MajorEnd(lastRealizedLayoutBounds) - _orientation.MajorStart(extent) + (remainingItems / itemsPerLine) * lineSize);
-                }
-                else
-                {
-                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Estimating extent with no realized elements", LayoutId);
-                }
-            }
-
-            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Extent is ({Size}). Based on lineSize {LineSize} and items per line {ItemsPerLine}",
-                LayoutId, extent.Size, lineSize, itemsPerLine);
-            return extent;
-        }
-
-        void IFlowLayoutAlgorithmDelegates.Algorithm_OnElementMeasured(ILayoutable element, int index, Size availableSize, Size measureSize, Size desiredSize, Size provisionalArrangeSize, VirtualizingLayoutContext context)
-        {
-        }
-
-        void IFlowLayoutAlgorithmDelegates.Algorithm_OnLineArranged(int startIndex, int countInLine, double lineSize, VirtualizingLayoutContext context)
-        {
-        }
-
-        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
-        {
-            var state = context.LayoutState;
-            var gridState = state as UniformGridLayoutState;
-            
-            if (gridState == null)
-            {
-                if (state != null)
-                {
-                    throw new InvalidOperationException("LayoutState must derive from UniformGridLayoutState.");
-                }
-
-                // Custom deriving layouts could potentially be stateful.
-                // If that is the case, we will just create the base state required by UniformGridLayout ourselves.
-                gridState = new UniformGridLayoutState();
-            }
-
-            gridState.InitializeForContext(context, this);
-        }
-
-        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
-        {
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            gridState.UninitializeForContext(context);
-        }
-
-        protected internal override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
-        {
-            // Set the width and height on the grid state. If the user already set them then use the preset. 
-            // If not, we have to measure the first element and get back a size which we're going to be using for the rest of the items.
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            gridState.EnsureElementSize(availableSize, context, _minItemWidth, _minItemHeight, _itemsStretch, Orientation, MinRowSpacing, MinColumnSpacing, _maximumRowsOrColumns);
-
-            var desiredSize = GetFlowAlgorithm(context).Measure(
-                availableSize,
-                context,
-                true,
-                MinItemSpacing,
-                LineSpacing,
-                _maximumRowsOrColumns,
-                _orientation.ScrollOrientation,
-                false,
-                LayoutId);
-
-            // If after Measure the first item is in the realization rect, then we revoke grid state's ownership,
-            // and only use the layout when to clear it when it's done.
-            gridState.EnsureFirstElementOwnership(context);
-
-            return desiredSize;
-        }
-
-        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
-        {
-            var value = GetFlowAlgorithm(context).Arrange(
-               finalSize,
-               context,
-               true,
-               (FlowLayoutAlgorithm.LineAlignment)_itemsJustification,
-               LayoutId);
-            return new Size(value.Width, value.Height);
-        }
-
-        protected internal override void OnItemsChangedCore(VirtualizingLayoutContext context, object? source, NotifyCollectionChangedEventArgs args)
-        {
-            GetFlowAlgorithm(context).OnItemsSourceChanged(source, args, context);
-            // Always invalidate layout to keep the view accurate.
-            InvalidateLayout();
-
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            gridState.ClearElementOnDataSourceChange(context, args);
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            if (change.Property == OrientationProperty)
-            {
-                var orientation = change.NewValue.GetValueOrDefault<Orientation>();
-
-                //Note: For UniformGridLayout Vertical Orientation means we have a Horizontal ScrollOrientation. Horizontal Orientation means we have a Vertical ScrollOrientation.
-                //i.e. the properties are the inverse of each other.
-                var scrollOrientation = (orientation == Orientation.Horizontal) ? ScrollOrientation.Vertical : ScrollOrientation.Horizontal;
-                _orientation.ScrollOrientation = scrollOrientation;
-            }
-            else if (change.Property == MinColumnSpacingProperty)
-            {
-                _minColumnSpacing = change.NewValue.GetValueOrDefault<double>();
-            }
-            else if (change.Property == MinRowSpacingProperty)
-            {
-                _minRowSpacing = change.NewValue.GetValueOrDefault<double>();
-            }
-            else if (change.Property == ItemsJustificationProperty)
-            {
-                _itemsJustification = change.NewValue.GetValueOrDefault<UniformGridLayoutItemsJustification>();
-            }
-            else if (change.Property == ItemsStretchProperty)
-            {
-                _itemsStretch = change.NewValue.GetValueOrDefault<UniformGridLayoutItemsStretch>();
-            }
-            else if (change.Property == MinItemWidthProperty)
-            {
-                _minItemWidth = change.NewValue.GetValueOrDefault<double>();
-            }
-            else if (change.Property == MinItemHeightProperty)
-            {
-                _minItemHeight = change.NewValue.GetValueOrDefault<double>();
-            }
-            else if (change.Property == MaximumRowsOrColumnsProperty)
-            {
-                _maximumRowsOrColumns = change.NewValue.GetValueOrDefault<int>();
-            }
-
-            InvalidateLayout();
-        }
-
-        private double GetMinorSizeWithSpacing(VirtualizingLayoutContext context)
-        {
-            var minItemSpacing = MinItemSpacing;
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            return _orientation.ScrollOrientation == ScrollOrientation.Vertical?
-                gridState.EffectiveItemWidth + minItemSpacing :
-                gridState.EffectiveItemHeight + minItemSpacing;
-        }
-
-        private double GetMajorSizeWithSpacing(VirtualizingLayoutContext context)
-        {
-            var lineSpacing = LineSpacing;
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            return _orientation.ScrollOrientation == ScrollOrientation.Vertical ?
-                gridState.EffectiveItemHeight + lineSpacing :
-                gridState.EffectiveItemWidth + lineSpacing;
-        }
-
-        Rect GetLayoutRectForDataIndex(
-            Size availableSize,
-            int index,
-            Rect lastExtent,
-            VirtualizingLayoutContext context)
-        {
-            int itemsPerLine = (int)Math.Min( //note use of unsigned ints
-                Math.Max(1u, (uint)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context))),
-                Math.Max(1u, _maximumRowsOrColumns));
-            int rowIndex = (int)(index / itemsPerLine);
-            int indexInRow = index - (rowIndex * itemsPerLine);
-
-            var gridState = (UniformGridLayoutState)context.LayoutState!;
-            Rect bounds = _orientation.MinorMajorRect(
-                indexInRow * GetMinorSizeWithSpacing(context) + _orientation.MinorStart(lastExtent),
-                rowIndex * GetMajorSizeWithSpacing(context) + _orientation.MajorStart(lastExtent),
-                _orientation.ScrollOrientation == ScrollOrientation.Vertical ? gridState.EffectiveItemWidth : gridState.EffectiveItemHeight,
-                _orientation.ScrollOrientation == ScrollOrientation.Vertical ? gridState.EffectiveItemHeight : gridState.EffectiveItemWidth);
-
-            return bounds;
-        }
-
-        private void InvalidateLayout() => InvalidateMeasure();
-
-        private FlowLayoutAlgorithm GetFlowAlgorithm(VirtualizingLayoutContext context) => ((UniformGridLayoutState)context.LayoutState!).FlowAlgorithm;
-    }
-}
diff --git a/src/Avalonia.Layout/WrapLayout/WrapLayout.cs b/src/Avalonia.Layout/WrapLayout/WrapLayout.cs
deleted file mode 100644
index aab0272f37..0000000000
--- a/src/Avalonia.Layout/WrapLayout/WrapLayout.cs
+++ /dev/null
@@ -1,336 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Data;
-using Avalonia.Layout;
-using System;
-using System.Collections.Specialized;
-
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// Arranges elements by wrapping them to fit the available space.
-    /// When <see cref="Orientation"/> is set to Orientation.Horizontal, element are arranged in rows until the available width is reached and then to a new row.
-    /// When <see cref="Orientation"/> is set to Orientation.Vertical, element are arranged in columns until the available height is reached.
-    /// </summary>
-    public class WrapLayout : VirtualizingLayout
-    {
-        /// <summary>
-        /// Gets or sets a uniform Horizontal distance (in pixels) between items when <see cref="Orientation"/> is set to Horizontal,
-        /// or between columns of items when <see cref="Orientation"/> is set to Vertical.
-        /// </summary>
-        public double HorizontalSpacing
-        {
-            get { return (double)GetValue(HorizontalSpacingProperty); }
-            set { SetValue(HorizontalSpacingProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="HorizontalSpacing"/> dependency property.
-        /// </summary>
-        public static readonly StyledProperty<double> HorizontalSpacingProperty =
-            AvaloniaProperty.Register<WrapLayout, double>(nameof(HorizontalSpacing), 0);
-
-        /// <summary>
-        /// Gets or sets a uniform Vertical distance (in pixels) between items when <see cref="Orientation"/> is set to Vertical,
-        /// or between rows of items when <see cref="Orientation"/> is set to Horizontal.
-        /// </summary>
-        public double VerticalSpacing
-        {
-            get { return (double)GetValue(VerticalSpacingProperty); }
-            set { SetValue(VerticalSpacingProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="VerticalSpacing"/> dependency property.
-        /// </summary>
-        public static readonly StyledProperty<double> VerticalSpacingProperty =
-            AvaloniaProperty.Register<WrapLayout, double>(
-                nameof(VerticalSpacing), 0d);
-
-        /// <summary>
-        /// Gets or sets the orientation of the WrapLayout.
-        /// Horizontal means that child controls will be added horizontally until the width of the panel is reached, then a new row is added to add new child controls.
-        /// Vertical means that children will be added vertically until the height of the panel is reached, then a new column is added.
-        /// </summary>
-        public Orientation Orientation
-        {
-            get { return (Orientation)GetValue(OrientationProperty); }
-            set { SetValue(OrientationProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="Orientation"/> dependency property.
-        /// </summary>
-        public static readonly StyledProperty<Orientation> OrientationProperty =
-            AvaloniaProperty.Register<WrapLayout, Orientation>(
-                nameof(Orientation),
-                Orientation.Horizontal);
-
-        /// <inheritdoc />
-        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
-        {
-            var state = new WrapLayoutState(context);
-            context.LayoutState = state;
-            base.InitializeForContextCore(context);
-        }
-
-        /// <inheritdoc />
-        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
-        {
-            context.LayoutState = null;
-            base.UninitializeForContextCore(context);
-        }
-
-        /// <inheritdoc />
-        protected internal override void OnItemsChangedCore(VirtualizingLayoutContext context, object? source, NotifyCollectionChangedEventArgs args)
-        {
-            var state = (WrapLayoutState)context.LayoutState!;
-
-            switch (args.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    state.RemoveFromIndex(args.NewStartingIndex);
-                    break;
-                case NotifyCollectionChangedAction.Move:
-                    int minIndex = Math.Min(args.NewStartingIndex, args.OldStartingIndex);
-                    state.RemoveFromIndex(minIndex);
-
-                    state.RecycleElementAt(args.OldStartingIndex);
-                    state.RecycleElementAt(args.NewStartingIndex);
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    state.RemoveFromIndex(args.OldStartingIndex);
-                    break;
-                case NotifyCollectionChangedAction.Replace:
-                    state.RemoveFromIndex(args.NewStartingIndex);
-                    state.RecycleElementAt(args.NewStartingIndex);
-                    break;
-                case NotifyCollectionChangedAction.Reset:
-                    state.Clear();
-                    break;
-            }
-
-            base.OnItemsChangedCore(context, source, args);
-        }
-
-        /// <inheritdoc />
-        protected internal override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
-        {
-            var totalMeasure = UvMeasure.Zero;
-            var parentMeasure = new UvMeasure(Orientation, availableSize.Width, availableSize.Height);
-            var spacingMeasure = new UvMeasure(Orientation, HorizontalSpacing, VerticalSpacing);
-            var realizationBounds = new UvBounds(Orientation, context.RealizationRect);
-            var position = UvMeasure.Zero;
-
-            var state = (WrapLayoutState)context.LayoutState!;
-            if (state.Orientation != Orientation)
-            {
-                state.SetOrientation(Orientation);
-            }
-
-            if (spacingMeasure.Equals(state.Spacing) == false)
-            {
-                state.ClearPositions();
-                state.Spacing = spacingMeasure;
-            }
-
-            if (state.AvailableU != parentMeasure.U)
-            {
-                state.ClearPositions();
-                state.AvailableU = parentMeasure.U;
-            }
-
-            double currentV = 0;
-            for (int i = 0; i < context.ItemCount; i++)
-            {
-                bool measured = false;
-                WrapItem item = state.GetItemAt(i);
-                if (item.Measure == null)
-                {
-                    item.Element = context.GetOrCreateElementAt(i);
-                    item.Element.Measure(availableSize);
-                    item.Measure = new UvMeasure(Orientation, item.Element.DesiredSize.Width, item.Element.DesiredSize.Height);
-                    measured = true;
-                }
-
-                UvMeasure currentMeasure = item.Measure.Value;
-                if (currentMeasure.U == 0)
-                {
-                    continue; // ignore collapsed items
-                }
-
-                if (item.Position == null)
-                {
-                    if (parentMeasure.U < position.U + currentMeasure.U)
-                    {
-                        // New Row
-                        position.U = 0;
-                        position.V += currentV + spacingMeasure.V;
-                        currentV = 0;
-                    }
-
-                    item.Position = position;
-                }
-
-                position = item.Position.Value;
-
-                double vEnd = position.V + currentMeasure.V;
-                if (vEnd < realizationBounds.VMin)
-                {
-                    // Item is "above" the bounds
-                    if (item.Element != null)
-                    {
-                        context.RecycleElement(item.Element);
-                        item.Element = null;
-                    }
-                }
-                else if (position.V > realizationBounds.VMax)
-                {
-                    // Item is "below" the bounds.
-                    if (item.Element != null)
-                    {
-                        context.RecycleElement(item.Element);
-                        item.Element = null;
-                    }
-
-                    // We don't need to measure anything below the bounds
-                    break;
-                }
-                else if (measured == false)
-                {
-                    // Always measure elements that are within the bounds
-                    item.Element = context.GetOrCreateElementAt(i);
-                    item.Element.Measure(availableSize);
-
-                    currentMeasure = new UvMeasure(Orientation, item.Element.DesiredSize.Width, item.Element.DesiredSize.Height);
-                    if (currentMeasure.Equals(item.Measure) == false)
-                    {
-                        // this item changed size; we need to recalculate layout for everything after this
-                        state.RemoveFromIndex(i + 1);
-                        item.Measure = currentMeasure;
-
-                        // did the change make it go into the new row?
-                        if (parentMeasure.U < position.U + currentMeasure.U)
-                        {
-                            // New Row
-                            position.U = 0;
-                            position.V += currentV + spacingMeasure.V;
-                            currentV = 0;
-                        }
-
-                        item.Position = position;
-                    }
-                }
-
-                position.U += currentMeasure.U + spacingMeasure.U;
-                currentV = Math.Max(currentMeasure.V, currentV);
-            }
-
-            // update value with the last line
-            // if the the last loop is(parentMeasure.U > currentMeasure.U + lineMeasure.U) the total isn't calculated then calculate it
-            // if the last loop is (parentMeasure.U > currentMeasure.U) the currentMeasure isn't added to the total so add it here
-            // for the last condition it is zeros so adding it will make no difference
-            // this way is faster than an if condition in every loop for checking the last item
-            totalMeasure.U = parentMeasure.U;
-            
-            // Propagating an infinite size causes a crash. This can happen if the parent is scrollable and infinite in the opposite
-            // axis to the panel. Clearing to zero prevents the crash.
-            // This is likely an incorrect use of the control by the developer, however we need stability here so setting a default that wont crash.
-            if (double.IsInfinity(totalMeasure.U))
-            {
-                totalMeasure.U = 0.0;
-            }
-            
-            totalMeasure.V = state.GetHeight();
-
-            totalMeasure.U = Math.Ceiling(totalMeasure.U);
-
-            return Orientation == Orientation.Horizontal ? new Size(totalMeasure.U, totalMeasure.V) : new Size(totalMeasure.V, totalMeasure.U);
-        }
-
-        /// <inheritdoc />
-        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
-        {
-            if (context.ItemCount > 0)
-            {
-                var parentMeasure = new UvMeasure(Orientation, finalSize.Width, finalSize.Height);
-                var spacingMeasure = new UvMeasure(Orientation, HorizontalSpacing, VerticalSpacing);
-                var realizationBounds = new UvBounds(Orientation, context.RealizationRect);
-
-                var state = (WrapLayoutState)context.LayoutState!;
-                bool Arrange(WrapItem item, bool isLast = false)
-                {
-                    if (item.Measure.HasValue == false)
-                    {
-                        return false;
-                    }
-
-                    if (item.Position == null)
-                    {
-                        return false;
-                    }
-
-                    var desiredMeasure = item.Measure.Value;
-                    if (desiredMeasure.U == 0)
-                    {
-                        return true; // if an item is collapsed, avoid adding the spacing
-                    }
-
-                    UvMeasure position = item.Position.Value;
-
-                    // Stretch the last item to fill the available space
-                    if (isLast)
-                    {
-                        desiredMeasure.U = parentMeasure.U - position.U;
-                    }
-
-                    if (((position.V + desiredMeasure.V) >= realizationBounds.VMin) && (position.V <= realizationBounds.VMax))
-                    {
-                        // place the item
-                        var child = context.GetOrCreateElementAt(item.Index);
-                        if (Orientation == Orientation.Horizontal)
-                        {
-                            child.Arrange(new Rect(position.U, position.V, desiredMeasure.U, desiredMeasure.V));
-                        }
-                        else
-                        {
-                            child.Arrange(new Rect(position.V, position.U, desiredMeasure.V, desiredMeasure.U));
-                        }
-                    }
-                    else if (position.V > realizationBounds.VMax)
-                    {
-                        return false;
-                    }
-
-                    return true;
-                }
-
-                for (var i = 0; i < context.ItemCount; i++)
-                {
-                    bool continueArranging = Arrange(state.GetItemAt(i));
-                    if (continueArranging == false)
-                    {
-                        break;
-                    }
-                }
-            }
-
-            return finalSize;
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == OrientationProperty || change.Property == HorizontalSpacingProperty || change.Property == VerticalSpacingProperty)
-            {
-                InvalidateMeasure();
-                InvalidateArrange();
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
index b796e173c4..d7f39f6642 100644
--- a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
+++ b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
@@ -10,6 +10,8 @@
     <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <ExcludeAssets>all</ExcludeAssets>
+      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+      <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
     </ProjectReference>
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj
index 70ab38e786..2001a2fcbc 100644
--- a/src/Avalonia.Native/Avalonia.Native.csproj
+++ b/src/Avalonia.Native/Avalonia.Native.csproj
@@ -28,4 +28,6 @@
     <PackageReference Include="MicroCom.CodeGenerator.MSBuild" Version="0.10.4" PrivateAssets="all" />
     <MicroComIdl Include="avn.idl" CSharpInteropPath="Interop.Generated.cs" />
   </ItemGroup>
+
+  <Import Project="..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Avalonia.Native/ScreenImpl.cs b/src/Avalonia.Native/ScreenImpl.cs
index 7b4a001486..83db2e8a28 100644
--- a/src/Avalonia.Native/ScreenImpl.cs
+++ b/src/Avalonia.Native/ScreenImpl.cs
@@ -48,5 +48,20 @@ namespace Avalonia.Native
             _native?.Dispose();
             _native = null;
         }
+
+        public Screen ScreenFromPoint(PixelPoint point)
+        {
+            return ScreenHelper.ScreenFromPoint(point, AllScreens);
+        }
+
+        public Screen ScreenFromRect(PixelRect rect)
+        {
+            return ScreenHelper.ScreenFromRect(rect, AllScreens);
+        }
+
+        public Screen ScreenFromWindow(IWindowBaseImpl window)
+        {
+            return ScreenHelper.ScreenFromWindow(window, AllScreens);
+        }
     }
 }
diff --git a/src/Avalonia.Native/SystemDialogs.cs b/src/Avalonia.Native/SystemDialogs.cs
index 4372829df1..d1d9c17ae3 100644
--- a/src/Avalonia.Native/SystemDialogs.cs
+++ b/src/Avalonia.Native/SystemDialogs.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Native
                                         ofd.Title ?? "",
                                         ofd.Directory ?? "",
                                         ofd.InitialFileName ?? "",
-                                        string.Join(";", dialog.Filters.SelectMany(f => f.Extensions)));
+                                        string.Join(";", dialog.Filters?.SelectMany(f => f.Extensions) ?? Array.Empty<string>()));
             }
             else
             {
@@ -39,7 +39,7 @@ namespace Avalonia.Native
                                         dialog.Title ?? "",
                                         dialog.Directory ?? "",
                                         dialog.InitialFileName ?? "",
-                                        string.Join(";", dialog.Filters.SelectMany(f => f.Extensions)));
+                                        string.Join(";", dialog.Filters?.SelectMany(f => f.Extensions) ?? Array.Empty<string>()));
             }
 
             return events.Task.ContinueWith(t => { events.Dispose(); return t.Result; });
diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs
index c082bdb1b8..b5af927ea0 100644
--- a/src/Avalonia.Native/WindowImpl.cs
+++ b/src/Avalonia.Native/WindowImpl.cs
@@ -107,6 +107,13 @@ namespace Avalonia.Native
         private bool _isExtended;
         public bool IsClientAreaExtendedToDecorations => _isExtended;
 
+        public override void Show(bool activate, bool isDialog)
+        {
+            base.Show(activate, isDialog);
+            
+            InvalidateExtendedMargins();
+        }
+
         protected override bool ChromeHitTest (RawPointerEventArgs e)
         {
             if(_isExtended)
diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs
index 735f11bcd5..94a3a5ed9b 100644
--- a/src/Avalonia.Native/WindowImplBase.cs
+++ b/src/Avalonia.Native/WindowImplBase.cs
@@ -116,8 +116,12 @@ namespace Avalonia.Native
             {
                 if (_native != null)
                 {
-                    var s = _native.FrameSize;
-                    return new Size(s.Width, s.Height);
+                    unsafe
+                    {
+                        var s = new AvnSize { Width = -1, Height = -1 };
+                        _native.GetFrameSize(&s);
+                        return s.Width < 0  && s.Height < 0 ? null : new Size(s.Width, s.Height);
+                    }
                 }
 
                 return default;
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
index 8092004989..a1c73e1f03 100644
--- a/src/Avalonia.Native/avn.idl
+++ b/src/Avalonia.Native/avn.idl
@@ -2,6 +2,7 @@
 @clr-access internal
 @clr-map bool int
 @cpp-preamble @@
+#pragma once
 #include "com.h"
 #include "stddef.h"
 @@
@@ -503,7 +504,7 @@ interface IAvnWindowBase : IUnknown
      HRESULT Close();
      HRESULT Activate();
      HRESULT GetClientSize(AvnSize*ret);
-     HRESULT GetFrameSize(AvnSize*ret);
+     HRESULT GetFrameSize(AvnSize*result);
      HRESULT GetScaling(double*ret);
      HRESULT SetMinMaxSize(AvnSize minSize, AvnSize maxSize);
      HRESULT Resize(double width, double height, AvnPlatformResizeReason reason);
diff --git a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
index 2b32926008..76924d060f 100644
--- a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
+++ b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
@@ -8,6 +8,7 @@
     <ItemGroup>
       <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
       <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-      <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    </ItemGroup>    
+    </ItemGroup>
+
+    <Import Project="..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs b/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs
index aef4f601be..22f0cebf57 100644
--- a/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs
+++ b/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs
@@ -1,15 +1,17 @@
 using System;
-using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 
 namespace Avalonia.OpenGL.Imaging
 {
+    [Unstable]
     public interface IOpenGlBitmapImpl : IBitmapImpl
     {
         IOpenGlBitmapAttachment CreateFramebufferAttachment(IGlContext context, Action presentCallback);
         bool SupportsContext(IGlContext context);
     }
 
+    [Unstable]
     public interface IOpenGlBitmapAttachment : IDisposable
     {
         void Present();
diff --git a/src/Avalonia.PlatformSupport/AppBuilder.cs b/src/Avalonia.PlatformSupport/AppBuilder.cs
deleted file mode 100644
index 136f1f39b3..0000000000
--- a/src/Avalonia.PlatformSupport/AppBuilder.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.PlatformSupport;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Initializes platform-specific services for an <see cref="Application"/>.
-    /// </summary>
-    public sealed class AppBuilder : AppBuilderBase<AppBuilder>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppBuilder"/> class.
-        /// </summary>
-        public AppBuilder()
-            : base(new StandardRuntimePlatform(),
-                builder => StandardRuntimePlatformServices.Register(builder.ApplicationType?.Assembly))
-        {
-        }
-    }
-}
diff --git a/src/Avalonia.PlatformSupport/AssetLoader.cs b/src/Avalonia.PlatformSupport/AssetLoader.cs
deleted file mode 100644
index 7220694d7b..0000000000
--- a/src/Avalonia.PlatformSupport/AssetLoader.cs
+++ /dev/null
@@ -1,403 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-
-namespace Avalonia.PlatformSupport
-{
-    /// <summary>
-    /// Loads assets compiled into the application binary.
-    /// </summary>
-    public class AssetLoader : IAssetLoader
-    {
-        private const string AvaloniaResourceName = "!AvaloniaResources";
-        private static readonly Dictionary<string, AssemblyDescriptor> AssemblyNameCache
-            = new Dictionary<string, AssemblyDescriptor>();
-
-        private AssemblyDescriptor? _defaultResmAssembly;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AssetLoader"/> class.
-        /// </summary>
-        /// <param name="assembly">
-        /// The default assembly from which to load resm: assets for which no assembly is specified.
-        /// </param>
-        public AssetLoader(Assembly? assembly = null)
-        {
-            if (assembly == null)
-                assembly = Assembly.GetEntryAssembly();
-            if (assembly != null)
-                _defaultResmAssembly = new AssemblyDescriptor(assembly);
-        }
-
-        /// <summary>
-        /// Sets the default assembly from which to load assets for which no assembly is specified.
-        /// </summary>
-        /// <param name="assembly">The default assembly.</param>
-        public void SetDefaultAssembly(Assembly assembly)
-        {
-            _defaultResmAssembly = new AssemblyDescriptor(assembly);
-        }
-
-        /// <summary>
-        /// Checks if an asset with the specified URI exists.
-        /// </summary>
-        /// <param name="uri">The URI.</param>
-        /// <param name="baseUri">
-        /// A base URI to use if <paramref name="uri"/> is relative.
-        /// </param>
-        /// <returns>True if the asset could be found; otherwise false.</returns>
-        public bool Exists(Uri uri, Uri? baseUri = null)
-        {
-            return GetAsset(uri, baseUri) != null;
-        }
-
-        /// <summary>
-        /// Opens the asset with the requested URI.
-        /// </summary>
-        /// <param name="uri">The URI.</param>
-        /// <param name="baseUri">
-        /// A base URI to use if <paramref name="uri"/> is relative.
-        /// </param>
-        /// <returns>A stream containing the asset contents.</returns>
-        /// <exception cref="FileNotFoundException">
-        /// The asset could not be found.
-        /// </exception>
-        public Stream Open(Uri uri, Uri? baseUri = null) => OpenAndGetAssembly(uri, baseUri).Item1;
-
-        /// <summary>
-        /// Opens the asset with the requested URI and returns the asset stream and the
-        /// assembly containing the asset.
-        /// </summary>
-        /// <param name="uri">The URI.</param>
-        /// <param name="baseUri">
-        /// A base URI to use if <paramref name="uri"/> is relative.
-        /// </param>
-        /// <returns>
-        /// The stream containing the resource contents together with the assembly.
-        /// </returns>
-        /// <exception cref="FileNotFoundException">
-        /// The asset could not be found.
-        /// </exception>
-        public (Stream stream, Assembly assembly) OpenAndGetAssembly(Uri uri, Uri? baseUri = null)
-        {
-            var asset = GetAsset(uri, baseUri);
-
-            if (asset == null)
-            {
-                throw new FileNotFoundException($"The resource {uri} could not be found.");
-            }
-
-            return (asset.GetStream(), asset.Assembly);
-        }
-
-        public Assembly? GetAssembly(Uri uri, Uri? baseUri)
-        {
-            if (!uri.IsAbsoluteUri && baseUri != null)
-                uri = new Uri(baseUri, uri);
-            return GetAssembly(uri)?.Assembly;
-        }
-
-        /// <summary>
-        /// Gets all assets of a folder and subfolders that match specified uri.
-        /// </summary>
-        /// <param name="uri">The URI.</param>
-        /// <param name="baseUri">Base URI that is used if <paramref name="uri"/> is relative.</param>
-        /// <returns>All matching assets as a tuple of the absolute path to the asset and the assembly containing the asset</returns>
-        public IEnumerable<Uri> GetAssets(Uri uri, Uri? baseUri)
-        {
-            if (uri.IsAbsoluteUri && uri.Scheme == "resm")
-            {
-                var assembly = GetAssembly(uri);
-
-                return assembly?.Resources?.Where(x => x.Key.Contains(uri.AbsolutePath))
-                           .Select(x =>new Uri($"resm:{x.Key}?assembly={assembly.Name}")) ??
-                       Enumerable.Empty<Uri>();
-            }
-
-            uri = EnsureAbsolute(uri, baseUri);
-            if (uri.Scheme == "avares")
-            {
-                var (asm, path) = GetResAsmAndPath(uri);
-                if (asm == null)
-                {
-                    throw new ArgumentException(
-                        "No default assembly, entry assembly or explicit assembly specified; " +
-                        "don't know where to look up for the resource, try specifying assembly explicitly.");
-                }
-
-                if (asm?.AvaloniaResources == null)
-                    return Enumerable.Empty<Uri>();
-                path = path.TrimEnd('/') + '/';
-                return asm.AvaloniaResources.Where(r => r.Key.StartsWith(path))
-                    .Select(x => new Uri($"avares://{asm.Name}{x.Key}"));
-            }
-
-            return Enumerable.Empty<Uri>();
-        }
-
-        private Uri EnsureAbsolute(Uri uri, Uri? baseUri)
-        {
-            if (uri.IsAbsoluteUri)
-                return uri;
-            if(baseUri == null)
-                throw new ArgumentException($"Relative uri {uri} without base url");
-            if (!baseUri.IsAbsoluteUri)
-                throw new ArgumentException($"Base uri {baseUri} is relative");
-            if (baseUri.Scheme == "resm")
-                throw new ArgumentException(
-                    $"Relative uris for 'resm' scheme aren't supported; {baseUri} uses resm");
-            return new Uri(baseUri, uri);
-        }
-        
-        private IAssetDescriptor? GetAsset(Uri uri, Uri? baseUri)
-        {           
-            if (uri.IsAbsoluteUri && uri.Scheme == "resm")
-            {
-                var asm = GetAssembly(uri) ?? GetAssembly(baseUri) ?? _defaultResmAssembly;
-
-                if (asm == null)
-                {
-                    throw new ArgumentException(
-                        "No default assembly, entry assembly or explicit assembly specified; " +
-                        "don't know where to look up for the resource, try specifying assembly explicitly.");
-                }
-
-                var resourceKey = uri.AbsolutePath;
-                IAssetDescriptor? rv = null;
-                asm.Resources?.TryGetValue(resourceKey, out rv);
-                return rv;
-            }
-
-            uri = EnsureAbsolute(uri, baseUri);
-
-            if (uri.Scheme == "avares")
-            {
-                var (asm, path) = GetResAsmAndPath(uri);
-                if (asm.AvaloniaResources == null)
-                    return null;
-                asm.AvaloniaResources.TryGetValue(path, out var desc);
-                return desc;
-            }
-
-            throw new ArgumentException($"Unsupported url type: " + uri.Scheme, nameof(uri));
-        }
-
-        private (AssemblyDescriptor asm, string path) GetResAsmAndPath(Uri uri)
-        {
-            var asm = GetAssembly(uri.Authority);
-            return (asm, uri.AbsolutePath);
-        }
-        
-        private AssemblyDescriptor? GetAssembly(Uri? uri)
-        {
-            if (uri != null)
-            {
-                if (!uri.IsAbsoluteUri)
-                    return null;
-                if (uri.Scheme == "avares")
-                    return GetResAsmAndPath(uri).asm;
-
-                if (uri.Scheme == "resm")
-                {
-                    var qs = ParseQueryString(uri);
-
-                    if (qs.TryGetValue("assembly", out var assemblyName))
-                    {
-                        return GetAssembly(assemblyName);
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private AssemblyDescriptor GetAssembly(string name)
-        {
-            if (name == null)
-                throw new ArgumentNullException(nameof(name));
-
-            if (!AssemblyNameCache.TryGetValue(name, out var rv))
-            {
-                var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
-                var match = loadedAssemblies.FirstOrDefault(a => a.GetName().Name == name);
-                if (match != null)
-                {
-                    AssemblyNameCache[name] = rv = new AssemblyDescriptor(match);
-                }
-                else
-                {
-                    // iOS does not support loading assemblies dynamically!
-#if NET6_0_OR_GREATER
-                    if (OperatingSystem.IsIOS())
-                    {
-                        throw new InvalidOperationException(
-                            $"Assembly {name} needs to be referenced and explicitly loaded before loading resources");
-                    }
-#endif
-                    name = Uri.UnescapeDataString(name);
-                    AssemblyNameCache[name] = rv = new AssemblyDescriptor(Assembly.Load(name));
-                }
-            }
-
-            return rv;
-        }
-
-        private Dictionary<string, string> ParseQueryString(Uri uri)
-        {
-            return uri.Query.TrimStart('?')
-                .Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(p => p.Split('='))
-                .ToDictionary(p => p[0], p => p[1]);
-        }
-
-        private interface IAssetDescriptor
-        {
-            Stream GetStream();
-            Assembly Assembly { get; }
-        }
-
-        private class AssemblyResourceDescriptor : IAssetDescriptor
-        {
-            private readonly Assembly _asm;
-            private readonly string _name;
-
-            public AssemblyResourceDescriptor(Assembly asm, string name)
-            {
-                _asm = asm;
-                _name = name;
-            }
-
-            public Stream GetStream()
-            {
-                var s = _asm.GetManifestResourceStream(_name);
-                return s ?? throw new InvalidOperationException($"Could not find manifest resource stream '{_name}',");
-            }
-
-            public Assembly Assembly => _asm;
-        }
-        
-        private class AvaloniaResourceDescriptor : IAssetDescriptor
-        {
-            private readonly int _offset;
-            private readonly int _length;
-            public Assembly Assembly { get; }
-
-            public AvaloniaResourceDescriptor(Assembly asm, int offset, int length)
-            {
-                _offset = offset;
-                _length = length;
-                Assembly = asm;
-            }
-            
-            public Stream GetStream()
-            {
-                var s = Assembly.GetManifestResourceStream(AvaloniaResourceName) ??
-                    throw new InvalidOperationException($"Could not find manifest resource stream '{AvaloniaResourceName}',");
-                return new SlicedStream(s, _offset, _length);
-            }
-        }
-        
-        class SlicedStream : Stream
-        {
-            private readonly Stream _baseStream;
-            private readonly int _from;
-
-            public SlicedStream(Stream baseStream, int from, int length)
-            {
-                Length = length;
-                _baseStream = baseStream;
-                _from = from;
-                _baseStream.Position = from;
-            }
-            public override void Flush()
-            {
-            }
-
-            public override int Read(byte[] buffer, int offset, int count)
-            {
-                return _baseStream.Read(buffer, offset, (int)Math.Min(count, Length - Position));
-            }
-
-            public override long Seek(long offset, SeekOrigin origin)
-            {
-                if (origin == SeekOrigin.Begin)
-                    Position = offset;
-                if (origin == SeekOrigin.End)
-                    Position = _from + Length + offset;
-                if (origin == SeekOrigin.Current)
-                    Position = Position + offset;
-                return Position;
-            }
-
-            public override void SetLength(long value) => throw new NotSupportedException();
-
-            public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
-
-            public override bool CanRead => true;
-            public override bool CanSeek => _baseStream.CanRead;
-            public override bool CanWrite => false;
-            public override long Length { get; }
-            public override long Position
-            {
-                get => _baseStream.Position - _from;
-                set => _baseStream.Position = value + _from;
-            }
-
-            protected override void Dispose(bool disposing)
-            {
-                if (disposing)
-                    _baseStream.Dispose();
-            }
-
-            public override void Close() => _baseStream.Close();
-        }
-
-        private class AssemblyDescriptor
-        {
-            public AssemblyDescriptor(Assembly assembly)
-            {
-                Assembly = assembly;
-
-                if (assembly != null)
-                {
-                    Resources = assembly.GetManifestResourceNames()
-                        .ToDictionary(n => n, n => (IAssetDescriptor)new AssemblyResourceDescriptor(assembly, n));
-                    Name = assembly.GetName().Name;
-                    using (var resources = assembly.GetManifestResourceStream(AvaloniaResourceName))
-                    {
-                        if (resources != null)
-                        {
-                            Resources.Remove(AvaloniaResourceName);
-
-                            var indexLength = new BinaryReader(resources).ReadInt32();
-                            var index = AvaloniaResourcesIndexReaderWriter.Read(new SlicedStream(resources, 4, indexLength));
-                            var baseOffset = indexLength + 4;
-                            AvaloniaResources = index.ToDictionary(r => "/" + r.Path!.TrimStart('/'), r => (IAssetDescriptor)
-                                new AvaloniaResourceDescriptor(assembly, baseOffset + r.Offset, r.Size));
-                        }
-                    }
-                }
-            }
-
-            public Assembly Assembly { get; }
-            public Dictionary<string, IAssetDescriptor>? Resources { get; }
-            public Dictionary<string, IAssetDescriptor>? AvaloniaResources { get; }
-            public string? Name { get; }
-        }
-        
-        public static void RegisterResUriParsers()
-        {
-            if (!UriParser.IsKnownScheme("avares"))
-                UriParser.Register(new GenericUriParser(
-                    GenericUriParserOptions.GenericAuthority |
-                    GenericUriParserOptions.NoUserInfo |
-                    GenericUriParserOptions.NoPort |
-                    GenericUriParserOptions.NoQuery |
-                    GenericUriParserOptions.NoFragment), "avares", -1);
-        }
-    }
-}
diff --git a/src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj b/src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj
deleted file mode 100644
index e08dc5e194..0000000000
--- a/src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net461;netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-      <ProjectReference Include="../Avalonia.Base/Avalonia.Base.csproj" />
-      <ProjectReference Include="../Avalonia.Controls/Avalonia.Controls.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="'$(TargetFramework)' == 'net461'" />
-  </ItemGroup>
-
-  <Import Project="..\..\build\NetCore.props" />
-  <Import Project="..\..\build\NetFX.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
diff --git a/src/Avalonia.PlatformSupport/DynLoader.cs b/src/Avalonia.PlatformSupport/DynLoader.cs
deleted file mode 100644
index ad76ac4724..0000000000
--- a/src/Avalonia.PlatformSupport/DynLoader.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using Avalonia.Platform.Interop;
-
-// ReSharper disable InconsistentNaming
-namespace Avalonia.PlatformSupport
-{
-    class UnixLoader : IDynamicLibraryLoader
-    {
-        static class LinuxImports
-        {
-            [DllImport("libdl.so.2")]
-            private static extern IntPtr dlopen(string path, int flags);
-
-            [DllImport("libdl.so.2")]
-            private static extern IntPtr dlsym(IntPtr handle, string symbol);
-
-            [DllImport("libdl.so.2")]
-            private static extern IntPtr dlerror();
-
-            public static void Init()
-            {
-                DlOpen = dlopen;
-                DlSym = dlsym;
-                DlError = dlerror;
-            }
-        }
-
-        static class AndroidImports
-        {
-            [DllImport("libdl.so")]
-            private static extern IntPtr dlopen(string path, int flags);
-
-            [DllImport("libdl.so")]
-            private static extern IntPtr dlsym(IntPtr handle, string symbol);
-
-            [DllImport("libdl.so")]
-            private static extern IntPtr dlerror();
-
-            public static void Init()
-            {
-                DlOpen = dlopen;
-                DlSym = dlsym;
-                DlError = dlerror;
-            }
-        }
-
-        static class OsXImports
-        {
-            [DllImport("/usr/lib/libSystem.dylib")]
-            private static extern IntPtr dlopen(string path, int flags);
-
-            [DllImport("/usr/lib/libSystem.dylib")]
-            private static extern IntPtr dlsym(IntPtr handle, string symbol);
-
-            [DllImport("/usr/lib/libSystem.dylib")]
-            private static extern IntPtr dlerror();
-
-            public static void Init()
-            {
-                DlOpen = dlopen;
-                DlSym = dlsym;
-                DlError = dlerror;
-            }
-            
-        }
-        
-
-        [DllImport("libc")]
-        static extern int uname(IntPtr buf);
-
-        static UnixLoader()
-        {
-            var buffer = Marshal.AllocHGlobal(0x1000);
-            uname(buffer);
-            var unixName = Marshal.PtrToStringAnsi(buffer);
-            Marshal.FreeHGlobal(buffer);
-            if (unixName == "Darwin")
-                OsXImports.Init();
-#if NET6_0_OR_GREATER
-            else if (OperatingSystem.IsAndroid())
-                AndroidImports.Init();
-#endif
-            else
-                LinuxImports.Init();
-        }
-
-        private static Func<string, int, IntPtr>? DlOpen;
-        private static Func<IntPtr, string, IntPtr>? DlSym;
-        private static Func<IntPtr>? DlError;
-        // ReSharper restore InconsistentNaming
-
-        static string? DlErrorString() => Marshal.PtrToStringAnsi(DlError!.Invoke());
-
-        public IntPtr LoadLibrary(string dll)
-        {
-            var handle = DlOpen!.Invoke(dll, 1);
-            if (handle == IntPtr.Zero)
-                throw new DynamicLibraryLoaderException(DlErrorString()!);
-            return handle;
-        }
-
-        public IntPtr GetProcAddress(IntPtr dll, string proc, bool optional)
-        {
-            var ptr = DlSym!.Invoke(dll, proc);
-            if (ptr == IntPtr.Zero && !optional)
-                throw new DynamicLibraryLoaderException(DlErrorString()!);
-            return ptr;
-        }
-    }
-
-    internal class Win32Loader : IDynamicLibraryLoader
-    {
-        [DllImport("kernel32", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
-        private static extern IntPtr GetProcAddress(IntPtr hModule, string procName);
-
-        [DllImport("kernel32", EntryPoint = "LoadLibraryW", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern IntPtr LoadLibrary(string lpszLib);
-
-        IntPtr IDynamicLibraryLoader.LoadLibrary(string dll)
-        {
-            var handle = LoadLibrary(dll);
-            if (handle != IntPtr.Zero)
-                return handle;
-            var err = Marshal.GetLastWin32Error();
-
-            throw new DynamicLibraryLoaderException("Error loading " + dll + " error " + err);
-        }
-
-        IntPtr IDynamicLibraryLoader.GetProcAddress(IntPtr dll, string proc, bool optional)
-        {
-            var ptr = GetProcAddress(dll, proc);
-            if (ptr == IntPtr.Zero && !optional)
-                throw new DynamicLibraryLoaderException("Error " + Marshal.GetLastWin32Error());
-            return ptr;
-        }
-    }
-    
-    internal class NotSupportedLoader : IDynamicLibraryLoader
-    {
-        IntPtr IDynamicLibraryLoader.LoadLibrary(string dll)
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        IntPtr IDynamicLibraryLoader.GetProcAddress(IntPtr dll, string proc, bool optional)
-        {
-            throw new PlatformNotSupportedException();
-        }
-    }
-}
diff --git a/src/Avalonia.PlatformSupport/StandardRuntimePlatform.cs b/src/Avalonia.PlatformSupport/StandardRuntimePlatform.cs
deleted file mode 100644
index 4eeb9232cf..0000000000
--- a/src/Avalonia.PlatformSupport/StandardRuntimePlatform.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Threading;
-using Avalonia.Platform;
-
-namespace Avalonia.PlatformSupport
-{
-    public class StandardRuntimePlatform : IRuntimePlatform
-    {
-        public IDisposable StartSystemTimer(TimeSpan interval, Action tick)
-        {
-            return new Timer(_ => tick(), null, interval, interval);
-        }
-
-        public IUnmanagedBlob AllocBlob(int size) => new UnmanagedBlob(this, size);
-
-        private class UnmanagedBlob : IUnmanagedBlob
-        {
-            private readonly StandardRuntimePlatform _plat;
-            private IntPtr _address;
-            private readonly object _lock = new object();
-#if DEBUG
-            private static readonly List<string> Backtraces = new List<string>();
-            private static Thread? GCThread;
-            private readonly string _backtrace;
-            private static readonly object _btlock = new object();
-
-            class GCThreadDetector
-            {
-                ~GCThreadDetector()
-                {
-                    GCThread = Thread.CurrentThread;
-                }
-            }
-
-            [MethodImpl(MethodImplOptions.NoInlining)]
-            static void Spawn() => new GCThreadDetector();
-
-            static UnmanagedBlob()
-            {
-                Spawn();
-                GC.WaitForPendingFinalizers();
-            }
-#endif
-
-            public UnmanagedBlob(StandardRuntimePlatform plat, int size)
-            {
-                try
-                {
-                    if (size <= 0)
-                        throw new ArgumentException("Positive number required", nameof(size));
-                    _plat = plat;
-                    _address = plat.Alloc(size);
-                    GC.AddMemoryPressure(size);
-                    Size = size;
-                }
-                catch
-                {
-                    GC.SuppressFinalize(this);
-                    throw;
-                }
-#if DEBUG
-                _backtrace = Environment.StackTrace;
-                lock (_btlock)
-                    Backtraces.Add(_backtrace);
-#endif
-            }
-
-            void DoDispose()
-            {
-                lock (_lock)
-                {
-                    if (!IsDisposed)
-                    {
-#if DEBUG
-                        lock (_btlock)
-                            Backtraces.Remove(_backtrace);
-#endif
-                        _plat?.Free(_address, Size);
-                        GC.RemoveMemoryPressure(Size);
-                        IsDisposed = true;
-                        _address = IntPtr.Zero;
-                        Size = 0;
-                    }
-                }
-            }
-
-            public void Dispose()
-            {
-#if DEBUG
-                if (Thread.CurrentThread.ManagedThreadId == GCThread?.ManagedThreadId)
-                {
-                    lock (_lock)
-                    {
-                        if (!IsDisposed)
-                        {
-                            Console.Error.WriteLine("Native blob disposal from finalizer thread\nBacktrace: "
-                                                 + Environment.StackTrace
-                                                 + "\n\nBlob created by " + _backtrace);
-                        }
-                    }
-                }
-#endif
-                DoDispose();
-                GC.SuppressFinalize(this);
-            }
-
-            ~UnmanagedBlob()
-            {
-#if DEBUG
-                Console.Error.WriteLine("Undisposed native blob created by " + _backtrace);
-#endif
-                DoDispose();
-            }
-
-            public IntPtr Address => IsDisposed ? throw new ObjectDisposedException("UnmanagedBlob") : _address;
-            public int Size { get; private set; }
-            public bool IsDisposed { get; private set; }
-        }
-
-#if NET461 || NETCOREAPP2_0_OR_GREATER
-        [DllImport("libc", SetLastError = true)]
-        private static extern IntPtr mmap(IntPtr addr, IntPtr length, int prot, int flags, int fd, IntPtr offset);
-        [DllImport("libc", SetLastError = true)]
-        private static extern int munmap(IntPtr addr, IntPtr length);
-        [DllImport("libc", SetLastError = true)]
-        private static extern long sysconf(int name);
-
-        private bool? _useMmap;
-        private bool UseMmap
-            => _useMmap ?? ((_useMmap = GetRuntimeInfo().OperatingSystem == OperatingSystemType.Linux)).Value;
-
-        IntPtr Alloc(int size)
-        {
-            if (UseMmap)
-            {
-                var rv = mmap(IntPtr.Zero, new IntPtr(size), 3, 0x22, -1, IntPtr.Zero);
-                if (rv.ToInt64() == -1 || (ulong)rv.ToInt64() == 0xffffffff)
-                {
-                    var errno = Marshal.GetLastWin32Error();
-                    throw new Exception("Unable to allocate memory: " + errno);
-                }
-                return rv;
-            }
-            else
-                return Marshal.AllocHGlobal(size);
-        }
-
-        void Free(IntPtr ptr, int len)
-        {
-            if (UseMmap)
-            {
-                if (munmap(ptr, new IntPtr(len)) == -1)
-                {
-                    var errno = Marshal.GetLastWin32Error();
-                    throw new Exception("Unable to free memory: " + errno);
-                }
-            }
-            else
-                Marshal.FreeHGlobal(ptr);
-        }
-#else
-        IntPtr Alloc(int size) => Marshal.AllocHGlobal(size);
-        void Free(IntPtr ptr, int len) => Marshal.FreeHGlobal(ptr);
-#endif
-
-        private static readonly Lazy<RuntimePlatformInfo> Info = new Lazy<RuntimePlatformInfo>(() =>
-        {
-            OperatingSystemType os;
-
-#if NET5_0_OR_GREATER
-            if (OperatingSystem.IsWindows())
-                os = OperatingSystemType.WinNT;
-            else if (OperatingSystem.IsMacOS())
-                os = OperatingSystemType.OSX;
-            else if (OperatingSystem.IsLinux() || OperatingSystem.IsFreeBSD())
-                os = OperatingSystemType.Linux;
-            else if (OperatingSystem.IsAndroid())
-                os = OperatingSystemType.Android;
-            else if (OperatingSystem.IsIOS())
-                os = OperatingSystemType.iOS;
-            else if (OperatingSystem.IsBrowser())
-                os = OperatingSystemType.Browser;
-            else
-                throw new Exception("Unknown OS platform " + RuntimeInformation.OSDescription);
-#else
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                os = OperatingSystemType.OSX;
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                os = OperatingSystemType.Linux;
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                os = OperatingSystemType.WinNT;
-            else
-                throw new Exception("Unknown OS platform " + RuntimeInformation.OSDescription);
-#endif
-
-            return new RuntimePlatformInfo
-            {
-#if NETCOREAPP
-                IsCoreClr = true,
-#elif NETFRAMEWORK
-                IsDotNetFramework = true,
-#endif
-                IsDesktop = os == OperatingSystemType.Linux || os == OperatingSystemType.OSX || os == OperatingSystemType.WinNT,
-                IsMono = os == OperatingSystemType.Android || os == OperatingSystemType.iOS || os == OperatingSystemType.Browser,
-                IsMobile = os == OperatingSystemType.Android || os == OperatingSystemType.iOS,
-                IsUnix = os == OperatingSystemType.Linux || os == OperatingSystemType.OSX || os == OperatingSystemType.Android,
-                IsBrowser = os == OperatingSystemType.Browser,
-                OperatingSystem = os,
-            };
-        });
-
-
-        public virtual RuntimePlatformInfo GetRuntimeInfo() => Info.Value;
-    }
-}
diff --git a/src/Avalonia.PlatformSupport/StandardRuntimePlatformServices.cs b/src/Avalonia.PlatformSupport/StandardRuntimePlatformServices.cs
deleted file mode 100644
index ae7478feb9..0000000000
--- a/src/Avalonia.PlatformSupport/StandardRuntimePlatformServices.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Reflection;
-using Avalonia.Platform;
-using Avalonia.Platform.Interop;
-
-namespace Avalonia.PlatformSupport
-{
-    public static class StandardRuntimePlatformServices
-    {
-        public static void Register(Assembly? assembly = null)
-        {
-            var standardPlatform = new StandardRuntimePlatform();
-            var os = standardPlatform.GetRuntimeInfo().OperatingSystem;
-
-            AssetLoader.RegisterResUriParsers();
-            AvaloniaLocator.CurrentMutable
-                .Bind<IRuntimePlatform>().ToConstant(standardPlatform)
-                .Bind<IAssetLoader>().ToConstant(new AssetLoader(assembly))
-                .Bind<IDynamicLibraryLoader>().ToConstant(
-                    os switch
-                    {
-                        OperatingSystemType.WinNT => new Win32Loader(),
-                        OperatingSystemType.OSX => new UnixLoader(),
-                        OperatingSystemType.Linux => new UnixLoader(),
-                        OperatingSystemType.Android => new UnixLoader(),
-                        // iOS, WASM, ...
-                        _ => (IDynamicLibraryLoader)new NotSupportedLoader()
-                    }
-                );
-        }
-    }
-}
diff --git a/src/Avalonia.ReactiveUI/RoutedViewHost.cs b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
index a475cf5eac..9269dc70f8 100644
--- a/src/Avalonia.ReactiveUI/RoutedViewHost.cs
+++ b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
@@ -62,7 +62,7 @@ namespace Avalonia.ReactiveUI
         /// <see cref="AvaloniaProperty"/> for the <see cref="ViewContract"/> property.
         /// </summary>
         public static readonly StyledProperty<string?> ViewContractProperty =
-            AvaloniaProperty.Register<ViewModelViewHost, string?>(nameof(ViewContract));
+            AvaloniaProperty.Register<RoutedViewHost, string?>(nameof(ViewContract));
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RoutedViewHost"/> class.
diff --git a/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt b/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..fcc74cf864
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt
@@ -0,0 +1 @@
+Total Issues: 0
diff --git a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
index 5a8301a2e9..d746c6db7e 100644
--- a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
+++ b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
@@ -7,7 +7,7 @@
     <PackageId>Avalonia.Remote.Protocol</PackageId>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\Avalonia.Input\Key.cs" />
+    <Compile Include="..\Avalonia.Base\Input\Key.cs" />
   </ItemGroup>
   <Import Project="..\..\build\ApiDiff.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.SourceGenerator/Avalonia.SourceGenerator.csproj b/src/Avalonia.SourceGenerator/Avalonia.SourceGenerator.csproj
new file mode 100644
index 0000000000..97e58f8a64
--- /dev/null
+++ b/src/Avalonia.SourceGenerator/Avalonia.SourceGenerator.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
+    <Compile Include="..\Shared\SourceGeneratorAttributes.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Avalonia.SourceGenerator/IsExternalInit.cs b/src/Avalonia.SourceGenerator/IsExternalInit.cs
new file mode 100644
index 0000000000..c6ddf762ad
--- /dev/null
+++ b/src/Avalonia.SourceGenerator/IsExternalInit.cs
@@ -0,0 +1,14 @@
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace System.Runtime.CompilerServices
+{
+    /// <summary>
+    ///     Reserved to be used by the compiler for tracking metadata.
+    ///     This class should not be used by developers in source code.
+    /// </summary>
+    [ExcludeFromCodeCoverage, DebuggerNonUserCode]
+    internal static class IsExternalInit
+    {
+    }
+}
diff --git a/src/Avalonia.SourceGenerator/SubtypesFactoryGenerator.cs b/src/Avalonia.SourceGenerator/SubtypesFactoryGenerator.cs
new file mode 100644
index 0000000000..4fc9397e7a
--- /dev/null
+++ b/src/Avalonia.SourceGenerator/SubtypesFactoryGenerator.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Avalonia.SourceGenerator
+{
+    [Generator(LanguageNames.CSharp)]
+    public class SubtypesFactoryGenerator : IIncrementalGenerator
+    {
+        private record struct MethodTarget(IMethodSymbol Method, string MethodDecl, ITypeSymbol BaseType, string Namespace);
+        private static readonly string s_attributeName = typeof(SubtypesFactoryAttribute).FullName;
+
+        private static bool IsSubtypeOf(ITypeSymbol type, ITypeSymbol baseType)
+        {
+            return type.BaseType is not null && (SymbolEqualityComparer.Default.Equals(type.BaseType, baseType) || IsSubtypeOf(type.BaseType, baseType));
+        }
+
+        private static void GenerateSubTypes(SourceProductionContext context, MethodTarget methodTarget, ImmutableArray<ITypeSymbol> types)
+        {
+            var (method, methodDecl, baseType, @namespace) = methodTarget;
+            var candidateTypes = types.Where(i => IsSubtypeOf(i, baseType)).Where(i => $"{i.ContainingNamespace}.".StartsWith($"{@namespace}.")).ToArray();
+            var type = method.ContainingType;
+            var isGeneric = type.TypeParameters.Length > 0;
+            var isClass = type.TypeKind == TypeKind.Class;
+
+            var typeDecl = $"partial {(isClass ? "class" : "struct")} {type.Name}{(isGeneric ? $"<{string.Join(", ", type.TypeParameters)}>" : "")}";
+            var source = $@"using System;
+using System.Collections.Generic;
+
+namespace {method.ContainingNamespace}
+{{
+    {typeDecl}
+    {{
+        {methodDecl}
+        {{
+            var hasMatch = false;
+            (hasMatch, {method.Parameters[1].Name}) = {method.Parameters[0].Name} switch
+            {{
+{string.Join("\n", candidateTypes.Select(i => $"                \"{i.Name}\" => (true, ({method.Parameters[1].Type})new {i}()),"))}
+                _ => (false, default({method.Parameters[1].Type}))
+            }};
+
+            return hasMatch;
+        }}
+    }}
+}}";
+
+            context.AddSource($"{type}.{method.MetadataName}.gen.cs", source);
+        }
+
+        private static MethodTarget? PopulateMethodTargets(GeneratorSyntaxContext context, CancellationToken token)
+        {
+            token.ThrowIfCancellationRequested();
+            if (context.Node is MethodDeclarationSyntax method)
+            {
+                var attributes = method.AttributeLists.SelectMany(i => i.Attributes);
+                var semanticModel = context.SemanticModel;
+                foreach (var attribute in attributes)
+                {
+                    var attributeTypeInfo = semanticModel.GetTypeInfo(attribute);
+                    if (attributeTypeInfo.Type is null ||
+                        attributeTypeInfo.Type.ToString() != s_attributeName ||
+                        attribute.ArgumentList is null)
+                    {
+                        continue;
+                    }
+
+                    var arguments = attribute.ArgumentList.Arguments;
+                    if (arguments.Count != 2)
+                    {
+                        continue;
+                    }
+
+                    if (arguments[0].Expression is not TypeOfExpressionSyntax typeOfExpr ||
+                        arguments[1].Expression is not LiteralExpressionSyntax and not IdentifierNameSyntax)
+                    {
+                        continue;
+                    }
+
+                    var type = semanticModel.GetTypeInfo(typeOfExpr.Type);
+                    var ns = semanticModel.GetConstantValue(arguments[1].Expression);
+                    var methodDeclInfo = semanticModel.GetDeclaredSymbol(method);
+
+                    if (type.Type is not ITypeSymbol baseType ||
+                        ns.HasValue is false ||
+                        ns.Value is not string nsValue ||
+                        methodDeclInfo is not IMethodSymbol methodSymbol ||
+                        methodSymbol.Parameters.Length != 2 ||
+                        methodSymbol.Parameters[1].RefKind != RefKind.Out)
+                    {
+                        continue;
+                    }
+
+                    var parameters = new SeparatedSyntaxList<ParameterSyntax>().AddRange(method.ParameterList.Parameters.Select(i => i.WithAttributeLists(new SyntaxList<AttributeListSyntax>())));
+                    var methodDecl = method
+                        .WithAttributeLists(new SyntaxList<AttributeListSyntax>())
+                        .WithParameterList(method.ParameterList.WithParameters(parameters))
+                        .WithBody(null)
+                        .WithSemicolonToken(SyntaxFactory.Token(SyntaxKind.None))
+                        .WithoutTrivia().ToString();
+
+                    return new MethodTarget(methodSymbol, methodDecl, baseType, nsValue);
+                }
+            }
+
+            return null;
+        }
+
+        public void Initialize(IncrementalGeneratorInitializationContext context)
+        {
+            var typesProvider = context.SyntaxProvider.CreateSyntaxProvider(
+                static (syntaxNode, token) =>
+                {
+                    token.ThrowIfCancellationRequested();
+                    return syntaxNode is ClassDeclarationSyntax or StructDeclarationSyntax;
+                },
+                static (syntaxContext, token) =>
+                {
+                    token.ThrowIfCancellationRequested();
+                    return syntaxContext.Node is ClassDeclarationSyntax or StructDeclarationSyntax &&
+                        syntaxContext.SemanticModel.GetDeclaredSymbol(syntaxContext.Node) is ITypeSymbol typeSymbol
+                        ? typeSymbol : null;
+                })
+                .SelectMany((type, token) =>
+                {
+                    token.ThrowIfCancellationRequested();
+                    return type is null ? Array.Empty<ITypeSymbol>() : new ITypeSymbol[] { type };
+                });
+
+            var methodsProvider = context.SyntaxProvider.CreateSyntaxProvider(
+                static (syntaxNode, token) =>
+                {
+                    token.ThrowIfCancellationRequested();
+                    return syntaxNode is MethodDeclarationSyntax { AttributeLists.Count: > 0 };
+                }, PopulateMethodTargets)
+                .SelectMany((method, token) =>
+                {
+                    token.ThrowIfCancellationRequested();
+                    return method is null ? Array.Empty<MethodTarget>() : new MethodTarget[] { method.Value };
+                });
+
+            var generateContext = methodsProvider.Combine(typesProvider.Collect());
+
+            context.RegisterSourceOutput(generateContext, static (sourceContext, source) =>
+            {
+                sourceContext.CancellationToken.ThrowIfCancellationRequested();
+                GenerateSubTypes(sourceContext, source.Left, source.Right);
+            });
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/ApiCompatBaseline.txt b/src/Avalonia.Styling/ApiCompatBaseline.txt
deleted file mode 100644
index 0eedc3e360..0000000000
--- a/src/Avalonia.Styling/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Compat issues with assembly Avalonia.Styling:
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Styling.IStyleInstance.IsActive' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Styling.IStyleInstance.IsActive.get()' is present in the implementation but not in the contract.
-Total Issues: 2
diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj
deleted file mode 100644
index 139ba1bd2e..0000000000
--- a/src/Avalonia.Styling/Avalonia.Styling.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <AssemblyName>Avalonia.Styling</AssemblyName>
-    <RootNamespace>Avalonia</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-  </ItemGroup>
-  <Import Project="..\..\build\ApiDiff.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
diff --git a/src/Avalonia.Styling/Controls/ChildNameScope.cs b/src/Avalonia.Styling/Controls/ChildNameScope.cs
deleted file mode 100644
index 58114a57fd..0000000000
--- a/src/Avalonia.Styling/Controls/ChildNameScope.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System.Threading.Tasks;
-using Avalonia.Utilities;
-
-namespace Avalonia.Controls
-{
-    public class ChildNameScope : INameScope
-    {
-        private readonly INameScope _parentScope;
-        private readonly NameScope _inner = new NameScope();
-
-        public ChildNameScope(INameScope parentScope)
-        {
-            _parentScope = parentScope;
-        }
-        
-        public void Register(string name, object element) => _inner.Register(name, element);
-
-        public SynchronousCompletionAsyncResult<object?> FindAsync(string name)
-        {
-            var found = Find(name);
-            if (found != null)
-                return new SynchronousCompletionAsyncResult<object?>(found);
-            // Not found and both current and parent scope are in completed state
-            if(IsCompleted)
-                return new SynchronousCompletionAsyncResult<object?>(null);
-            return DoFindAsync(name);
-        }
-
-        public SynchronousCompletionAsyncResult<object?> DoFindAsync(string name)
-        {
-            var src = new SynchronousCompletionAsyncResultSource<object?>();
-
-            void ParentSearch()
-            {
-                var parentSearch = _parentScope.FindAsync(name);
-                if (parentSearch.IsCompleted)
-                    src.SetResult(parentSearch.GetResult());
-                else
-                    parentSearch.OnCompleted(() => src.SetResult(parentSearch.GetResult()));
-            }
-            if (!_inner.IsCompleted)
-            {
-                // Guaranteed to be incomplete at this point
-                var innerSearch = _inner.FindAsync(name);
-                innerSearch.OnCompleted(() =>
-                {
-                    var value = innerSearch.GetResult();
-                    if (value != null)
-                        src.SetResult(value);
-                    else ParentSearch();
-                });
-            }
-            else
-                ParentSearch();
-
-            return src.AsyncResult;
-        }
-
-        public object? Find(string name)
-        {
-            var found = _inner.Find(name);
-            if (found != null)
-                return found;
-            if (_inner.IsCompleted)
-                return _parentScope.Find(name);
-            return null;
-        }
-
-        public void Complete() => _inner.Complete();
-
-        public bool IsCompleted => _inner.IsCompleted && _parentScope.IsCompleted;
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/INameScope.cs b/src/Avalonia.Styling/Controls/INameScope.cs
deleted file mode 100644
index 1ca7db2f37..0000000000
--- a/src/Avalonia.Styling/Controls/INameScope.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Avalonia.Utilities;
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Defines a name scope.
-    /// </summary>
-    public interface INameScope
-    {
-        /// <summary>
-        /// Registers an element in the name scope.
-        /// </summary>
-        /// <param name="name">The element name.</param>
-        /// <param name="element">The element.</param>
-        void Register(string name, object element);
-
-        /// <summary>
-        /// Finds a named element in the name scope, waits for the scope to be completely populated before returning null
-        /// Returned task is configured to run any continuations synchronously.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns>The element, or null if the name was not found.</returns>
-        SynchronousCompletionAsyncResult<object?> FindAsync(string name);
-        
-        /// <summary>
-        /// Finds a named element in the name scope, returns immediately, doesn't traverse the name scope stack
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns>The element, or null if the name was not found.</returns>
-        object? Find(string name);
-
-        /// <summary>
-        /// Marks the name scope as completed, no further registrations will be allowed
-        /// </summary>
-        void Complete();
-        
-        /// <summary>
-        /// Returns whether further registrations are allowed on the scope
-        /// </summary>
-        bool IsCompleted { get; }
-
-
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/IPseudoClasses.cs b/src/Avalonia.Styling/Controls/IPseudoClasses.cs
deleted file mode 100644
index 27290716d0..0000000000
--- a/src/Avalonia.Styling/Controls/IPseudoClasses.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Exposes an interface for setting pseudoclasses on a <see cref="Classes"/> collection.
-    /// </summary>
-    public interface IPseudoClasses
-    {
-        /// <summary>
-        /// Adds a pseudoclass to the collection.
-        /// </summary>
-        /// <param name="name">The pseudoclass name.</param>
-        void Add(string name);
-
-        /// <summary>
-        /// Removes a pseudoclass from the collection.
-        /// </summary>
-        /// <param name="name">The pseudoclass name.</param>
-        bool Remove(string name);
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/IResourceHost.cs b/src/Avalonia.Styling/Controls/IResourceHost.cs
deleted file mode 100644
index ea34a8b39a..0000000000
--- a/src/Avalonia.Styling/Controls/IResourceHost.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Represents an element which hosts resources.
-    /// </summary>
-    /// <remarks>
-    /// This interface is implemented by <see cref="StyledElement"/> and `Application`.
-    /// </remarks>
-    public interface IResourceHost : IResourceNode
-    {
-        /// <summary>
-        /// Raised when the resources change on the element or an ancestor of the element.
-        /// </summary>
-        event EventHandler<ResourcesChangedEventArgs>? ResourcesChanged;
-
-        /// <summary>
-        /// Notifies the resource host that one or more of its hosted resources has changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        /// <remarks>
-        /// This method will be called automatically by the framework, you should not need to call
-        /// this method yourself. It is called when the resources hosted by this element have
-        /// changed, and is usually called by a resource dictionary or style hosted by the element
-        /// in response to a resource being added or removed.
-        /// </remarks>
-        void NotifyHostedResourcesChanged(ResourcesChangedEventArgs e);
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/IResourceNode.cs b/src/Avalonia.Styling/Controls/IResourceNode.cs
deleted file mode 100644
index 73bfeaf161..0000000000
--- a/src/Avalonia.Styling/Controls/IResourceNode.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Represents an object that can be queried for resources.
-    /// </summary>
-    /// <remarks>
-    /// The interface represents a common interface for both controls that host resources
-    /// (<see cref="IResourceHost"/>) and resource providers such as <see cref="ResourceDictionary"/>
-    /// (see <see cref="IResourceProvider"/>).
-    /// </remarks>
-    public interface IResourceNode
-    {
-        /// <summary>
-        /// Gets a value indicating whether the object has resources.
-        /// </summary>
-        bool HasResources { get; }
-
-        /// <summary>
-        /// Tries to find a resource within the object.
-        /// </summary>
-        /// <param name="key">The resource key.</param>
-        /// <param name="value">
-        /// When this method returns, contains the value associated with the specified key,
-        /// if the key is found; otherwise, null.
-        /// </param>
-        /// <returns>
-        /// True if the resource if found, otherwise false.
-        /// </returns>
-        bool TryGetResource(object key, out object? value);
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs b/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
deleted file mode 100644
index dbf8c68892..0000000000
--- a/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-#nullable enable
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Defines an interface through which a <see cref="StyledElement"/>'s inheritance parent can be set.
-    /// </summary>
-    /// <remarks>
-    /// You should not usually need to use this interface - it is for advanced scenarios only.
-    /// Additionally, <see cref="ISetLogicalParent"/> also sets the inheritance parent; this
-    /// interface is only needed where the logical and inheritance parents differ.
-    /// </remarks>
-    public interface ISetInheritanceParent
-    {
-        /// <summary>
-        /// Sets the control's inheritance parent.
-        /// </summary>
-        /// <param name="parent">The parent.</param>
-        void SetParent(IAvaloniaObject? parent);
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/ISetLogicalParent.cs b/src/Avalonia.Styling/Controls/ISetLogicalParent.cs
deleted file mode 100644
index 85bda05961..0000000000
--- a/src/Avalonia.Styling/Controls/ISetLogicalParent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Avalonia.LogicalTree;
-
-#nullable enable
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Defines an interface through which a <see cref="StyledElement"/>'s logical parent can be set.
-    /// </summary>
-    /// <remarks>
-    /// You should not usually need to use this interface - it is for advanced scenarios only.
-    /// </remarks>
-    public interface ISetLogicalParent
-    {
-        /// <summary>
-        /// Sets the control's parent.
-        /// </summary>
-        /// <param name="parent">The parent.</param>
-        void SetParent(ILogical? parent);
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs b/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs
deleted file mode 100644
index 0060767565..0000000000
--- a/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-#nullable enable
-
-namespace Avalonia.Controls.Metadata
-{
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-    public sealed class PseudoClassesAttribute : Attribute
-    {
-        public PseudoClassesAttribute(params string[] pseudoClasses)
-        {
-            PseudoClasses = pseudoClasses;
-        }
-
-        public IReadOnlyList<string> PseudoClasses { get; }
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/NameScope.cs b/src/Avalonia.Styling/Controls/NameScope.cs
deleted file mode 100644
index 77f98f85c4..0000000000
--- a/src/Avalonia.Styling/Controls/NameScope.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Avalonia.LogicalTree;
-using Avalonia.Utilities;
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Implements a name scope.
-    /// </summary>
-    public class NameScope : INameScope
-    {
-        /// <summary>
-        /// Defines the NameScope attached property.
-        /// </summary>
-        public static readonly AttachedProperty<INameScope> NameScopeProperty =
-            AvaloniaProperty.RegisterAttached<NameScope, StyledElement, INameScope>("NameScope");
-
-        /// <inheritdoc/>
-        public bool IsCompleted { get; private set; }
-        
-        private readonly Dictionary<string, object> _inner = new Dictionary<string, object>();
-
-        private readonly Dictionary<string, SynchronousCompletionAsyncResultSource<object?>> _pendingSearches =
-            new Dictionary<string, SynchronousCompletionAsyncResultSource<object?>>();
-        
-        /// <summary>
-        /// Gets the value of the attached <see cref="NameScopeProperty"/> on a styled element.
-        /// </summary>
-        /// <param name="styled">The styled element.</param>
-        /// <returns>The value of the NameScope attached property.</returns>
-        public static INameScope GetNameScope(StyledElement styled)
-        {
-            _ = styled ?? throw new ArgumentNullException(nameof(styled));
-
-            return styled.GetValue(NameScopeProperty);
-        }
-
-        /// <summary>
-        /// Sets the value of the attached <see cref="NameScopeProperty"/> on a styled element.
-        /// </summary>
-        /// <param name="styled">The styled element.</param>
-        /// <param name="value">The value to set.</param>
-        public static void SetNameScope(StyledElement styled, INameScope value)
-        {
-            _ = styled ?? throw new ArgumentNullException(nameof(styled));
-
-            styled.SetValue(NameScopeProperty, value);
-        }
-
-        /// <inheritdoc />
-        public void Register(string name, object element)
-        {
-            if (IsCompleted)
-                throw new InvalidOperationException("NameScope is completed, no further registrations are allowed");
-
-            _ = name ?? throw new ArgumentNullException(nameof(name));
-            _ = element ?? throw new ArgumentNullException(nameof(element));
-
-            if (_inner.TryGetValue(name, out var existing))
-            {
-                if (existing != element)
-                {
-                    throw new ArgumentException($"Control with the name '{name}' already registered.");
-                }
-            }
-            else
-            {
-                _inner.Add(name, element);
-                if (_pendingSearches.TryGetValue(name, out var tcs))
-                {
-                    _pendingSearches.Remove(name);
-                    tcs.SetResult(element);
-                }
-            }
-        }
-
-        public SynchronousCompletionAsyncResult<object?> FindAsync(string name)
-        {
-            var found = Find(name);
-            if (found != null)
-                return new SynchronousCompletionAsyncResult<object?>(found);
-            if (IsCompleted)
-                return new SynchronousCompletionAsyncResult<object?>(null);
-            if (!_pendingSearches.TryGetValue(name, out var tcs))
-                // We are intentionally running continuations synchronously here
-                _pendingSearches[name] = tcs = new SynchronousCompletionAsyncResultSource<object?>();
-
-            return tcs.AsyncResult;
-        }
-
-        /// <inheritdoc />
-        public object? Find(string name)
-        {
-            _ = name ?? throw new ArgumentNullException(nameof(name));
-
-            _inner.TryGetValue(name, out var result);
-            return result;
-        }
-
-        public void Complete()
-        {
-            IsCompleted = true;
-            foreach (var kp in _pendingSearches)
-                kp.Value.TrySetResult(null);
-            _pendingSearches.Clear();
-        }
-
-        
-    }
-}
diff --git a/src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs b/src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs
deleted file mode 100644
index 513b3f2424..0000000000
--- a/src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-using System;
-using Avalonia.Data.Converters;
-using Avalonia.LogicalTree;
-using Avalonia.Reactive;
-
-#nullable enable
-
-namespace Avalonia.Controls
-{
-    public static class ResourceNodeExtensions
-    {
-        /// <summary>
-        /// Finds the specified resource by searching up the logical tree and then global styles.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="key">The resource key.</param>
-        /// <returns>The resource, or <see cref="AvaloniaProperty.UnsetValue"/> if not found.</returns>
-        public static object? FindResource(this IResourceHost control, object key)
-        {
-            control = control ?? throw new ArgumentNullException(nameof(control));
-            key = key ?? throw new ArgumentNullException(nameof(key));
-
-            if (control.TryFindResource(key, out var value))
-            {
-                return value;
-            }
-
-            return AvaloniaProperty.UnsetValue;
-        }
-
-        /// <summary>
-        /// Tries to the specified resource by searching up the logical tree and then global styles.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="key">The resource key.</param>
-        /// <param name="value">On return, contains the resource if found, otherwise null.</param>
-        /// <returns>True if the resource was found; otherwise false.</returns>
-        public static bool TryFindResource(this IResourceHost control, object key, out object? value)
-        {
-            control = control ?? throw new ArgumentNullException(nameof(control));
-            key = key ?? throw new ArgumentNullException(nameof(key));
-
-            IResourceHost? current = control;
-
-            while (current != null)
-            {
-                if (current is IResourceHost host)
-                {
-                    if (host.TryGetResource(key, out value))
-                    {
-                        return true;
-                    }
-                }
-
-                current = (current as IStyledElement)?.StylingParent as IResourceHost;
-            }
-
-            value = null;
-            return false;
-        }
-
-        public static IObservable<object?> GetResourceObservable(
-            this IResourceHost control,
-            object key,
-            Func<object?, object?>? converter = null)
-        {
-            control = control ?? throw new ArgumentNullException(nameof(control));
-            key = key ?? throw new ArgumentNullException(nameof(key));
-
-            return new ResourceObservable(control, key, converter);
-        }
-
-        public static IObservable<object?> GetResourceObservable(
-            this IResourceProvider resourceProvider,
-            object key,
-            Func<object?, object?>? converter = null)
-        {
-            resourceProvider = resourceProvider ?? throw new ArgumentNullException(nameof(resourceProvider));
-            key = key ?? throw new ArgumentNullException(nameof(key));
-
-            return new FloatingResourceObservable(resourceProvider, key, converter);
-        }
-
-        private class ResourceObservable : LightweightObservableBase<object?>
-        {
-            private readonly IResourceHost _target;
-            private readonly object _key;
-            private readonly Func<object?, object?>? _converter;
-
-            public ResourceObservable(IResourceHost target, object key, Func<object?, object?>? converter)
-            {
-                _target = target;
-                _key = key;
-                _converter = converter;
-            }
-
-            protected override void Initialize()
-            {
-                _target.ResourcesChanged += ResourcesChanged;
-            }
-
-            protected override void Deinitialize()
-            {
-                _target.ResourcesChanged -= ResourcesChanged;
-            }
-
-            protected override void Subscribed(IObserver<object?> observer, bool first)
-            {
-                observer.OnNext(Convert(_target.FindResource(_key)));
-            }
-
-            private void ResourcesChanged(object? sender, ResourcesChangedEventArgs e)
-            {
-                PublishNext(Convert(_target.FindResource(_key)));
-            }
-
-            private object? Convert(object? value) => _converter?.Invoke(value) ?? value;
-        }
-
-        private class FloatingResourceObservable : LightweightObservableBase<object?>
-        {
-            private readonly IResourceProvider _target;
-            private readonly object _key;
-            private readonly Func<object?, object?>? _converter;
-            private IResourceHost? _owner;
-
-            public FloatingResourceObservable(IResourceProvider target, object key, Func<object?, object?>? converter)
-            {
-                _target = target;
-                _key = key;
-                _converter = converter;
-            }
-
-            protected override void Initialize()
-            {
-                _target.OwnerChanged += OwnerChanged;
-                _owner = _target.Owner;
-            }
-
-            protected override void Deinitialize()
-            {
-                _target.OwnerChanged -= OwnerChanged;
-                _owner = null;
-            }
-
-            protected override void Subscribed(IObserver<object?> observer, bool first)
-            {
-                if (_target.Owner is object)
-                {
-                    observer.OnNext(Convert(_target.Owner.FindResource(_key)));
-                }
-            }
-
-            private void PublishNext()
-            {
-                if (_target.Owner is object)
-                {
-                    PublishNext(Convert(_target.Owner.FindResource(_key)));
-                }
-            }
-
-            private void OwnerChanged(object? sender, EventArgs e)
-            {
-                if (_owner is object)
-                {
-                    _owner.ResourcesChanged -= ResourcesChanged;
-                }
-
-                _owner = _target.Owner;
-
-                if (_owner is object)
-                {
-                    _owner.ResourcesChanged += ResourcesChanged;
-                }
-
-                PublishNext();
-            }
-
-            private void ResourcesChanged(object? sender, ResourcesChangedEventArgs e)
-            {
-                PublishNext();
-            }
-
-            private object? Convert(object? value) => _converter?.Invoke(value) ?? value;
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/IDataContextProvider.cs b/src/Avalonia.Styling/IDataContextProvider.cs
deleted file mode 100644
index 1172adcaa4..0000000000
--- a/src/Avalonia.Styling/IDataContextProvider.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-#nullable enable
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Defines an element with a data context that can be used for binding.
-    /// </summary>
-    public interface IDataContextProvider : IAvaloniaObject
-    {
-        /// <summary>
-        /// Gets or sets the element's data context.
-        /// </summary>
-        object? DataContext { get; set; }
-    }
-}
diff --git a/src/Avalonia.Styling/IStyledElement.cs b/src/Avalonia.Styling/IStyledElement.cs
deleted file mode 100644
index a068d4a5bf..0000000000
--- a/src/Avalonia.Styling/IStyledElement.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.ComponentModel;
-using Avalonia.Controls;
-using Avalonia.LogicalTree;
-using Avalonia.Styling;
-
-#nullable enable
-
-namespace Avalonia
-{
-    public interface IStyledElement :
-        IStyleable,
-        IStyleHost,
-        ILogical,
-        IResourceHost,
-        IDataContextProvider,
-        ISupportInitialize
-    {
-        /// <summary>
-        /// Occurs when the control has finished initialization.
-        /// </summary>
-        event EventHandler? Initialized;
-
-        /// <summary>
-        /// Gets a value that indicates whether the element has finished initialization.
-        /// </summary>
-        bool IsInitialized { get; }
-
-        /// <summary>
-        /// Gets or sets the control's styling classes.
-        /// </summary>
-        new Classes Classes { get; set; }
-
-        /// <summary>
-        /// Gets the control's logical parent.
-        /// </summary>
-        IStyledElement? Parent { get; }
-    }
-}
diff --git a/src/Avalonia.Styling/LogicalTree/ChildIndexChangedEventArgs.cs b/src/Avalonia.Styling/LogicalTree/ChildIndexChangedEventArgs.cs
deleted file mode 100644
index de41f5292c..0000000000
--- a/src/Avalonia.Styling/LogicalTree/ChildIndexChangedEventArgs.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-#nullable enable
-using System;
-
-namespace Avalonia.LogicalTree
-{
-    /// <summary>
-    /// Event args for <see cref="IChildIndexProvider.ChildIndexChanged"/> event.
-    /// </summary>
-    public class ChildIndexChangedEventArgs : EventArgs
-    {
-        public ChildIndexChangedEventArgs()
-        {
-        }
-
-        public ChildIndexChangedEventArgs(ILogical child)
-        {
-            Child = child;
-        }
-
-        /// <summary>
-        /// Logical child which index was changed.
-        /// If null, all children should be reset.
-        /// </summary>
-        public ILogical? Child { get; }
-    }
-}
diff --git a/src/Avalonia.Styling/LogicalTree/ILogical.cs b/src/Avalonia.Styling/LogicalTree/ILogical.cs
deleted file mode 100644
index caff3d8150..0000000000
--- a/src/Avalonia.Styling/LogicalTree/ILogical.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using Avalonia.Collections;
-using Avalonia.Controls;
-
-namespace Avalonia.LogicalTree
-{
-    /// <summary>
-    /// Represents a node in the logical tree.
-    /// </summary>
-    public interface ILogical
-    {
-        /// <summary>
-        /// Raised when the control is attached to a rooted logical tree.
-        /// </summary>
-        event EventHandler<LogicalTreeAttachmentEventArgs>? AttachedToLogicalTree;
-
-        /// <summary>
-        /// Raised when the control is detached from a rooted logical tree.
-        /// </summary>
-        event EventHandler<LogicalTreeAttachmentEventArgs>? DetachedFromLogicalTree;
-
-        /// <summary>
-        /// Gets a value indicating whether the element is attached to a rooted logical tree.
-        /// </summary>
-        bool IsAttachedToLogicalTree { get; }
-
-        /// <summary>
-        /// Gets the logical parent.
-        /// </summary>
-        ILogical? LogicalParent { get; }
-
-        /// <summary>
-        /// Gets the logical children.
-        /// </summary>
-        IAvaloniaReadOnlyList<ILogical> LogicalChildren { get; }
-
-        /// <summary>
-        /// Notifies the control that it is being attached to a rooted logical tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        /// <remarks>
-        /// This method will be called automatically by the framework, you should not need to call
-        /// this method yourself.
-        /// </remarks>
-        void NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e);
-
-        /// <summary>
-        /// Notifies the control that it is being detached from a rooted logical tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        /// <remarks>
-        /// This method will be called automatically by the framework, you should not need to call
-        /// this method yourself.
-        /// </remarks>
-        void NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e);
-
-        /// <summary>
-        /// Notifies the control that a change has been made to resources that apply to it.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        /// <remarks>
-        /// This method will be called automatically by the framework, you should not need to call
-        /// this method yourself.
-        /// </remarks>
-        void NotifyResourcesChanged(ResourcesChangedEventArgs e);
-    }
-}
diff --git a/src/Avalonia.Styling/LogicalTree/ILogicalRoot.cs b/src/Avalonia.Styling/LogicalTree/ILogicalRoot.cs
deleted file mode 100644
index 4a61544a6f..0000000000
--- a/src/Avalonia.Styling/LogicalTree/ILogicalRoot.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Avalonia.LogicalTree
-{
-    /// <summary>
-    /// Represents a root of a logical tree.
-    /// </summary>
-    public interface ILogicalRoot : ILogical
-    {
-    }
-}
diff --git a/src/Avalonia.Styling/Properties/AssemblyInfo.cs b/src/Avalonia.Styling/Properties/AssemblyInfo.cs
deleted file mode 100644
index ab034740ed..0000000000
--- a/src/Avalonia.Styling/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Runtime.CompilerServices;
-using Avalonia.Metadata;
-
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.LogicalTree")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Styling")]
-
-[assembly: InternalsVisibleTo("Avalonia.Styling.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs
deleted file mode 100644
index 5f498623e1..0000000000
--- a/src/Avalonia.Styling/StyledElement.cs
+++ /dev/null
@@ -1,888 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using Avalonia.Animation;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Data;
-using Avalonia.Diagnostics;
-using Avalonia.Logging;
-using Avalonia.LogicalTree;
-using Avalonia.Styling;
-
-#nullable enable
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Extends an <see cref="Animatable"/> with the following features:
-    /// 
-    /// - An inherited <see cref="DataContext"/>.
-    /// - Implements <see cref="IStyleable"/> to allow styling to work on the styled element.
-    /// - Implements <see cref="ILogical"/> to form part of a logical tree.
-    /// - A collection of class strings for custom styling.
-    /// </summary>
-    public class StyledElement : Animatable, IDataContextProvider, IStyledElement, ISetLogicalParent, ISetInheritanceParent
-    {
-        /// <summary>
-        /// Defines the <see cref="DataContext"/> property.
-        /// </summary>
-        public static readonly StyledProperty<object?> DataContextProperty =
-            AvaloniaProperty.Register<StyledElement, object?>(
-                nameof(DataContext),
-                inherits: true,
-                notifying: DataContextNotifying);
-
-        /// <summary>
-        /// Defines the <see cref="Name"/> property.
-        /// </summary>
-        public static readonly DirectProperty<StyledElement, string?> NameProperty =
-            AvaloniaProperty.RegisterDirect<StyledElement, string?>(nameof(Name), o => o.Name, (o, v) => o.Name = v);
-        
-        /// <summary>
-        /// Defines the <see cref="Parent"/> property.
-        /// </summary>
-        public static readonly DirectProperty<StyledElement, IStyledElement?> ParentProperty =
-            AvaloniaProperty.RegisterDirect<StyledElement, IStyledElement?>(nameof(Parent), o => o.Parent);
-
-        /// <summary>
-        /// Defines the <see cref="TemplatedParent"/> property.
-        /// </summary>
-        public static readonly DirectProperty<StyledElement, ITemplatedControl?> TemplatedParentProperty =
-            AvaloniaProperty.RegisterDirect<StyledElement, ITemplatedControl?>(
-                nameof(TemplatedParent),
-                o => o.TemplatedParent,
-                (o ,v) => o.TemplatedParent = v);
-
-        private int _initCount;
-        private string? _name;
-        private readonly Classes _classes = new Classes();
-        private ILogicalRoot? _logicalRoot;
-        private IAvaloniaList<ILogical>? _logicalChildren;
-        private IResourceDictionary? _resources;
-        private Styles? _styles;
-        private bool _styled;
-        private List<IStyleInstance>? _appliedStyles;
-        private ITemplatedControl? _templatedParent;
-        private bool _dataContextUpdating;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="StyledElement"/> class.
-        /// </summary>
-        static StyledElement()
-        {
-            DataContextProperty.Changed.AddClassHandler<StyledElement>((x,e) => x.OnDataContextChangedCore(e));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StyledElement"/> class.
-        /// </summary>
-        public StyledElement()
-        {
-            _logicalRoot = this as ILogicalRoot;
-        }
-
-        /// <summary>
-        /// Raised when the styled element is attached to a rooted logical tree.
-        /// </summary>
-        public event EventHandler<LogicalTreeAttachmentEventArgs>? AttachedToLogicalTree;
-
-        /// <summary>
-        /// Raised when the styled element is detached from a rooted logical tree.
-        /// </summary>
-        public event EventHandler<LogicalTreeAttachmentEventArgs>? DetachedFromLogicalTree;
-
-        /// <summary>
-        /// Occurs when the <see cref="DataContext"/> property changes.
-        /// </summary>
-        /// <remarks>
-        /// This event will be raised when the <see cref="DataContext"/> property has changed and
-        /// all subscribers to that change have been notified.
-        /// </remarks>
-        public event EventHandler? DataContextChanged;
-
-        /// <summary>
-        /// Occurs when the styled element has finished initialization.
-        /// </summary>
-        /// <remarks>
-        /// The Initialized event indicates that all property values on the styled element have been set.
-        /// When loading the styled element from markup, it occurs when 
-        /// <see cref="ISupportInitialize.EndInit"/> is called *and* the styled element
-        /// is attached to a rooted logical tree. When the styled element is created by code and
-        /// <see cref="ISupportInitialize"/> is not used, it is called when the styled element is attached
-        /// to the visual tree.
-        /// </remarks>
-        public event EventHandler? Initialized;
-
-        /// <summary>
-        /// Occurs when a resource in this styled element or a parent styled element has changed.
-        /// </summary>
-        public event EventHandler<ResourcesChangedEventArgs>? ResourcesChanged;
-
-        /// <summary>
-        /// Gets or sets the name of the styled element.
-        /// </summary>
-        /// <remarks>
-        /// An element's name is used to uniquely identify an element within the element's name
-        /// scope. Once the element is added to a logical tree, its name cannot be changed.
-        /// </remarks>
-        public string? Name
-        {
-            get => _name;
-
-            set
-            {
-                if (_styled)
-                {
-                    throw new InvalidOperationException("Cannot set Name : styled element already styled.");
-                }
-
-                _name = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the styled element's classes.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// Classes can be used to apply user-defined styling to styled elements, or to allow styled elements
-        /// that share a common purpose to be easily selected.
-        /// </para>
-        /// <para>
-        /// Even though this property can be set, the setter is only intended for use in object
-        /// initializers. Assigning to this property does not change the underlying collection,
-        /// it simply clears the existing collection and adds the contents of the assigned
-        /// collection.
-        /// </para>
-        /// </remarks>
-        public Classes Classes
-        {
-            get
-            {
-                return _classes;
-            }
-
-            set
-            {
-                if (_classes != value)
-                {
-                    _classes.Replace(value);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the control's data context.
-        /// </summary>
-        /// <remarks>
-        /// The data context is an inherited property that specifies the default object that will
-        /// be used for data binding.
-        /// </remarks>
-        public object? DataContext
-        {
-            get { return GetValue(DataContextProperty); }
-            set { SetValue(DataContextProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets a value that indicates whether the element has finished initialization.
-        /// </summary>
-        /// <remarks>
-        /// For more information about when IsInitialized is set, see the <see cref="Initialized"/>
-        /// event.
-        /// </remarks>
-        public bool IsInitialized { get; private set; }
-
-        /// <summary>
-        /// Gets the styles for the styled element.
-        /// </summary>
-        /// <remarks>
-        /// Styles for the entire application are added to the Application.Styles collection, but
-        /// each styled element may in addition define its own styles which are applied to the styled element
-        /// itself and its children.
-        /// </remarks>
-        public Styles Styles => _styles ??= new Styles(this);
-
-        /// <summary>
-        /// Gets or sets the styled element's resource dictionary.
-        /// </summary>
-        public IResourceDictionary Resources
-        {
-            get => _resources ??= new ResourceDictionary(this);
-            set
-            {
-                value = value ?? throw new ArgumentNullException(nameof(value));
-                _resources?.RemoveOwner(this);
-                _resources = value;
-                _resources.AddOwner(this);
-            }
-        }
-
-        /// <summary>
-        /// Gets the styled element whose lookless template this styled element is part of.
-        /// </summary>
-        public ITemplatedControl? TemplatedParent
-        {
-            get => _templatedParent;
-            internal set => SetAndRaise(TemplatedParentProperty, ref _templatedParent, value);
-        }
-
-        /// <summary>
-        /// Gets the styled element's logical children.
-        /// </summary>
-        protected IAvaloniaList<ILogical> LogicalChildren
-        {
-            get
-            {
-                if (_logicalChildren == null)
-                {
-                    var list = new AvaloniaList<ILogical>
-                    {
-                        ResetBehavior = ResetBehavior.Remove,
-                        Validate = logical => ValidateLogicalChild(logical)
-                    };
-                    list.CollectionChanged += LogicalChildrenCollectionChanged;
-                    _logicalChildren = list;
-                }
-
-                return _logicalChildren;
-            }
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Classes"/> collection in a form that allows adding and removing
-        /// pseudoclasses.
-        /// </summary>
-        protected IPseudoClasses PseudoClasses => Classes;
-
-        /// <summary>
-        /// Gets a value indicating whether the element is attached to a rooted logical tree.
-        /// </summary>
-        bool ILogical.IsAttachedToLogicalTree => _logicalRoot != null;
-
-        /// <summary>
-        /// Gets the styled element's logical parent.
-        /// </summary>
-        public IStyledElement? Parent { get; private set; }
-
-        /// <summary>
-        /// Gets the styled element's logical parent.
-        /// </summary>
-        ILogical? ILogical.LogicalParent => Parent;
-
-        /// <summary>
-        /// Gets the styled element's logical children.
-        /// </summary>
-        IAvaloniaReadOnlyList<ILogical> ILogical.LogicalChildren => LogicalChildren;
-
-        /// <inheritdoc/>
-        bool IResourceNode.HasResources => (_resources?.HasResources ?? false) ||
-            (((IResourceNode?)_styles)?.HasResources ?? false);
-
-        /// <inheritdoc/>
-        IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
-
-        /// <summary>
-        /// Gets the type by which the styled element is styled.
-        /// </summary>
-        /// <remarks>
-        /// Usually controls are styled by their own type, but there are instances where you want
-        /// a styled element to be styled by its base type, e.g. creating SpecialButton that
-        /// derives from Button and adds extra functionality but is still styled as a regular
-        /// Button.
-        /// </remarks>
-        Type IStyleable.StyleKey => GetType();
-
-        /// <inheritdoc/>
-        bool IStyleHost.IsStylesInitialized => _styles != null;
-
-        /// <inheritdoc/>
-        IStyleHost? IStyleHost.StylingParent => (IStyleHost?)InheritanceParent;
-
-        /// <inheritdoc/>
-        public virtual void BeginInit()
-        {
-            ++_initCount;
-        }
-
-        /// <inheritdoc/>
-        public virtual void EndInit()
-        {
-            if (_initCount == 0)
-            {
-                throw new InvalidOperationException("BeginInit was not called.");
-            }
-
-            if (--_initCount == 0 && _logicalRoot != null)
-            {
-                ApplyStyling();
-                InitializeIfNeeded();
-            }
-        }
-
-        /// <summary>
-        /// Applies styling to the control if the control is initialized and styling is not
-        /// already applied.
-        /// </summary>
-        /// <returns>
-        /// A value indicating whether styling is now applied to the control.
-        /// </returns>
-        protected bool ApplyStyling()
-        {
-            if (_initCount == 0 && !_styled)
-            {
-                try
-                {
-                    BeginBatchUpdate();
-                    AvaloniaLocator.Current.GetService<IStyler>()?.ApplyStyles(this);
-                }
-                finally
-                {
-                    EndBatchUpdate();
-                }
-
-                _styled = true;
-            }
-
-            return _styled;
-        }
-
-        /// <summary>
-        /// Detaches all styles from the element and queues a restyle.
-        /// </summary>
-        protected virtual void InvalidateStyles() => DetachStyles();
-
-        protected void InitializeIfNeeded()
-        {
-            if (_initCount == 0 && !IsInitialized)
-            {
-                IsInitialized = true;
-                OnInitialized();
-                Initialized?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        internal StyleDiagnostics GetStyleDiagnosticsInternal()
-        {
-            IReadOnlyList<IStyleInstance>? appliedStyles = _appliedStyles;
-
-            if (appliedStyles is null)
-            {
-                appliedStyles = Array.Empty<IStyleInstance>();
-            }
-
-            return new StyleDiagnostics(appliedStyles);
-        }
-
-        /// <inheritdoc/>
-        void ILogical.NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-            OnAttachedToLogicalTreeCore(e);
-        }
-
-        /// <inheritdoc/>
-        void ILogical.NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-            OnDetachedFromLogicalTreeCore(e);
-        }
-
-        /// <inheritdoc/>
-        void ILogical.NotifyResourcesChanged(ResourcesChangedEventArgs e) => NotifyResourcesChanged(e);
-
-        /// <inheritdoc/>
-        void IResourceHost.NotifyHostedResourcesChanged(ResourcesChangedEventArgs e) => NotifyResourcesChanged(e);
-
-        /// <inheritdoc/>
-        bool IResourceNode.TryGetResource(object key, out object? value)
-        {
-            value = null;
-            return (_resources?.TryGetResource(key, out value) ?? false) ||
-                   (_styles?.TryGetResource(key, out value) ?? false);
-        }
-
-        /// <summary>
-        /// Sets the styled element's logical parent.
-        /// </summary>
-        /// <param name="parent">The parent.</param>
-        void ISetLogicalParent.SetParent(ILogical? parent)
-        {
-            var old = Parent;
-
-            if (parent != old)
-            {
-                if (old != null && parent != null)
-                {
-                    throw new InvalidOperationException("The Control already has a parent.");
-                }
-
-                if (InheritanceParent == null || parent == null)
-                {
-                    InheritanceParent = parent as AvaloniaObject;
-                }
-
-                Parent = (IStyledElement?)parent;
-
-                if (_logicalRoot != null)
-                {
-                    var e = new LogicalTreeAttachmentEventArgs(_logicalRoot, this, old!);
-                    OnDetachedFromLogicalTreeCore(e);
-                }
-
-                var newRoot = FindLogicalRoot(this);
-
-                if (newRoot is object)
-                {
-                    var e = new LogicalTreeAttachmentEventArgs(newRoot, this, parent!);
-                    OnAttachedToLogicalTreeCore(e);
-                }
-                else if (parent is null)
-                {
-                    // If we were attached to the logical tree, we piggyback on the tree traversal
-                    // there to raise resources changed notifications. If we're being removed from
-                    // the logical tree, then traverse the tree raising notifications now.
-                    //
-                    // We don't raise resources changed notifications if we're being attached to a 
-                    // non-rooted control beacuse it's unlikely that dynamic resources need to be 
-                    // correct until the control is added to the tree, and it causes a *lot* of
-                    // notifications.
-                    NotifyResourcesChanged();
-                }
-
-#nullable disable
-                RaisePropertyChanged(
-                    ParentProperty,
-                    new Optional<IStyledElement>(old),
-                    new BindingValue<IStyledElement>(Parent),
-                    BindingPriority.LocalValue);
-#nullable enable
-            }
-        }
-
-        /// <summary>
-        /// Sets the styled element's inheritance parent.
-        /// </summary>
-        /// <param name="parent">The parent.</param>
-        void ISetInheritanceParent.SetParent(IAvaloniaObject? parent)
-        {
-            InheritanceParent = parent;
-        }
-
-        void IStyleable.StyleApplied(IStyleInstance instance)
-        {
-            instance = instance ?? throw new ArgumentNullException(nameof(instance));
-
-            _appliedStyles ??= new List<IStyleInstance>();
-            _appliedStyles.Add(instance);
-        }
-
-        void IStyleable.DetachStyles() => DetachStyles();
-
-        void IStyleable.DetachStyles(IReadOnlyList<IStyle> styles) => DetachStyles(styles);
-
-        void IStyleable.InvalidateStyles() => InvalidateStyles();
-
-        void IStyleHost.StylesAdded(IReadOnlyList<IStyle> styles)
-        {
-            InvalidateStylesOnThisAndDescendents();
-        }
-
-        void IStyleHost.StylesRemoved(IReadOnlyList<IStyle> styles)
-        {
-            var allStyles = RecurseStyles(styles);
-            DetachStylesFromThisAndDescendents(allStyles);
-        }
-
-        protected virtual void LogicalChildrenCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    SetLogicalParent(e.NewItems!);
-                    break;
-
-                case NotifyCollectionChangedAction.Remove:
-                    ClearLogicalParent(e.OldItems!);
-                    break;
-
-                case NotifyCollectionChangedAction.Replace:
-                    ClearLogicalParent(e.OldItems!);
-                    SetLogicalParent(e.NewItems!);
-                    break;
-
-                case NotifyCollectionChangedAction.Reset:
-                    throw new NotSupportedException("Reset should not be signaled on LogicalChildren collection");
-            }
-        }
-
-        /// <summary>
-        /// Notifies child controls that a change has been made to resources that apply to them.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void NotifyChildResourcesChanged(ResourcesChangedEventArgs e)
-        {
-            if (_logicalChildren is object)
-            {
-                var count = _logicalChildren.Count;
-
-                if (count > 0)
-                {
-                    e ??= ResourcesChangedEventArgs.Empty;
-
-                    for (var i = 0; i < count; ++i)
-                    {
-                        _logicalChildren[i].NotifyResourcesChanged(e);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Called when the styled element is added to a rooted logical tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called when the styled element is removed from a rooted logical tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DataContext"/> property changes.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnDataContextChanged(EventArgs e)
-        {
-            DataContextChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DataContext"/> begins updating.
-        /// </summary>
-        protected virtual void OnDataContextBeginUpdate()
-        {
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DataContext"/> finishes updating.
-        /// </summary>
-        protected virtual void OnDataContextEndUpdate()
-        {
-        }
-
-        /// <summary>
-        /// Called when the control finishes initialization.
-        /// </summary>
-        protected virtual void OnInitialized()
-        {
-        }
-
-        private static void DataContextNotifying(IAvaloniaObject o, bool updateStarted)
-        {
-            if (o is StyledElement element)
-            {
-                DataContextNotifying(element, updateStarted);
-            }
-        }
-
-        private static void DataContextNotifying(StyledElement element, bool updateStarted)
-        {
-            if (updateStarted)
-            {
-                if (!element._dataContextUpdating)
-                {
-                    element._dataContextUpdating = true;
-                    element.OnDataContextBeginUpdate();
-
-                    var logicalChildren = element.LogicalChildren;
-                    var logicalChildrenCount = logicalChildren.Count;
-
-                    for (var i = 0; i < logicalChildrenCount; i++)
-                    {
-                        if (element.LogicalChildren[i] is StyledElement s &&
-                            s.InheritanceParent == element &&
-                            !s.IsSet(DataContextProperty))
-                        {
-                            DataContextNotifying(s, updateStarted);
-                        }
-                    }
-                }
-            }
-            else
-            {
-                if (element._dataContextUpdating)
-                {
-                    element.OnDataContextEndUpdate();
-                    element._dataContextUpdating = false;
-                }
-            }
-        }
-
-        private static ILogicalRoot? FindLogicalRoot(IStyleHost? e)
-        {
-            while (e != null)
-            {
-                if (e is ILogicalRoot root)
-                {
-                    return root;
-                }
-
-                e = e.StylingParent;
-            }
-
-            return null;
-        }
-
-        private static void ValidateLogicalChild(ILogical c)
-        {
-            if (c == null)
-            {
-                throw new ArgumentException("Cannot add null to LogicalChildren.");
-            }
-        }
-
-        private void OnAttachedToLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
-        {
-            if (this.GetLogicalParent() == null && !(this is ILogicalRoot))
-            {
-                throw new InvalidOperationException(
-                    $"AttachedToLogicalTreeCore called for '{GetType().Name}' but control has no logical parent.");
-            }
-
-            // This method can be called when a control is already attached to the logical tree
-            // in the following scenario:
-            // - ListBox gets assigned Items containing ListBoxItem
-            // - ListBox makes ListBoxItem a logical child
-            // - ListBox template gets applied; making its Panel get attached to logical tree
-            // - That AttachedToLogicalTree signal travels down to the ListBoxItem
-            if (_logicalRoot == null)
-            {
-                _logicalRoot = e.Root;
-
-                ApplyStyling();
-                NotifyResourcesChanged(propagate: false);
-
-                OnAttachedToLogicalTree(e);
-                AttachedToLogicalTree?.Invoke(this, e);
-            }
-
-            var logicalChildren = LogicalChildren;
-            var logicalChildrenCount = logicalChildren.Count;
-
-            for (var i = 0; i < logicalChildrenCount; i++)
-            {
-                if (logicalChildren[i] is StyledElement child)
-                {
-                    child.OnAttachedToLogicalTreeCore(e);
-                }
-            }
-        }
-
-        private void OnDetachedFromLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
-        {
-            if (_logicalRoot != null)
-            {
-                _logicalRoot = null;
-                DetachStyles();
-                OnDetachedFromLogicalTree(e);
-                DetachedFromLogicalTree?.Invoke(this, e);
-
-                var logicalChildren = LogicalChildren;
-                var logicalChildrenCount = logicalChildren.Count;
-
-                for (var i = 0; i < logicalChildrenCount; i++)
-                {
-                    if (logicalChildren[i] is StyledElement child)
-                    {
-                        child.OnDetachedFromLogicalTreeCore(e);
-                    }
-                }
-
-#if DEBUG
-                if (((INotifyCollectionChangedDebug)Classes).GetCollectionChangedSubscribers()?.Length > 0)
-                {
-                    Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(
-                        this,
-                        "{Type} detached from logical tree but still has class listeners",
-                        GetType());
-                }
-#endif
-            }
-        }
-
-        private void OnDataContextChangedCore(AvaloniaPropertyChangedEventArgs e)
-        {
-            OnDataContextChanged(EventArgs.Empty);
-        }
-
-        private void SetLogicalParent(IList children)
-        {
-            var count = children.Count;
-
-            for (var i = 0; i < count; i++)
-            {
-                var logical = (ILogical) children[i]!;
-                
-                if (logical.LogicalParent is null)
-                {
-                    ((ISetLogicalParent)logical).SetParent(this);
-                }
-            }
-        }
-
-        private void ClearLogicalParent(IList children)
-        {
-            var count = children.Count;
-
-            for (var i = 0; i < count; i++)
-            {
-                var logical = (ILogical) children[i]!;
-                
-                if (logical.LogicalParent == this)
-                {
-                    ((ISetLogicalParent)logical).SetParent(null);
-                }
-            }
-        }
-
-        private void DetachStyles()
-        {
-            if (_appliedStyles is object)
-            {
-                BeginBatchUpdate();
-
-                try
-                {
-                    foreach (var i in _appliedStyles)
-                    {
-                        i.Dispose();
-                    }
-
-                    _appliedStyles.Clear();
-                }
-                finally
-                {
-                    EndBatchUpdate();
-                }
-            }
-
-            _styled = false;
-        }
-
-        private void DetachStyles(IReadOnlyList<IStyle> styles)
-        {
-            styles = styles ?? throw new ArgumentNullException(nameof(styles));
-
-            if (_appliedStyles is null)
-            {
-                return;
-            }
-
-            var count = styles.Count;
-
-            for (var i = 0; i < count; ++i)
-            {
-                for (var j = _appliedStyles.Count - 1; j >= 0; --j)
-                {
-                    var applied = _appliedStyles[j];
-
-                    if (applied.Source == styles[i])
-                    {
-                        applied.Dispose();
-                        _appliedStyles.RemoveAt(j);
-                    }
-                }
-            }
-        }
-
-        private void InvalidateStylesOnThisAndDescendents()
-        {
-            InvalidateStyles();
-
-            if (_logicalChildren is object)
-            {
-                var childCount = _logicalChildren.Count;
-
-                for (var i = 0; i < childCount; ++i)
-                {
-                    (_logicalChildren[i] as StyledElement)?.InvalidateStylesOnThisAndDescendents();
-                }
-            }
-        }
-
-        private void DetachStylesFromThisAndDescendents(IReadOnlyList<IStyle> styles)
-        {
-            DetachStyles(styles);
-
-            if (_logicalChildren is object)
-            {
-                var childCount = _logicalChildren.Count;
-
-                for (var i = 0; i < childCount; ++i)
-                {
-                    (_logicalChildren[i] as StyledElement)?.DetachStylesFromThisAndDescendents(styles);
-                }
-            }
-        }
-
-        private void NotifyResourcesChanged(
-            ResourcesChangedEventArgs? e = null,
-            bool propagate = true)
-        {
-            if (ResourcesChanged is object)
-            {
-                e ??= ResourcesChangedEventArgs.Empty;
-                ResourcesChanged(this, e);
-            }
-
-            if (propagate)
-            {
-                e ??= ResourcesChangedEventArgs.Empty;
-                NotifyChildResourcesChanged(e);
-            }
-        }
-
-        private static IReadOnlyList<IStyle> RecurseStyles(IReadOnlyList<IStyle> styles)
-        {
-            var count = styles.Count;
-            List<IStyle>? result = null;
-
-            for (var i = 0; i < count; ++i)
-            {
-                var style = styles[i];
-
-                if (style.Children.Count > 0)
-                {
-                    if (result is null)
-                    {
-                        result = new List<IStyle>(styles);
-                    }
-
-                    RecurseStyles(style.Children, result);
-                }
-            }
-
-            return result ?? styles;
-        }
-
-        private static void RecurseStyles(IReadOnlyList<IStyle> styles, List<IStyle> result)
-        {
-            var count = styles.Count;
-
-            for (var i = 0; i < count; ++i)
-            {
-                var style = styles[i];
-                result.Add(style);
-                RecurseStyles(style.Children, result);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Activators/IStyleActivator.cs b/src/Avalonia.Styling/Styling/Activators/IStyleActivator.cs
deleted file mode 100644
index 479100ed8a..0000000000
--- a/src/Avalonia.Styling/Styling/Activators/IStyleActivator.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-#nullable enable
-
-using System;
-
-namespace Avalonia.Styling.Activators
-{
-    /// <summary>
-    /// Defines a style activator.
-    /// </summary>
-    /// <remarks>
-    /// A style activator is very similar to an `IObservable{bool}` but is optimized for the
-    /// particular use-case of activating a style according to a selector. It differs from
-    /// an observable in two major ways:
-    /// 
-    /// - Can only have a single subscription
-    /// - The subscription can have a tag associated with it, allowing a subscriber to index
-    ///   into a list of subscriptions without having to allocate additional objects.
-    /// </remarks>
-    public interface IStyleActivator : IDisposable
-    {
-        /// <summary>
-        /// Subscribes to the activator.
-        /// </summary>
-        /// <param name="sink">The listener.</param>
-        /// <param name="tag">An optional tag.</param>
-        void Subscribe(IStyleActivatorSink sink, int tag = 0);
-
-        /// <summary>
-        /// Unsubscribes from the activator.
-        /// </summary>
-        void Unsubscribe(IStyleActivatorSink sink);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Activators/IStyleActivatorSink.cs b/src/Avalonia.Styling/Styling/Activators/IStyleActivatorSink.cs
deleted file mode 100644
index a1a6ef5c28..0000000000
--- a/src/Avalonia.Styling/Styling/Activators/IStyleActivatorSink.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#nullable enable
-
-namespace Avalonia.Styling.Activators
-{
-    /// <summary>
-    /// Receives notifications from an <see cref="IStyleActivator"/>.
-    /// </summary>
-    public interface IStyleActivatorSink
-    {
-        /// <summary>
-        /// Called when the subscribed activator value changes.
-        /// </summary>
-        /// <param name="value">The new value.</param>
-        /// <param name="tag">The subscription tag.</param>
-        void OnNext(bool value, int tag);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/ChildSelector.cs b/src/Avalonia.Styling/Styling/ChildSelector.cs
deleted file mode 100644
index 5c92182b80..0000000000
--- a/src/Avalonia.Styling/Styling/ChildSelector.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using Avalonia.LogicalTree;
-
-namespace Avalonia.Styling
-{
-    internal class ChildSelector : Selector
-    {
-        private readonly Selector _parent;
-        private string? _selectorString;
-
-        public ChildSelector(Selector parent)
-        {
-            if (parent == null)
-            {
-                throw new InvalidOperationException("Child selector must be preceeded by a selector.");
-            }
-
-            _parent = parent;
-        }
-
-        /// <inheritdoc/>
-        public override bool InTemplate => _parent.InTemplate;
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => true;
-
-        /// <inheritdoc/>
-        public override Type? TargetType => null;
-
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                _selectorString = _parent.ToString() + " > ";
-            }
-
-            return _selectorString;
-        }
-
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            var controlParent = ((ILogical)control).LogicalParent;
-
-            if (controlParent != null)
-            {
-                var parentMatch = _parent.Match((IStyleable)controlParent, subscribe);
-
-                if (parentMatch.Result == SelectorMatchResult.Sometimes)
-                {
-                    return parentMatch;
-                }
-                else if (parentMatch.IsMatch)
-                {
-                    return SelectorMatch.AlwaysThisInstance;
-                }
-                else
-                {
-                    return SelectorMatch.NeverThisInstance;
-                }
-            }
-            else
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-        }
-
-        protected override Selector? MovePrevious() => null;
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/DescendentSelector.cs b/src/Avalonia.Styling/Styling/DescendentSelector.cs
deleted file mode 100644
index dde88b3436..0000000000
--- a/src/Avalonia.Styling/Styling/DescendentSelector.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using Avalonia.LogicalTree;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    internal class DescendantSelector : Selector
-    {
-        private readonly Selector _parent;
-        private string? _selectorString;
-
-        public DescendantSelector(Selector? parent)
-        {
-            _parent = parent ?? throw new InvalidOperationException("Descendant selector must be preceeded by a selector.");
-        }
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => true;
-
-        /// <inheritdoc/>
-        public override bool InTemplate => _parent.InTemplate;
-
-        /// <inheritdoc/>
-        public override Type? TargetType => null;
-
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                _selectorString = _parent.ToString() + ' ';
-            }
-
-            return _selectorString;
-        }
-
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            var c = (ILogical)control;
-            var descendantMatches = new OrActivatorBuilder();
-
-            while (c != null)
-            {
-                c = c.LogicalParent;
-
-                if (c is IStyleable)
-                {
-                    var match = _parent.Match((IStyleable)c, subscribe);
-
-                    if (match.Result == SelectorMatchResult.Sometimes)
-                    {
-                        descendantMatches.Add(match.Activator);
-                    }
-                    else if (match.IsMatch)
-                    {
-                        return SelectorMatch.AlwaysThisInstance;
-                    }
-                }
-            }
-
-            if (descendantMatches.Count > 0)
-            {
-                return new SelectorMatch(descendantMatches.Get());
-            }
-            else
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-        }
-
-        protected override Selector? MovePrevious() => null;
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/IGlobalStyles.cs b/src/Avalonia.Styling/Styling/IGlobalStyles.cs
deleted file mode 100644
index ab24e3138c..0000000000
--- a/src/Avalonia.Styling/Styling/IGlobalStyles.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Defines the style host that provides styles global to the application.
-    /// </summary>
-    public interface IGlobalStyles : IStyleHost
-    {
-        /// <summary>
-        /// Raised when styles are added to <see cref="Styles"/> or a nested styles collection.
-        /// </summary>
-        public event Action<IReadOnlyList<IStyle>>? GlobalStylesAdded;
-
-        /// <summary>
-        /// Raised when styles are removed from <see cref="Styles"/> or a nested styles collection.
-        /// </summary>
-        public event Action<IReadOnlyList<IStyle>>? GlobalStylesRemoved;
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/ISetter.cs b/src/Avalonia.Styling/Styling/ISetter.cs
deleted file mode 100644
index d588817be8..0000000000
--- a/src/Avalonia.Styling/Styling/ISetter.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Represents a setter for a <see cref="Style"/>.
-    /// </summary>
-    public interface ISetter
-    {
-        /// <summary>
-        /// Instances a setter on a control.
-        /// </summary>
-        /// <param name="target">The control.</param>
-        /// <returns>An <see cref="ISetterInstance"/>.</returns>
-        /// <remarks>
-        /// This method should return an <see cref="ISetterInstance"/> which can be used to apply
-        /// the setter to the specified control. Note that it should not apply the setter value 
-        /// until <see cref="ISetterInstance.Start(bool)"/> is called.
-        /// </remarks>
-        ISetterInstance Instance(IStyleable target);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/ISetterInstance.cs b/src/Avalonia.Styling/Styling/ISetterInstance.cs
deleted file mode 100644
index a299a87b64..0000000000
--- a/src/Avalonia.Styling/Styling/ISetterInstance.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#nullable enable
-
-using System;
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Represents a setter that has been instanced on a control.
-    /// </summary>
-    public interface ISetterInstance : IDisposable
-    {
-        /// <summary>
-        /// Starts the setter instance.
-        /// </summary>
-        /// <param name="hasActivator">Whether the parent style has an activator.</param>
-        /// <remarks>
-        /// If <paramref name="hasActivator"/> is false then the setter should be immediately
-        /// applied and <see cref="Activate"/> and <see cref="Deactivate"/> should not be called.
-        /// If true, then bindings etc should be initiated but not produce a value until
-        /// <see cref="Activate"/> called.
-        /// </remarks>
-        public void Start(bool hasActivator);
-
-        /// <summary>
-        /// Activates the setter.
-        /// </summary>
-        /// <remarks>
-        /// Should only be called if hasActivator was true when <see cref="Start(bool)"/> was called.
-        /// </remarks>
-        public void Activate();
-
-        /// <summary>
-        /// Deactivates the setter.
-        /// </summary>
-        /// <remarks>
-        /// Should only be called if hasActivator was true when <see cref="Start(bool)"/> was called.
-        /// </remarks>
-        public void Deactivate();
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/IStyle.cs b/src/Avalonia.Styling/Styling/IStyle.cs
deleted file mode 100644
index 78fbe0f2b5..0000000000
--- a/src/Avalonia.Styling/Styling/IStyle.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Controls;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Defines the interface for styles.
-    /// </summary>
-    public interface IStyle
-    {
-        /// <summary>
-        /// Gets a collection of child styles.
-        /// </summary>
-        IReadOnlyList<IStyle> Children { get; }
-
-        /// <summary>
-        /// Attaches the style and any child styles to a control if the style's selector matches.
-        /// </summary>
-        /// <param name="target">The control to attach to.</param>
-        /// <param name="host">The element that hosts the style.</param>
-        /// <returns>
-        /// A <see cref="SelectorMatchResult"/> describing how the style matches the control.
-        /// </returns>
-        SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/IStyleHost.cs b/src/Avalonia.Styling/Styling/IStyleHost.cs
deleted file mode 100644
index 360b40d9a1..0000000000
--- a/src/Avalonia.Styling/Styling/IStyleHost.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-
-using System.Collections.Generic;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Defines an element that has a <see cref="Styles"/> collection.
-    /// </summary>
-    public interface IStyleHost
-    {
-        /// <summary>
-        /// Gets a value indicating whether <see cref="Styles"/> is initialized.
-        /// </summary>
-        /// <remarks>
-        /// The <see cref="Styles"/> property may be lazily initialized, if so this property
-        /// indicates whether it has been initialized.
-        /// </remarks>
-        bool IsStylesInitialized { get; }
-
-        /// <summary>
-        /// Gets the styles for the element.
-        /// </summary>
-        Styles Styles { get; }
-
-        /// <summary>
-        /// Gets the parent style host element.
-        /// </summary>
-        IStyleHost? StylingParent { get; }
-
-        /// <summary>
-        /// Called when styles are added to <see cref="Styles"/> or a nested styles collection.
-        /// </summary>
-        /// <param name="styles">The added styles.</param>
-        void StylesAdded(IReadOnlyList<IStyle> styles);
-
-        /// <summary>
-        /// Called when styles are removed from <see cref="Styles"/> or a nested styles collection.
-        /// </summary>
-        /// <param name="styles">The removed styles.</param>
-        void StylesRemoved(IReadOnlyList<IStyle> styles);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/IStyleInstance.cs b/src/Avalonia.Styling/Styling/IStyleInstance.cs
deleted file mode 100644
index 8ddb989bc0..0000000000
--- a/src/Avalonia.Styling/Styling/IStyleInstance.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Represents a style that has been instanced on a control.
-    /// </summary>
-    public interface IStyleInstance : IDisposable
-    {
-        /// <summary>
-        /// Gets the source style.
-        /// </summary>
-        IStyle Source { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this style is active.
-        /// </summary>
-        bool IsActive { get; }
-
-        /// <summary>
-        /// Instructs the style to start acting upon the control.
-        /// </summary>
-        void Start();
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/IStyleable.cs b/src/Avalonia.Styling/Styling/IStyleable.cs
deleted file mode 100644
index a3df779057..0000000000
--- a/src/Avalonia.Styling/Styling/IStyleable.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Collections;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Interface for styleable elements.
-    /// </summary>
-    public interface IStyleable : IAvaloniaObject, INamed
-    {
-        /// <summary>
-        /// Gets the list of classes for the control.
-        /// </summary>
-        IAvaloniaReadOnlyList<string> Classes { get; }
-
-        /// <summary>
-        /// Gets the type by which the control is styled.
-        /// </summary>
-        Type StyleKey { get; }
-
-        /// <summary>
-        /// Gets the template parent of this element if the control comes from a template.
-        /// </summary>
-        ITemplatedControl? TemplatedParent { get; }
-
-        /// <summary>
-        /// Notifies the element that a style has been applied.
-        /// </summary>
-        /// <param name="instance">The style instance.</param>
-        void StyleApplied(IStyleInstance instance);
-
-        /// <summary>
-        /// Detaches all styles applied to the element.
-        /// </summary>
-        void DetachStyles();
-
-        /// <summary>
-        /// Detaches a collection of styles, if applied to the element.
-        /// </summary>
-        void DetachStyles(IReadOnlyList<IStyle> styles);
-
-        /// <summary>
-        /// Detaches all styles from the element and queues a restyle.
-        /// </summary>
-        void InvalidateStyles();
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/ITemplatedControl.cs b/src/Avalonia.Styling/Styling/ITemplatedControl.cs
deleted file mode 100644
index 5485babb62..0000000000
--- a/src/Avalonia.Styling/Styling/ITemplatedControl.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-
-namespace Avalonia.Styling
-{
-    public interface ITemplatedControl : IAvaloniaObject
-    {
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/NotSelector.cs b/src/Avalonia.Styling/Styling/NotSelector.cs
deleted file mode 100644
index ab4e9d5d7f..0000000000
--- a/src/Avalonia.Styling/Styling/NotSelector.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// The `:not()` style selector.
-    /// </summary>
-    internal class NotSelector : Selector
-    {
-        private readonly Selector? _previous;
-        private readonly Selector _argument;
-        private string? _selectorString;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotSelector"/> class.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="argument">The selector to be not-ed.</param>
-        public NotSelector(Selector? previous, Selector argument)
-        {
-            _previous = previous;
-            _argument = argument ?? throw new InvalidOperationException("Not selector must have a selector argument.");
-        }
-
-        /// <inheritdoc/>
-        public override bool InTemplate => _argument.InTemplate;
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => false;
-
-        /// <inheritdoc/>
-        public override Type? TargetType => _previous?.TargetType;
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                _selectorString = $"{_previous?.ToString()}:not({_argument})";
-            }
-
-            return _selectorString;
-        }
-
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            var innerResult = _argument.Match(control, subscribe);
-
-            switch (innerResult.Result)
-            {
-                case SelectorMatchResult.AlwaysThisInstance:
-                    return SelectorMatch.NeverThisInstance;
-                case SelectorMatchResult.AlwaysThisType:
-                    return SelectorMatch.NeverThisType;
-                case SelectorMatchResult.NeverThisInstance:
-                    return SelectorMatch.AlwaysThisInstance;
-                case SelectorMatchResult.NeverThisType:
-                    return SelectorMatch.AlwaysThisType;
-                case SelectorMatchResult.Sometimes:
-                    return new SelectorMatch(new NotActivator(innerResult.Activator!));
-                default:
-                    throw new InvalidOperationException("Invalid SelectorMatchResult.");
-            }
-        }
-
-        protected override Selector? MovePrevious() => _previous;
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/NthChildSelector.cs b/src/Avalonia.Styling/Styling/NthChildSelector.cs
deleted file mode 100644
index aff34ea17c..0000000000
--- a/src/Avalonia.Styling/Styling/NthChildSelector.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-#nullable enable
-using System;
-using System.Text;
-using Avalonia.LogicalTree;
-using Avalonia.Styling.Activators;
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// The :nth-child() pseudo-class matches elements based on their position in a group of siblings.
-    /// </summary>
-    /// <remarks>
-    /// Element indices are 1-based.
-    /// </remarks>
-    public class NthChildSelector : Selector
-    {
-        private const string NthChildSelectorName = "nth-child";
-        private const string NthLastChildSelectorName = "nth-last-child";
-        private readonly Selector? _previous;
-        private readonly bool _reversed;
-
-        internal protected NthChildSelector(Selector? previous, int step, int offset, bool reversed)
-        {
-            _previous = previous;
-            Step = step;
-            Offset = offset;
-            _reversed = reversed;
-        }
-
-        /// <summary>
-        /// Creates an instance of <see cref="NthChildSelector"/>
-        /// </summary>
-        /// <param name="previous">Previous selector.</param>
-        /// <param name="step">Position step.</param>
-        /// <param name="offset">Initial index offset.</param>
-        public NthChildSelector(Selector? previous, int step, int offset)
-            : this(previous, step, offset, false)
-        {
-
-        }
-
-        public override bool InTemplate => _previous?.InTemplate ?? false;
-
-        public override bool IsCombinator => false;
-
-        public override Type? TargetType => _previous?.TargetType;
-
-        public int Step { get; }
-        public int Offset { get; }
-
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            if (!(control is ILogical logical))
-            {
-                return SelectorMatch.NeverThisType;
-            }
-
-            var controlParent = logical.LogicalParent;
-
-            if (controlParent is IChildIndexProvider childIndexProvider)
-            {
-                return subscribe
-                    ? new SelectorMatch(new NthChildActivator(logical, childIndexProvider, Step, Offset, _reversed))
-                    : Evaluate(logical, childIndexProvider, Step, Offset, _reversed);
-            }
-            else
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-        }
-
-        internal static SelectorMatch Evaluate(
-            ILogical logical, IChildIndexProvider childIndexProvider,
-            int step, int offset, bool reversed)
-        {
-            var index = childIndexProvider.GetChildIndex(logical);
-            if (index < 0)
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-
-            if (reversed)
-            {
-                if (childIndexProvider.TryGetTotalCount(out var totalCountValue))
-                {
-                    index = totalCountValue - index;
-                }
-                else
-                {
-                    return SelectorMatch.NeverThisInstance;
-                }
-            }
-            else
-            {
-                // nth child index is 1-based
-                index += 1;
-            }
-
-            var n = Math.Sign(step);
-
-            var diff = index - offset;
-            var match = diff == 0 || (Math.Sign(diff) == n && diff % step == 0);
-
-            return match ? SelectorMatch.AlwaysThisInstance : SelectorMatch.NeverThisInstance;
-        }
-
-        protected override Selector? MovePrevious() => _previous;
-
-        public override string ToString()
-        {
-            var expectedCapacity = NthLastChildSelectorName.Length + 8;
-            var stringBuilder = new StringBuilder(_previous?.ToString(), expectedCapacity);
-            
-            stringBuilder.Append(':');
-            stringBuilder.Append(_reversed ? NthLastChildSelectorName : NthChildSelectorName);
-            stringBuilder.Append('(');
-
-            var hasStep = false;
-            if (Step != 0)
-            {
-                hasStep = true;
-                stringBuilder.Append(Step);
-                stringBuilder.Append('n');
-            }
-
-            if (Offset > 0)
-            {
-                if (hasStep)
-                {
-                    stringBuilder.Append('+');
-                }
-                stringBuilder.Append(Offset);
-            }
-            else if (Offset < 0)
-            {
-                stringBuilder.Append('-');
-                stringBuilder.Append(-Offset);
-            }
-
-            stringBuilder.Append(')');
-
-            return stringBuilder.ToString();
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/OrSelector.cs b/src/Avalonia.Styling/Styling/OrSelector.cs
deleted file mode 100644
index 3d6db9b01e..0000000000
--- a/src/Avalonia.Styling/Styling/OrSelector.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// The OR style selector.
-    /// </summary>
-    internal class OrSelector : Selector
-    {
-        private readonly IReadOnlyList<Selector> _selectors;
-        private string? _selectorString;
-        private Type? _targetType;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OrSelector"/> class.
-        /// </summary>
-        /// <param name="selectors">The selectors to OR.</param>
-        public OrSelector(IReadOnlyList<Selector> selectors)
-        {
-            if (selectors is null)
-            {
-                throw new ArgumentNullException(nameof(selectors));
-            }
-
-            if (selectors.Count <= 1)
-            {
-                throw new ArgumentException("Need more than one selector to OR.");
-            }
-
-            _selectors = selectors;
-        }
-
-        /// <inheritdoc/>
-        public override bool InTemplate => false;
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => false;
-
-        /// <inheritdoc/>
-        public override Type? TargetType
-        {
-            get
-            {
-                if (_targetType == null)
-                {
-                    _targetType = EvaluateTargetType();
-                }
-
-                return _targetType;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                _selectorString = string.Join(", ", _selectors);
-            }
-
-            return _selectorString;
-        }
-
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            var activators = new OrActivatorBuilder();
-            var neverThisInstance = false;
-
-            foreach (var selector in _selectors)
-            {
-                var match = selector.Match(control, subscribe);
-
-                switch (match.Result)
-                {
-                    case SelectorMatchResult.AlwaysThisType:
-                    case SelectorMatchResult.AlwaysThisInstance:
-                        return match;
-                    case SelectorMatchResult.NeverThisInstance:
-                        neverThisInstance = true;
-                        break;
-                    case SelectorMatchResult.Sometimes:
-                        activators.Add(match.Activator!);
-                        break;
-                }
-            }
-
-            if (activators.Count > 0)
-            {
-                return new SelectorMatch(activators.Get());
-            }
-            else if (neverThisInstance)
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-            else
-            {
-                return SelectorMatch.NeverThisType;
-            }
-        }
-
-        protected override Selector? MovePrevious() => null;
-
-        private Type? EvaluateTargetType()
-        {
-            Type? result = null;
-
-            foreach (var selector in _selectors)
-            {
-                if (selector.TargetType == null)
-                {
-                    return null;
-                }
-                else if (result == null)
-                {
-                    result = selector.TargetType;
-                }
-                else
-                {
-                    while (result is not null && !result.IsAssignableFrom(selector.TargetType))
-                    {
-                        result = result.BaseType;
-                    }
-                }
-            }
-
-            return result;
-        }
-    }
-}
-
diff --git a/src/Avalonia.Styling/Styling/PropertyEqualsSelector.cs b/src/Avalonia.Styling/Styling/PropertyEqualsSelector.cs
deleted file mode 100644
index 1cd1a650ef..0000000000
--- a/src/Avalonia.Styling/Styling/PropertyEqualsSelector.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Globalization;
-using System.Text;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A selector that matches the common case of a type and/or name followed by a collection of
-    /// style classes and pseudoclasses.
-    /// </summary>
-    internal class PropertyEqualsSelector : Selector
-    {
-        private readonly Selector? _previous;
-        private readonly AvaloniaProperty _property;
-        private readonly object? _value;
-        private string? _selectorString;
-
-        public PropertyEqualsSelector(Selector? previous, AvaloniaProperty property, object? value)
-        {
-            property = property ?? throw new ArgumentNullException(nameof(property));
-
-            _previous = previous;
-            _property = property;
-            _value = value;
-        }
-
-        /// <inheritdoc/>
-        public override bool InTemplate => _previous?.InTemplate ?? false;
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => false;
-
-        /// <inheritdoc/>
-        public override Type? TargetType => _previous?.TargetType;
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                var builder = new StringBuilder();
-
-                if (_previous != null)
-                {
-                    builder.Append(_previous.ToString());
-                }
-
-                builder.Append('[');
-
-                if (_property.IsAttached)
-                {
-                    builder.Append('(');
-                    builder.Append(_property.OwnerType.Name);
-                    builder.Append('.');
-                }
-
-                builder.Append(_property.Name);
-                if (_property.IsAttached)
-                {
-                    builder.Append(')');
-                }
-                builder.Append('=');
-                builder.Append(_value ?? string.Empty);
-                builder.Append(']');
-
-                _selectorString = builder.ToString();
-            }
-
-            return _selectorString;
-        }
-
-        /// <inheritdoc/>
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            if (subscribe)
-            {
-                return new SelectorMatch(new PropertyEqualsActivator(control, _property, _value));
-            }
-            else
-            {
-                return Compare(_property.PropertyType, control.GetValue(_property), _value)
-                    ? SelectorMatch.AlwaysThisInstance
-                    : SelectorMatch.NeverThisInstance;
-            }
-            
-        }
-
-        protected override Selector? MovePrevious() => _previous;
-
-        internal static bool Compare(Type propertyType, object? propertyValue, object? value)
-        {
-            if (propertyType == typeof(object) &&
-                propertyValue?.GetType() is Type inferredType)
-            {
-                propertyType = inferredType;
-            }
-
-            var valueType = value?.GetType();
-
-            if (valueType is null || propertyType.IsAssignableFrom(valueType))
-            {
-                return Equals(propertyValue, value);
-            }
-
-            var converter = TypeDescriptor.GetConverter(propertyType);
-            if (converter?.CanConvertFrom(valueType) == true)
-            {
-                return Equals(propertyValue, converter.ConvertFrom(null, CultureInfo.InvariantCulture, value!));
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/PropertySetterInstance.cs b/src/Avalonia.Styling/Styling/PropertySetterInstance.cs
deleted file mode 100644
index 48f462d006..0000000000
--- a/src/Avalonia.Styling/Styling/PropertySetterInstance.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using Avalonia.Data;
-using Avalonia.Reactive;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A <see cref="Setter"/> which has been instanced on a control.
-    /// </summary>
-    /// <typeparam name="T">The target property type.</typeparam>
-    internal class PropertySetterInstance<T> : SingleSubscriberObservableBase<BindingValue<T>>,
-        ISetterInstance
-    {
-        private readonly IStyleable _target;
-        private readonly StyledPropertyBase<T>? _styledProperty;
-        private readonly DirectPropertyBase<T>? _directProperty;
-        private readonly T _value;
-        private IDisposable? _subscription;
-        private bool _isActive;
-
-        public PropertySetterInstance(
-            IStyleable target,
-            StyledPropertyBase<T> property,
-            T value)
-        {
-            _target = target;
-            _styledProperty = property;
-            _value = value;
-        }
-
-        public PropertySetterInstance(
-            IStyleable target,
-            DirectPropertyBase<T> property,
-            T value)
-        {
-            _target = target;
-            _directProperty = property;
-            _value = value;
-        }
-
-        public void Start(bool hasActivator)
-        {
-            if (hasActivator)
-            {
-                if (_styledProperty is object)
-                {
-                    _subscription = _target.Bind(_styledProperty, this, BindingPriority.StyleTrigger);
-                }
-                else
-                {
-                    _subscription = _target.Bind(_directProperty!, this);
-                }
-            }
-            else
-            {
-                if (_styledProperty is object)
-                {
-                    _subscription = _target.SetValue(_styledProperty!, _value, BindingPriority.Style);
-                }
-                else
-                {
-                    _target.SetValue(_directProperty!, _value);
-                }
-            }
-        }
-
-        public void Activate()
-        {
-            if (!_isActive)
-            {
-                _isActive = true;
-                PublishNext();
-            }
-        }
-
-        public void Deactivate()
-        {
-            if (_isActive)
-            {
-                _isActive = false;
-                PublishNext();
-            }
-        }
-
-        public override void Dispose()
-        {
-            if (_subscription is object)
-            {
-                var sub = _subscription;
-                _subscription = null;
-                sub.Dispose();
-            }
-            else if (_isActive)
-            {
-                if (_styledProperty is object)
-                {
-                    _target.ClearValue(_styledProperty);
-                }
-                else
-                {
-                    _target.ClearValue(_directProperty!);
-                }
-            }
-
-            base.Dispose();
-        }
-
-        protected override void Subscribed() => PublishNext();
-        protected override void Unsubscribed() { }
-
-        private void PublishNext()
-        {
-            PublishNext(_isActive ? new BindingValue<T>(_value) : default);
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/PropertySetterLazyInstance.cs b/src/Avalonia.Styling/Styling/PropertySetterLazyInstance.cs
deleted file mode 100644
index 92653d0064..0000000000
--- a/src/Avalonia.Styling/Styling/PropertySetterLazyInstance.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using Avalonia.Data;
-using Avalonia.Reactive;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A <see cref="Setter"/> which has been instanced on a control and whose value is lazily
-    /// evaluated.
-    /// </summary>
-    /// <typeparam name="T">The target property type.</typeparam>
-    internal class PropertySetterLazyInstance<T> : SingleSubscriberObservableBase<BindingValue<T>>,
-        ISetterInstance
-    {
-        private readonly IStyleable _target;
-        private readonly StyledPropertyBase<T>? _styledProperty;
-        private readonly DirectPropertyBase<T>? _directProperty;
-        private readonly Func<T> _valueFactory;
-        private BindingValue<T> _value;
-        private IDisposable? _subscription;
-        private bool _isActive;
-
-        public PropertySetterLazyInstance(
-            IStyleable target,
-            StyledPropertyBase<T> property,
-            Func<T> valueFactory)
-        {
-            _target = target;
-            _styledProperty = property;
-            _valueFactory = valueFactory;
-        }
-
-        public PropertySetterLazyInstance(
-            IStyleable target,
-            DirectPropertyBase<T> property,
-            Func<T> valueFactory)
-        {
-            _target = target;
-            _directProperty = property;
-            _valueFactory = valueFactory;
-        }
-
-        public void Start(bool hasActivator)
-        {
-            _isActive = !hasActivator;
-
-            if (_styledProperty is object)
-            {
-                var priority = hasActivator ? BindingPriority.StyleTrigger : BindingPriority.Style;
-                _subscription = _target.Bind(_styledProperty, this, priority);
-            }
-            else
-            {
-                _subscription = _target.Bind(_directProperty!, this);
-            }
-        }
-
-        public void Activate()
-        {
-            if (!_isActive)
-            {
-                _isActive = true;
-                PublishNext();
-            }
-        }
-
-        public void Deactivate()
-        {
-            if (_isActive)
-            {
-                _isActive = false;
-                PublishNext();
-            }
-        }
-
-        public override void Dispose()
-        {
-            if (_subscription is object)
-            {
-                var sub = _subscription;
-                _subscription = null;
-                sub.Dispose();
-            }
-            else if (_isActive)
-            {
-                if (_styledProperty is object)
-                {
-                    _target.ClearValue(_styledProperty);
-                }
-                else
-                {
-                    _target.ClearValue(_directProperty!);
-                }
-            }
-
-            base.Dispose();
-        }
-
-        protected override void Subscribed() => PublishNext();
-        protected override void Unsubscribed() { }
-
-        private T GetValue()
-        {
-            if (_value.HasValue)
-            {
-                return _value.Value;
-            }
-
-            _value = _valueFactory();
-            return _value.Value;
-        }
-
-        private void PublishNext()
-        {
-            if (_isActive)
-            {
-                GetValue();
-                PublishNext(_value);
-            }
-            else
-            {
-                PublishNext(default);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Selector.cs b/src/Avalonia.Styling/Styling/Selector.cs
deleted file mode 100644
index 0740e0f891..0000000000
--- a/src/Avalonia.Styling/Styling/Selector.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using System;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A selector in a <see cref="Style"/>.
-    /// </summary>
-    public abstract class Selector
-    {
-        /// <summary>
-        /// Gets a value indicating whether either this selector or a previous selector has moved
-        /// into a template.
-        /// </summary>
-        public abstract bool InTemplate { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this selector is a combinator.
-        /// </summary>
-        /// <remarks>
-        /// A combinator is a selector such as Child or Descendent which links simple selectors.
-        /// </remarks>
-        public abstract bool IsCombinator { get; }
-
-        /// <summary>
-        /// Gets the target type of the selector, if available.
-        /// </summary>
-        public abstract Type? TargetType { get; }
-
-        /// <summary>
-        /// Tries to match the selector with a control.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="subscribe">
-        /// Whether the match should subscribe to changes in order to track the match over time,
-        /// or simply return an immediate result.
-        /// </param>
-        /// <returns>A <see cref="SelectorMatch"/>.</returns>
-        public SelectorMatch Match(IStyleable control, bool subscribe = true)
-        {
-            // First match the selector until a combinator is found. Selectors are stored from 
-            // right-to-left, so MatchUntilCombinator reverses this order because the type selector
-            // will be on the left.
-            var match = MatchUntilCombinator(control, this, subscribe, out var combinator);
-            
-            // If the pre-combinator selector matches, we can now match the combinator, if any.
-            if (match.IsMatch && combinator is object)
-            {
-                match = match.And(combinator.Match(control, subscribe));
-
-                // If we have a combinator then we can never say that we always match a control of
-                // this type, because by definition the combinator matches on things outside of the
-                // control.
-                match = match.Result switch
-                {
-                    SelectorMatchResult.AlwaysThisType => SelectorMatch.AlwaysThisInstance,
-                    SelectorMatchResult.NeverThisType => SelectorMatch.NeverThisInstance,
-                    _ => match
-                };
-            }
-
-            return match;
-        }
-
-        /// <summary>
-        /// Evaluates the selector for a match.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="subscribe">
-        /// Whether the match should subscribe to changes in order to track the match over time,
-        /// or simply return an immediate result.
-        /// </param>
-        /// <returns>A <see cref="SelectorMatch"/>.</returns>
-        protected abstract SelectorMatch Evaluate(IStyleable control, bool subscribe);
-
-        /// <summary>
-        /// Moves to the previous selector.
-        /// </summary>
-        protected abstract Selector? MovePrevious();
-
-        private static SelectorMatch MatchUntilCombinator(
-            IStyleable control,
-            Selector start,
-            bool subscribe,
-            out Selector? combinator)
-        {
-            combinator = null;
-
-            var activators = new AndActivatorBuilder();
-            var result = Match(control, start, subscribe, ref activators, ref combinator);
-
-            return result == SelectorMatchResult.Sometimes ?
-                new SelectorMatch(activators.Get()) :
-                new SelectorMatch(result);
-        }
-
-        private static SelectorMatchResult Match(
-            IStyleable control,
-            Selector selector,
-            bool subscribe,
-            ref AndActivatorBuilder activators,
-            ref Selector? combinator)
-        {
-            var previous = selector.MovePrevious();
-
-            // Selectors are stored from right-to-left, so we recurse into the selector in order to
-            // reverse this order, because the type selector will be on the left and is our best
-            // opportunity to exit early.
-            if (previous != null && !previous.IsCombinator)
-            {
-                var previousMatch = Match(control, previous, subscribe, ref activators, ref combinator);
-
-                if (previousMatch < SelectorMatchResult.Sometimes)
-                {
-                    return previousMatch;
-                }
-            }
-
-            // Match this selector.
-            var match = selector.Evaluate(control, subscribe);
-
-            if (!match.IsMatch)
-            {
-                combinator = null;
-                return match.Result;
-            }
-            else if (match.Activator is object)
-            {
-                activators.Add(match.Activator!);
-            }
-
-            if (previous?.IsCombinator == true)
-            {
-                combinator = previous;
-            }
-
-            return match.Result;
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Selectors.cs b/src/Avalonia.Styling/Styling/Selectors.cs
deleted file mode 100644
index 7c66469cf1..0000000000
--- a/src/Avalonia.Styling/Styling/Selectors.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Extension methods for <see cref="Selector"/>.
-    /// </summary>
-    public static class Selectors
-    {
-        /// <summary>
-        /// Returns a selector which matches a previous selector's child.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Child(this Selector previous)
-        {
-            return new ChildSelector(previous);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a control's style class.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="name">The name of the style class.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Class(this Selector? previous, string name)
-        {
-            _ = name ?? throw new ArgumentNullException(nameof(name));
-
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw new ArgumentException("Name may not be empty", nameof(name));
-            }
-
-            var tac = previous as TypeNameAndClassSelector;
-
-            if (tac != null)
-            {
-                tac.Classes.Add(name);
-                return tac;
-            }
-            else
-            {
-                return TypeNameAndClassSelector.ForClass(previous, name);
-            }
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a descendant of a previous selector.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Descendant(this Selector? previous)
-        {
-            return new DescendantSelector(previous);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a type or a derived type.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="type">The type.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Is(this Selector? previous, Type type)
-        {
-            _ = type ?? throw new ArgumentNullException(nameof(type));
-
-            return TypeNameAndClassSelector.Is(previous, type);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a type or a derived type.
-        /// </summary>
-        /// <typeparam name="T">The type.</typeparam>
-        /// <param name="previous">The previous selector.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Is<T>(this Selector? previous) where T : IStyleable
-        {
-            return previous.Is(typeof(T));
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a control's Name.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="name">The name.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Name(this Selector? previous, string name)
-        {
-            _ = name ?? throw new ArgumentNullException(nameof(name));
-
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw new ArgumentException("Name may not be empty", nameof(name));
-            }
-
-            var tac = previous as TypeNameAndClassSelector;
-
-            if (tac != null)
-            {
-                tac.Name = name;
-                return tac;
-            }
-            else
-            {
-                return TypeNameAndClassSelector.ForName(previous, name);
-            }
-        }
-
-        /// <summary>
-        /// Returns a selector which inverts the results of selector argument.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="argument">The selector to be not-ed.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Not(this Selector? previous, Func<Selector?, Selector> argument)
-        {
-            return new NotSelector(previous, argument(null));
-        }
-        
-        /// <summary>
-        /// Returns a selector which inverts the results of selector argument.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="argument">The selector to be not-ed.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Not(this Selector? previous, Selector argument)
-        {
-            return new NotSelector(previous, argument);
-        }
-
-        /// <inheritdoc cref="NthChildSelector"/>
-        /// <inheritdoc cref="NthChildSelector(Selector?, int, int)"/>
-        /// <returns>The selector.</returns>
-        public static Selector NthChild(this Selector? previous, int step, int offset)
-        {
-            return new NthChildSelector(previous, step, offset);
-        }
-
-        /// <inheritdoc cref="NthLastChildSelector"/>
-        /// <inheritdoc cref="NthLastChildSelector(Selector?, int, int)"/>
-        /// <returns>The selector.</returns>
-        public static Selector NthLastChild(this Selector? previous, int step, int offset)
-        {
-            return new NthLastChildSelector(previous, step, offset);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a type.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="type">The type.</param>
-        /// <returns>The selector.</returns>
-        public static Selector OfType(this Selector? previous, Type type)
-        {
-            _ = type ?? throw new ArgumentNullException(nameof(type));
-
-            return TypeNameAndClassSelector.OfType(previous, type);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a type.
-        /// </summary>
-        /// <typeparam name="T">The type.</typeparam>
-        /// <param name="previous">The previous selector.</param>
-        /// <returns>The selector.</returns>
-        public static Selector OfType<T>(this Selector? previous) where T : IStyleable
-        {
-            return previous.OfType(typeof(T));
-        }
-
-        /// <summary>
-        /// Returns a selector which ORs selectors.
-        /// </summary>
-        /// <param name="selectors">The selectors to be OR'd.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Or(params Selector[] selectors)
-        {
-            return new OrSelector(selectors);
-        }
-
-        /// <summary>
-        /// Returns a selector which ORs selectors.
-        /// </summary>
-        /// <param name="selectors">The selectors to be OR'd.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Or(IReadOnlyList<Selector> selectors)
-        {
-            return new OrSelector(selectors);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a control with the specified property value.
-        /// </summary>
-        /// <typeparam name="T">The property type.</typeparam>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The property value.</param>
-        /// <returns>The selector.</returns>
-        public static Selector PropertyEquals<T>(this Selector? previous, AvaloniaProperty<T> property, object? value)
-        {
-            _ = property ?? throw new ArgumentNullException(nameof(property));
-
-            return new PropertyEqualsSelector(previous, property, value);
-        }
-
-        /// <summary>
-        /// Returns a selector which matches a control with the specified property value.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The property value.</param>
-        /// <returns>The selector.</returns>
-        public static Selector PropertyEquals(this Selector? previous, AvaloniaProperty property, object? value)
-        {
-            _ = property ?? throw new ArgumentNullException(nameof(property));
-
-            return new PropertyEqualsSelector(previous, property, value);
-        }
-
-        /// <summary>
-        /// Returns a selector which enters a lookless control's template.
-        /// </summary>
-        /// <param name="previous">The previous selector.</param>
-        /// <returns>The selector.</returns>
-        public static Selector Template(this Selector previous)
-        {
-            return new TemplateSelector(previous);
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
deleted file mode 100644
index 168a882499..0000000000
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using System;
-using Avalonia.Animation;
-using Avalonia.Data;
-using Avalonia.Data.Core;
-using Avalonia.Metadata;
-using Avalonia.Utilities;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A setter for a <see cref="Style"/>.
-    /// </summary>
-    /// <remarks>
-    /// A <see cref="Setter"/> is used to set a <see cref="AvaloniaProperty"/> value on a
-    /// <see cref="AvaloniaObject"/> depending on a condition.
-    /// </remarks>
-    public class Setter : ISetter, IAnimationSetter, IAvaloniaPropertyVisitor<Setter.SetterVisitorData>
-    {
-        private object? _value;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Setter"/> class.
-        /// </summary>
-        public Setter()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Setter"/> class.
-        /// </summary>
-        /// <param name="property">The property to set.</param>
-        /// <param name="value">The property value.</param>
-        public Setter(AvaloniaProperty property, object value)
-        {
-            Property = property;
-            Value = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the property to set.
-        /// </summary>
-        public AvaloniaProperty? Property { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value.
-        /// </summary>
-        [Content]
-        [AssignBinding]
-        [DependsOn(nameof(Property))]
-        public object? Value
-        {
-            get => _value;
-            set
-            {
-                (value as ISetterValue)?.Initialize(this);
-                _value = value;
-            }
-        }
-
-        public ISetterInstance Instance(IStyleable target)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-
-            if (Property is null)
-            {
-                throw new InvalidOperationException("Setter.Property must be set.");
-            }
-
-            var data = new SetterVisitorData
-            {
-                target = target,
-                value = Value,
-            };
-
-            Property.Accept(this, ref data);
-            return data.result!;
-        }
-
-        void IAvaloniaPropertyVisitor<SetterVisitorData>.Visit<T>(
-            StyledPropertyBase<T> property,
-            ref SetterVisitorData data)
-        {
-            if (data.value is IBinding binding)
-            {
-                data.result = new PropertySetterBindingInstance<T>(
-                    data.target,
-                    property,
-                    binding);
-            }
-            else if (data.value is ITemplate template && !typeof(ITemplate).IsAssignableFrom(property.PropertyType))
-            {
-                data.result = new PropertySetterLazyInstance<T>(
-                    data.target,
-                    property,
-                    () => (T)template.Build());
-            }
-            else
-            {
-                data.result = new PropertySetterInstance<T>(
-                    data.target,
-                    property,
-                    (T)data.value!);
-            }
-        }
-
-        void IAvaloniaPropertyVisitor<SetterVisitorData>.Visit<T>(
-            DirectPropertyBase<T> property,
-            ref SetterVisitorData data)
-        {
-            if (data.value is IBinding binding)
-            {
-                data.result = new PropertySetterBindingInstance<T>(
-                    data.target,
-                    property,
-                    binding);
-            }
-            else if (data.value is ITemplate template && !typeof(ITemplate).IsAssignableFrom(property.PropertyType))
-            {
-                data.result = new PropertySetterLazyInstance<T>(
-                    data.target,
-                    property,
-                    () => (T)template.Build());
-            }
-            else
-            {
-                data.result = new PropertySetterInstance<T>(
-                    data.target,
-                    property,
-                    (T)data.value!);
-            }
-        }
-
-        private struct SetterVisitorData
-        {
-            public IStyleable target;
-            public object? value;
-            public ISetterInstance? result;
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Style.cs b/src/Avalonia.Styling/Styling/Style.cs
deleted file mode 100644
index 00819ef7be..0000000000
--- a/src/Avalonia.Styling/Styling/Style.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Animation;
-using Avalonia.Controls;
-using Avalonia.Metadata;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Defines a style.
-    /// </summary>
-    public class Style : AvaloniaObject, IStyle, IResourceProvider
-    {
-        private IResourceHost? _owner;
-        private IResourceDictionary? _resources;
-        private List<ISetter>? _setters;
-        private List<IAnimation>? _animations;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Style"/> class.
-        /// </summary>
-        public Style()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Style"/> class.
-        /// </summary>
-        /// <param name="selector">The style selector.</param>
-        public Style(Func<Selector?, Selector> selector)
-        {
-            Selector = selector(null);
-        }
-
-        public IResourceHost? Owner
-        {
-            get => _owner;
-            private set
-            {
-                if (_owner != value)
-                {
-                    _owner = value;
-                    OwnerChanged?.Invoke(this, EventArgs.Empty);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a dictionary of style resources.
-        /// </summary>
-        public IResourceDictionary Resources
-        {
-            get => _resources ?? (Resources = new ResourceDictionary());
-            set
-            {
-                value = value ?? throw new ArgumentNullException(nameof(value));
-
-                var hadResources = _resources?.HasResources ?? false;
-
-                _resources = value;
-
-                if (Owner is object)
-                {
-                    _resources.AddOwner(Owner);
-
-                    if (hadResources || _resources.HasResources)
-                    {
-                        Owner.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the style's selector.
-        /// </summary>
-        public Selector? Selector { get; set; }
-
-        /// <summary>
-        /// Gets the style's setters.
-        /// </summary>
-        [Content]
-        public IList<ISetter> Setters => _setters ??= new List<ISetter>();
-
-        /// <summary>
-        /// Gets the style's animations.
-        /// </summary>
-        public IList<IAnimation> Animations => _animations ??= new List<IAnimation>();
-
-        bool IResourceNode.HasResources => _resources?.Count > 0;
-        IReadOnlyList<IStyle> IStyle.Children => Array.Empty<IStyle>();
-
-        public event EventHandler? OwnerChanged;
-
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-
-            var match = Selector is object ? Selector.Match(target) :
-                target == host ? SelectorMatch.AlwaysThisInstance : SelectorMatch.NeverThisInstance;
-
-            if (match.IsMatch && (_setters is object || _animations is object))
-            {
-                var instance = new StyleInstance(this, target, _setters, _animations, match.Activator);
-                target.StyleApplied(instance);
-                instance.Start();
-            }
-
-            return match.Result;
-        }
-
-        public bool TryGetResource(object key, out object? result)
-        {
-            result = null;
-            return _resources?.TryGetResource(key, out result) ?? false;
-        }
-
-        /// <summary>
-        /// Returns a string representation of the style.
-        /// </summary>
-        /// <returns>A string representation of the style.</returns>
-        public override string ToString()
-        {
-            if (Selector != null)
-            {
-                return "Style: " + Selector.ToString();
-            }
-            else
-            {
-                return "Style";
-            }
-        }
-
-        void IResourceProvider.AddOwner(IResourceHost owner)
-        {
-            owner = owner ?? throw new ArgumentNullException(nameof(owner));
-
-            if (Owner != null)
-            {
-                throw new InvalidOperationException("The Style already has a parent.");
-            }
-
-            Owner = owner;
-            _resources?.AddOwner(owner);
-        }
-
-        void IResourceProvider.RemoveOwner(IResourceHost owner)
-        {
-            owner = owner ?? throw new ArgumentNullException(nameof(owner));
-
-            if (Owner == owner)
-            {
-                Owner = null;
-                _resources?.RemoveOwner(owner);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/StyleInstance.cs b/src/Avalonia.Styling/Styling/StyleInstance.cs
deleted file mode 100644
index 830cf49a0d..0000000000
--- a/src/Avalonia.Styling/Styling/StyleInstance.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reactive.Subjects;
-using Avalonia.Animation;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A <see cref="Style"/> which has been instanced on a control.
-    /// </summary>
-    internal class StyleInstance : IStyleInstance, IStyleActivatorSink
-    {
-        private readonly List<ISetterInstance>? _setters;
-        private readonly List<IDisposable>? _animations;
-        private readonly IStyleActivator? _activator;
-        private readonly Subject<bool>? _animationTrigger;
-
-        public StyleInstance(
-            IStyle source,
-            IStyleable target,
-            IReadOnlyList<ISetter>? setters,
-            IReadOnlyList<IAnimation>? animations,
-            IStyleActivator? activator = null)
-        {
-            Source = source ?? throw new ArgumentNullException(nameof(source));
-            Target = target ?? throw new ArgumentNullException(nameof(target));
-            _activator = activator;
-            IsActive = _activator is null;
-
-            if (setters is object)
-            {
-                var setterCount = setters.Count;
-
-                _setters = new List<ISetterInstance>(setterCount);
-
-                for (var i = 0; i < setterCount; ++i)
-                {
-                    _setters.Add(setters[i].Instance(Target));
-                }
-            }
-
-            if (animations is object && target is Animatable animatable)
-            {
-                var animationsCount = animations.Count;
-
-                _animations = new List<IDisposable>(animationsCount);
-                _animationTrigger = new Subject<bool>();
-
-                for (var i = 0; i < animationsCount; ++i)
-                {
-                    _animations.Add(animations[i].Apply(animatable, null, _animationTrigger));
-                }
-            }
-        }
-
-        public bool IsActive { get; private set; }
-        public IStyle Source { get; }
-        public IStyleable Target { get; }
-
-        public void Start()
-        {
-            var hasActivator = _activator is object;
-
-            if (_setters is object)
-            {
-                foreach (var setter in _setters)
-                {
-                    setter.Start(hasActivator);
-                }
-            }
-
-            if (hasActivator)
-            {
-                _activator!.Subscribe(this, 0);
-            }
-            else if (_animationTrigger != null)
-            {
-                _animationTrigger.OnNext(true);
-            }
-        }
-
-        public void Dispose()
-        {
-            if (_setters is object)
-            {
-                foreach (var setter in _setters)
-                {
-                    setter.Dispose();
-                }
-            }
-
-            if (_animations is object)
-            {
-                foreach (var subscripion in _animations)
-                {
-                    subscripion.Dispose();
-                }
-            }
-
-            _activator?.Dispose();
-        }
-
-        private void ActivatorChanged(bool value)
-        {
-            if (IsActive != value)
-            {
-                IsActive = value;
-
-                _animationTrigger?.OnNext(value);
-
-                if (_setters is object)
-                {
-                    if (IsActive)
-                    {
-                        foreach (var setter in _setters)
-                        {
-                            setter.Activate();
-                        }
-                    }
-                    else
-                    {
-                        foreach (var setter in _setters)
-                        {
-                            setter.Deactivate();
-                        }
-                    }
-                }
-            }
-        }
-
-        void IStyleActivatorSink.OnNext(bool value, int tag) => ActivatorChanged(value);
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Styles.cs b/src/Avalonia.Styling/Styling/Styles.cs
deleted file mode 100644
index 81502f1570..0000000000
--- a/src/Avalonia.Styling/Styling/Styles.cs
+++ /dev/null
@@ -1,334 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using Avalonia.Collections;
-using Avalonia.Controls;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A style that consists of a number of child styles.
-    /// </summary>
-    public class Styles : AvaloniaObject,
-        IAvaloniaList<IStyle>,
-        IStyle,
-        IResourceProvider
-    {
-        private readonly AvaloniaList<IStyle> _styles = new AvaloniaList<IStyle>();
-        private IResourceHost? _owner;
-        private IResourceDictionary? _resources;
-        private Dictionary<Type, List<IStyle>?>? _cache;
-
-        public Styles()
-        {
-            _styles.ResetBehavior = ResetBehavior.Remove;
-            _styles.CollectionChanged += OnCollectionChanged;
-        }
-
-        public Styles(IResourceHost owner)
-            : this()
-        {
-            Owner = owner;
-        }
-
-        public event NotifyCollectionChangedEventHandler? CollectionChanged;
-        public event EventHandler? OwnerChanged;
-
-        public int Count => _styles.Count;
-
-        public IResourceHost? Owner
-        {
-            get => _owner;
-            private set
-            {
-                if (_owner != value)
-                {
-                    _owner = value;
-                    OwnerChanged?.Invoke(this, EventArgs.Empty);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a dictionary of style resources.
-        /// </summary>
-        public IResourceDictionary Resources
-        {
-            get => _resources ?? (Resources = new ResourceDictionary());
-            set
-            {
-                value = value ?? throw new ArgumentNullException(nameof(Resources));
-
-                if (Owner is object)
-                {
-                    _resources?.RemoveOwner(Owner);
-                }
-
-                _resources = value;
-
-                if (Owner is object)
-                {
-                    _resources.AddOwner(Owner);
-                }
-            }
-        }
-
-        bool ICollection<IStyle>.IsReadOnly => false;
-
-        bool IResourceNode.HasResources
-        {
-            get
-            {
-                if (_resources?.Count > 0)
-                {
-                    return true;
-                }
-
-                foreach (var i in this)
-                {
-                    if (i is IResourceProvider p && p.HasResources)
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-        }
-
-        IStyle IReadOnlyList<IStyle>.this[int index] => _styles[index];
-
-        IReadOnlyList<IStyle> IStyle.Children => this;
-
-        public IStyle this[int index]
-        {
-            get => _styles[index];
-            set => _styles[index] = value;
-        }
-
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
-        {
-            _cache ??= new Dictionary<Type, List<IStyle>?>();
-
-            if (_cache.TryGetValue(target.StyleKey, out var cached))
-            {
-                if (cached is object)
-                {
-                    foreach (var style in cached)
-                    {
-                        style.TryAttach(target, host);
-                    }
-
-                    return SelectorMatchResult.AlwaysThisType;
-                }
-                else
-                {
-                    return SelectorMatchResult.NeverThisType;
-                }
-            }
-            else
-            {
-                List<IStyle>? matches = null;
-
-                foreach (var child in this)
-                {
-                    if (child.TryAttach(target, host) != SelectorMatchResult.NeverThisType)
-                    {
-                        matches ??= new List<IStyle>();
-                        matches.Add(child);
-                    }
-                }
-
-                _cache.Add(target.StyleKey, matches);
-                
-                return matches is null ?
-                    SelectorMatchResult.NeverThisType :
-                    SelectorMatchResult.AlwaysThisType;
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetResource(object key, out object? value)
-        {
-            if (_resources != null && _resources.TryGetResource(key, out value))
-            {
-                return true;
-            }
-
-            for (var i = Count - 1; i >= 0; --i)
-            {
-                if (this[i] is IResourceProvider p && p.TryGetResource(key, out value))
-                {
-                    return true;
-                }
-            }
-
-            value = null;
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public void AddRange(IEnumerable<IStyle> items) => _styles.AddRange(items);
-
-        /// <inheritdoc/>
-        public void InsertRange(int index, IEnumerable<IStyle> items) => _styles.InsertRange(index, items);
-
-        /// <inheritdoc/>
-        public void Move(int oldIndex, int newIndex) => _styles.Move(oldIndex, newIndex);
-
-        /// <inheritdoc/>
-        public void MoveRange(int oldIndex, int count, int newIndex) => _styles.MoveRange(oldIndex, count, newIndex);
-
-        /// <inheritdoc/>
-        public void RemoveAll(IEnumerable<IStyle> items) => _styles.RemoveAll(items);
-
-        /// <inheritdoc/>
-        public void RemoveRange(int index, int count) => _styles.RemoveRange(index, count);
-
-        /// <inheritdoc/>
-        public int IndexOf(IStyle item) => _styles.IndexOf(item);
-
-        /// <inheritdoc/>
-        public void Insert(int index, IStyle item) => _styles.Insert(index, item);
-
-        /// <inheritdoc/>
-        public void RemoveAt(int index) => _styles.RemoveAt(index);
-
-        /// <inheritdoc/>
-        public void Add(IStyle item) => _styles.Add(item);
-
-        /// <inheritdoc/>
-        public void Clear() => _styles.Clear();
-
-        /// <inheritdoc/>
-        public bool Contains(IStyle item) => _styles.Contains(item);
-
-        /// <inheritdoc/>
-        public void CopyTo(IStyle[] array, int arrayIndex) => _styles.CopyTo(array, arrayIndex);
-
-        /// <inheritdoc/>
-        public bool Remove(IStyle item) => _styles.Remove(item);
-
-        public AvaloniaList<IStyle>.Enumerator GetEnumerator() => _styles.GetEnumerator();
-
-        /// <inheritdoc/>
-        IEnumerator<IStyle> IEnumerable<IStyle>.GetEnumerator() => _styles.GetEnumerator();
-
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator() => _styles.GetEnumerator();
-
-        /// <inheritdoc/>
-        void IResourceProvider.AddOwner(IResourceHost owner)
-        {
-            owner = owner ?? throw new ArgumentNullException(nameof(owner));
-
-            if (Owner != null)
-            {
-                throw new InvalidOperationException("The Styles already has a owner.");
-            }
-
-            Owner = owner;
-            _resources?.AddOwner(owner);
-
-            foreach (var child in this)
-            {
-                if (child is IResourceProvider r)
-                {
-                    r.AddOwner(owner);
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        void IResourceProvider.RemoveOwner(IResourceHost owner)
-        {
-            owner = owner ?? throw new ArgumentNullException(nameof(owner));
-
-            if (Owner == owner)
-            {
-                Owner = null;
-                _resources?.RemoveOwner(owner);
-
-                foreach (var child in this)
-                {
-                    if (child is IResourceProvider r)
-                    {
-                        r.RemoveOwner(owner);
-                    }
-                }
-            }
-        }
-
-        private void OnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            static IReadOnlyList<T> ToReadOnlyList<T>(IList list)
-            {
-                if (list is IReadOnlyList<T>)
-                {
-                    return (IReadOnlyList<T>)list;
-                }
-                else
-                {
-                    var result = new T[list.Count];
-                    list.CopyTo(result, 0);
-                    return result;
-                }
-            }
-
-            void Add(IList items)
-            {
-                for (var i = 0; i < items.Count; ++i)
-                {
-                    var style = (IStyle)items[i]!;
-
-                    if (Owner is object && style is IResourceProvider resourceProvider)
-                    {
-                        resourceProvider.AddOwner(Owner);
-                    }
-
-                    _cache = null;
-                }
-
-                (Owner as IStyleHost)?.StylesAdded(ToReadOnlyList<IStyle>(items));
-            }
-
-            void Remove(IList items)
-            {
-                for (var i = 0; i < items.Count; ++i)
-                {
-                    var style = (IStyle)items[i]!;
-
-                    if (Owner is object && style is IResourceProvider resourceProvider)
-                    {
-                        resourceProvider.RemoveOwner(Owner);
-                    }
-
-                    _cache = null;
-                }
-
-                (Owner as IStyleHost)?.StylesRemoved(ToReadOnlyList<IStyle>(items));
-            }
-
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    Add(e.NewItems!);
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    Remove(e.OldItems!);
-                    break;
-                case NotifyCollectionChangedAction.Replace:
-                    Remove(e.OldItems!);
-                    Add(e.NewItems!);
-                    break;
-                case NotifyCollectionChangedAction.Reset:
-                    throw new InvalidOperationException("Reset should not be called on Styles.");
-            }
-
-            CollectionChanged?.Invoke(this, e);
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/TemplateSelector.cs b/src/Avalonia.Styling/Styling/TemplateSelector.cs
deleted file mode 100644
index e8051efa6d..0000000000
--- a/src/Avalonia.Styling/Styling/TemplateSelector.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-
-namespace Avalonia.Styling
-{
-    internal class TemplateSelector : Selector
-    {
-        private readonly Selector _parent;
-        private string? _selectorString;
-
-        public TemplateSelector(Selector parent)
-        {
-            if (parent == null)
-            {
-                throw new InvalidOperationException("Template selector must be preceeded by a selector.");
-            }
-
-            _parent = parent;
-        }
-
-        /// <inheritdoc/>
-        public override bool InTemplate => true;
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => true;
-
-        /// <inheritdoc/>
-        public override Type? TargetType => null;
-
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                _selectorString = _parent.ToString() + " /template/ ";
-            }
-
-            return _selectorString;
-        }
-
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            var templatedParent = control.TemplatedParent as IStyleable;
-
-            if (templatedParent == null)
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-
-            return _parent.Match(templatedParent, subscribe);
-        }
-
-        protected override Selector? MovePrevious() => null;
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/TypeNameAndClassSelector.cs b/src/Avalonia.Styling/Styling/TypeNameAndClassSelector.cs
deleted file mode 100644
index ef48c4a8cd..0000000000
--- a/src/Avalonia.Styling/Styling/TypeNameAndClassSelector.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Avalonia.Styling.Activators;
-
-#nullable enable
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A selector that matches the common case of a type and/or name followed by a collection of
-    /// style classes and pseudoclasses.
-    /// </summary>
-    internal class TypeNameAndClassSelector : Selector
-    {
-        private readonly Selector? _previous;
-        private readonly Lazy<List<string>> _classes = new Lazy<List<string>>(() => new List<string>());
-        private Type? _targetType;
-        private string? _selectorString;
-
-        public static TypeNameAndClassSelector OfType(Selector? previous, Type targetType)
-        {
-            var result = new TypeNameAndClassSelector(previous);
-            result._targetType = targetType;
-            result.IsConcreteType = true;
-
-            return result;
-        }
-
-        public static TypeNameAndClassSelector Is(Selector? previous, Type targetType)
-        {
-            var result = new TypeNameAndClassSelector(previous);
-            result._targetType = targetType;
-            result.IsConcreteType = false;
-
-            return result;
-        }
-
-        public static TypeNameAndClassSelector ForName(Selector? previous, string name)
-        {
-            var result = new TypeNameAndClassSelector(previous);
-            result.Name = name;
-
-            return result;
-        }
-
-        public static TypeNameAndClassSelector ForClass(Selector? previous, string className)
-        {
-            var result = new TypeNameAndClassSelector(previous);
-            result.Classes.Add(className);
-
-            return result;
-        }
-
-        protected TypeNameAndClassSelector(Selector? previous)
-        {
-            _previous = previous;
-        }
-
-        /// <inheritdoc/>
-        public override bool InTemplate => _previous?.InTemplate ?? false;
-
-        /// <summary>
-        /// Gets the name of the control to match.
-        /// </summary>
-        public string? Name { get; set; }
-
-        /// <inheritdoc/>
-        public override Type? TargetType => _targetType ?? _previous?.TargetType;
-
-        /// <inheritdoc/>
-        public override bool IsCombinator => false;
-
-        /// <summary>
-        /// Whether the selector matches the concrete <see cref="TargetType"/> or any object which
-        /// implements <see cref="TargetType"/>.
-        /// </summary>
-        public bool IsConcreteType { get; private set; }
-
-        /// <summary>
-        /// The style classes which the selector matches.
-        /// </summary>
-        public IList<string> Classes => _classes.Value;
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (_selectorString == null)
-            {
-                _selectorString = BuildSelectorString();
-            }
-
-            return _selectorString;
-        }
-
-        /// <inheritdoc/>
-        protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
-        {
-            if (TargetType != null)
-            {
-                var controlType = control.StyleKey ?? control.GetType();
-
-                if (IsConcreteType)
-                {
-                    if (controlType != TargetType)
-                    {
-                        return SelectorMatch.NeverThisType;
-                    }
-                }
-                else
-                {
-                    if (!TargetType.IsAssignableFrom(controlType))
-                    {
-                        return SelectorMatch.NeverThisType;
-                    }
-                }
-            }
-
-            if (Name != null && control.Name != Name)
-            {
-                return SelectorMatch.NeverThisInstance;
-            }
-
-            if (_classes.IsValueCreated && _classes.Value.Count > 0)
-            {
-                if (subscribe)
-                {
-                    var observable = new StyleClassActivator(control.Classes, _classes.Value);
-
-                    return new SelectorMatch(observable);
-                }
-
-                if (!StyleClassActivator.AreClassesMatching(control.Classes, Classes))
-                {
-                    return SelectorMatch.NeverThisInstance;
-                }
-            }
-
-            return Name == null ? SelectorMatch.AlwaysThisType : SelectorMatch.AlwaysThisInstance;
-        }
-
-        protected override Selector? MovePrevious() => _previous;
-
-        private string BuildSelectorString()
-        {
-            var builder = new StringBuilder();
-
-            if (_previous != null)
-            {
-                builder.Append(_previous.ToString());
-            }
-
-            if (TargetType != null)
-            {
-                if (IsConcreteType)
-                {
-                    builder.Append(TargetType.Name);
-                }
-                else
-                {
-                    builder.Append(":is(");
-                    builder.Append(TargetType.Name);
-                    builder.Append(")");
-                }
-            }
-
-            if (Name != null)
-            {
-                builder.Append('#');
-                builder.Append(Name);
-            }
-
-            if (_classes.IsValueCreated && _classes.Value.Count > 0)
-            {
-                foreach (var c in Classes)
-                {
-                    if (!c.StartsWith(":"))
-                    {
-                        builder.Append('.');
-                    }
-
-                    builder.Append(c);
-                }
-            }
-
-            return builder.ToString();
-        }
-    }
-}
diff --git a/src/Avalonia.Themes.Default/ApiCompatBaseline.txt b/src/Avalonia.Themes.Default/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..fcc74cf864
--- /dev/null
+++ b/src/Avalonia.Themes.Default/ApiCompatBaseline.txt
@@ -0,0 +1 @@
+Total Issues: 0
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index ef200b5532..40ed4a0f87 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -3,16 +3,10 @@
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
+    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <AvaloniaResource Include="**/*.xaml" />
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
diff --git a/src/Avalonia.Themes.Default/Controls/Button.xaml b/src/Avalonia.Themes.Default/Controls/Button.xaml
index da36abe7ec..a2971c3ff6 100644
--- a/src/Avalonia.Themes.Default/Controls/Button.xaml
+++ b/src/Avalonia.Themes.Default/Controls/Button.xaml
@@ -18,7 +18,7 @@
                           Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"
                           RecognizesAccessKey="True"
-                          TextBlock.Foreground="{TemplateBinding Foreground}"
+                          TextElement.Foreground="{TemplateBinding Foreground}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
       </ControlTemplate>
diff --git a/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml
index cf469eeac5..be6642467f 100644
--- a/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml
+++ b/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml
@@ -4,7 +4,7 @@
     <Setter Property="MaxHeight" Value="30" />
     <Setter Property="Template">
       <ControlTemplate>
-        <StackPanel Spacing="2" VerticalAlignment="Stretch" TextBlock.FontSize="10" Orientation="Horizontal">
+        <StackPanel Spacing="2" VerticalAlignment="Stretch" TextElement.FontSize="10" Orientation="Horizontal">
           <StackPanel.Styles>
             <Style Selector="Panel">
               <Setter Property="Width" Value="45" />
diff --git a/src/Avalonia.Themes.Default/Controls/CheckBox.xaml b/src/Avalonia.Themes.Default/Controls/CheckBox.xaml
index 75d6f853be..170ecdd5b8 100644
--- a/src/Avalonia.Themes.Default/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Default/Controls/CheckBox.xaml
@@ -26,6 +26,7 @@
                     Stretch="Uniform"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
+                    FlowDirection="LeftToRight"
                     Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"/>
               <Rectangle Name="indeterminateMark"
                          Fill="{DynamicResource HighlightBrush}"
@@ -37,7 +38,7 @@
             </Panel>
           </Border>
           <ContentPresenter Name="PART_ContentPresenter"
-                            TextBlock.Foreground="{TemplateBinding Foreground}"
+                            TextElement.Foreground="{TemplateBinding Foreground}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
                             Content="{TemplateBinding Content}"
                             Margin="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml
index a3a4cf4662..d7bf4bbbf1 100644
--- a/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml
@@ -1,9 +1,13 @@
 <Style xmlns="https://github.com/avaloniaui" 
-       Selector="DataValidationErrors">
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       Selector="DataValidationErrors"
+       x:CompileBindings="True"
+       x:DataType="DataValidationErrors">
   <Setter Property="Template">
     <ControlTemplate>
       <DockPanel LastChildFill="True">
-        <ContentControl DockPanel.Dock="Right"
+        <ContentControl x:DataType="DataValidationErrors"
+                        DockPanel.Dock="Right"
                         ContentTemplate="{TemplateBinding ErrorTemplate}"
                         DataContext="{TemplateBinding Owner}"
                         Content="{Binding (DataValidationErrors.Errors)}"
@@ -30,7 +34,7 @@
           </Style>
         </Canvas.Styles>
         <ToolTip.Tip>
-          <ItemsControl Items="{Binding}"/>
+          <ItemsControl x:DataType="DataValidationErrors" Items="{Binding}"/>
         </ToolTip.Tip>
         <Path Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2" Stroke="{DynamicResource ErrorBrush}" StrokeThickness="2"/>
       </Canvas>
diff --git a/src/Avalonia.Themes.Default/Controls/DatePicker.xaml b/src/Avalonia.Themes.Default/Controls/DatePicker.xaml
index c6c117138d..c1ee941416 100644
--- a/src/Avalonia.Themes.Default/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Default/Controls/DatePicker.xaml
@@ -36,7 +36,7 @@
   </Style>
   <Style Selector="ListBoxItem.DateTimePickerItem:selected /template/ ContentPresenter">
     <Setter Property="Background" Value="Transparent" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
   </Style>
   <Style Selector="ListBoxItem.DateTimePickerItem.MonthItem">
     <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}"/>
@@ -58,7 +58,7 @@
                   BorderBrush="{DynamicResource ThemeControlTransparentBrush}"
                   BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
                   Content="{TemplateBinding Content}"
-                  TextBlock.Foreground="{DynamicResource ThemeForegroundBrush}"
+                  TextElement.Foreground="{DynamicResource ThemeForegroundBrush}"
                   ContentTemplate="{TemplateBinding ContentTemplate}"
                   Padding="{TemplateBinding Padding}"
                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -71,13 +71,13 @@
   <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}"/>
+    <Setter Property="TextElement.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}"/>
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
   </Style>
 
 
@@ -151,7 +151,7 @@
                                   BorderThickness="{TemplateBinding BorderThickness}"
                                   CornerRadius="{TemplateBinding CornerRadius}"
                                   Content="{TemplateBinding Content}"
-                                  TextBlock.Foreground="{TemplateBinding Foreground}"
+                                  TextElement.Foreground="{TemplateBinding Foreground}"
                                   HorizontalContentAlignment="Stretch"
                                   VerticalContentAlignment="Stretch"/>
               </ControlTemplate>
@@ -196,7 +196,7 @@
     </Setter>
   </Style>
   <Style Selector="DatePicker /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
   </Style>
   <Style Selector="DatePicker:disabled /template/ Rectangle">
     <!--<Setter Property="Fill" Value="{DynamicResource DatePickerSpacerFillDisabled}"/>-->
@@ -206,7 +206,7 @@
   <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}"/>
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
   </Style>
 
   <Style Selector="DatePicker /template/ Button#FlyoutButton:pressed /template/ ContentPresenter">
@@ -214,13 +214,13 @@
     <Setter Property="Background">
       <SolidColorBrush Color="{DynamicResource ThemeControlMidHighColor}" Opacity="0.6" />
     </Setter>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
+    <Setter Property="TextElement.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="TextElement.Foreground" Value="{DynamicResource DatePickerButtonForegroundDisabled}"/>-->
     <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
   </Style>
 
diff --git a/src/Avalonia.Themes.Default/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Default/Controls/DropDownButton.xaml
new file mode 100644
index 0000000000..662c6379fb
--- /dev/null
+++ b/src/Avalonia.Themes.Default/Controls/DropDownButton.xaml
@@ -0,0 +1,67 @@
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector="DropDownButton">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
+    <Setter Property="HorizontalContentAlignment" Value="Center"/>
+    <Setter Property="VerticalContentAlignment" Value="Center"/>
+    <Setter Property="Padding" Value="4"/>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Name="RootBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  ClipToBounds="True">
+            <Grid Name="InnerGrid">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Column="0"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Padding="{TemplateBinding Padding}"
+                                RecognizesAccessKey="True"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+              <PathIcon Name="DropDownGlyph"
+                        Grid.Column="1"
+                        UseLayoutRounding="False"
+                        IsHitTestVisible="False"
+                        Height="12"
+                        Width="12"
+                        Margin="0,0,10,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center" />
+
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style Selector="DropDownButton /template/ PathIcon#DropDownGlyph">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
+  </Style>
+
+  <Style Selector="DropDownButton:pointerover /template/ Border#RootBorder">
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
+  </Style>
+
+  <Style Selector="DropDownButton:pressed  /template/ Border#RootBorder">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}"/>
+  </Style>
+
+  <Style Selector="DropDownButton:disabled">
+    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
+  </Style>
+</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
index c5d7ad55d7..81bd8f39c5 100644
--- a/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
+++ b/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
@@ -4,6 +4,7 @@
        Selector="NativeMenuBar">
   <Style.Resources>
     <local:InverseBooleanValueConverter x:Key="AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter" Default="True"/>
+    <local:IBitmapToImageConverter x:Key="AvaloniaThemesDefaultNativeMenuBarIBitmapToImageConverterr"/>
   </Style.Resources>
   <Setter Property="Template">
     <ControlTemplate>
@@ -18,6 +19,8 @@
             <Setter Property="Command" Value="{Binding Command}"/>
             <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
             <Setter Property="(NativeMenuBar.EnableMenuItemClickForwarding)" Value="True"/>
+            <!--NativeMenuItem is IBitmap and MenuItem is Image-->
+            <Setter Property="Icon" Value="{Binding Icon , Converter={StaticResource AvaloniaThemesDefaultNativeMenuBarIBitmapToImageConverterr}}"/>
           </Style>
         </Menu.Styles>
       </Menu>
diff --git a/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml
index 301e19d208..07d905ea1d 100644
--- a/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml
@@ -1,4 +1,4 @@
-<Style xmlns="https://github.com/avaloniaui" 
+<Style xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        Selector="OverlayPopupHost">
   <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
@@ -9,13 +9,15 @@
   <Setter Property="Template">
     <ControlTemplate>
       <!--  Do not forget to update Templated_Control_With_Popup_In_Template_Should_Set_TemplatedParent test  -->
-      <VisualLayerManager IsPopup="True">
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"/>
-      </VisualLayerManager>
+      <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+        <VisualLayerManager IsPopup="True">
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}"/>
+        </VisualLayerManager>
+      </LayoutTransformControl>
     </ControlTemplate>
   </Setter>
 </Style>
diff --git a/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml
index 9468cc5535..5e8f3337ee 100644
--- a/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml
@@ -10,16 +10,18 @@
   <Setter Property="FontStyle" Value="Normal" />
   <Setter Property="Template">
     <ControlTemplate>
-      <Panel>
-        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-        <VisualLayerManager IsPopup="True">
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Background="{TemplateBinding Background}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Padding="{TemplateBinding Padding}"/>
-        </VisualLayerManager>
-      </Panel>
+      <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+        <Panel>
+          <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+          <VisualLayerManager IsPopup="True">
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Background="{TemplateBinding Background}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              Padding="{TemplateBinding Padding}"/>
+          </VisualLayerManager>
+        </Panel>
+      </LayoutTransformControl>
     </ControlTemplate>
   </Setter>
 </Style>
diff --git a/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml
index a9a03c8ed5..47398966f7 100644
--- a/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml
@@ -24,7 +24,7 @@
                                   ContentTemplate="{TemplateBinding ContentTemplate}"
                                   Content="{TemplateBinding Content}"
                                   Padding="{TemplateBinding Padding}"
-                                  TextBlock.Foreground="{TemplateBinding Foreground}"
+                                  TextElement.Foreground="{TemplateBinding Foreground}"
                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
             </ControlTemplate>
diff --git a/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml
index b357446bfa..aab1b76259 100644
--- a/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml
@@ -13,7 +13,7 @@
                                   CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
                                   Content="{TemplateBinding Content}"
                                   Extent="{TemplateBinding Extent, Mode=TwoWay}"
-                                  Margin="{TemplateBinding Padding}"
+                                  Padding="{TemplateBinding Padding}"
                                   Offset="{TemplateBinding Offset, Mode=TwoWay}"
                                   Viewport="{TemplateBinding Viewport, Mode=TwoWay}"
                                   IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}">
diff --git a/src/Avalonia.Themes.Default/Controls/SplitButton.xaml b/src/Avalonia.Themes.Default/Controls/SplitButton.xaml
index ce20a1a165..0c46ce3724 100644
--- a/src/Avalonia.Themes.Default/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Default/Controls/SplitButton.xaml
@@ -16,6 +16,7 @@
     <x:Double x:Key="SplitButtonPrimaryButtonSize">24</x:Double>
     <x:Double x:Key="SplitButtonSecondaryButtonSize">24</x:Double>
     <x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
+    <x:Double x:Key="SplitButtonMinHeight">24</x:Double>
     <Thickness x:Key="SplitButtonBorderThemeThickness">1</Thickness>
 
     <converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True" Indent="1" />
@@ -59,8 +60,11 @@
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource SplitButtonBorderThemeThickness}" />
+    <Setter Property="MinHeight" Value="{DynamicResource SplitButtonMinHeight}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
     <!--<Setter Property="UseSystemFocusVisuals" Value="True" />
     <Setter Property="FocusVisualMargin" Value="-3" />-->
     <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
@@ -146,7 +150,7 @@
          SplitButton /template/ Button#PART_SecondaryButton:pointerover /template/ ContentPresenter">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
   </Style>
   <Style Selector="SplitButton /template/ Button#PART_SecondaryButton:pointerover PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
@@ -157,7 +161,7 @@
          SplitButton /template/ Button#PART_SecondaryButton:pressed /template/ ContentPresenter">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
   </Style>
   <Style Selector="SplitButton /template/ Button#PART_SecondaryButton:pressed PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
@@ -169,7 +173,7 @@
          SplitButton:pressed /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
   </Style>
   <Style Selector="SplitButton:pressed /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
@@ -181,7 +185,7 @@
          SplitButton:flyout-open /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
   </Style>
   <Style Selector="SplitButton:flyout-open /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
@@ -193,7 +197,7 @@
          SplitButton:disabled /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundDisabled}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
   </Style>
   <Style Selector="SplitButton:disabled /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
@@ -205,7 +209,7 @@
          SplitButton:checked /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundChecked}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
   </Style>
   <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
@@ -216,7 +220,7 @@
          SplitButton:checked /template/ Button#PART_SecondaryButton:pointerover /template/ ContentPresenter">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
   </Style>
   <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton:pointerover PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
@@ -227,7 +231,7 @@
          SplitButton:checked /template/ Button#PART_SecondaryButton:pressed /template/ ContentPresenter">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
   </Style>
   <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton:pressed PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
@@ -239,7 +243,7 @@
          SplitButton:pressed:checked /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
   </Style>
   <Style Selector="SplitButton:pressed:checked /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
@@ -251,7 +255,7 @@
          SplitButton:checked:flyout-open /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
   </Style>
   <Style Selector="SplitButton:checked:flyout-open /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
@@ -263,7 +267,7 @@
          SplitButton:checked:disabled /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedDisabled}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
   </Style>
   <Style Selector="SplitButton:checked:disabled /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
diff --git a/src/Avalonia.Themes.Default/Controls/TextBox.xaml b/src/Avalonia.Themes.Default/Controls/TextBox.xaml
index 6e3898a828..1885d3b65b 100644
--- a/src/Avalonia.Themes.Default/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/Controls/TextBox.xaml
@@ -76,6 +76,7 @@
                                     SelectionEnd="{TemplateBinding SelectionEnd}"
                                     TextAlignment="{TemplateBinding TextAlignment}"
                                     TextWrapping="{TemplateBinding TextWrapping}"
+                                    LineHeight="{TemplateBinding LineHeight}"
                                     PasswordChar="{TemplateBinding PasswordChar}"
                                     RevealPassword="{TemplateBinding RevealPassword}"
                                     SelectionBrush="{TemplateBinding SelectionBrush}"
diff --git a/src/Avalonia.Themes.Default/Controls/TimePicker.xaml b/src/Avalonia.Themes.Default/Controls/TimePicker.xaml
index a58fd62a99..0a5147e335 100644
--- a/src/Avalonia.Themes.Default/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Default/Controls/TimePicker.xaml
@@ -48,7 +48,7 @@
                  ContentTemplate="{TemplateBinding HeaderTemplate}"
                  Margin="{DynamicResource TimePickerTopHeaderMargin}"
                  MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
-                 TextBlock.Foreground="{DynamicResource ThemeForegroundColor}"
+                 TextElement.Foreground="{DynamicResource ThemeForegroundColor}"
                  HorizontalAlignment="Stretch"
                  VerticalAlignment="Top" />
 
@@ -74,7 +74,7 @@
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 CornerRadius="{TemplateBinding CornerRadius}"
                                 Content="{TemplateBinding Content}"
-                                TextBlock.Foreground="{TemplateBinding Foreground}"
+                                TextElement.Foreground="{TemplateBinding Foreground}"
                                 HorizontalContentAlignment="Stretch"
                                 VerticalContentAlignment="Stretch" />
               </ControlTemplate>
@@ -135,7 +135,7 @@
   </Style>
 
   <Style Selector="TimePicker:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
   </Style>
   <Style Selector="TimePicker:disabled /template/ Rectangle">
     <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
@@ -144,7 +144,7 @@
   <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}"/>
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
   </Style>
 
   <Style Selector="TimePicker /template/ Button:pressed /template/ ContentPresenter">
@@ -152,13 +152,13 @@
       <SolidColorBrush Color="{DynamicResource ThemeControlMidHighColor}" Opacity="0.6" />
     </Setter>
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlLowBrush}"/>
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
+    <Setter Property="TextElement.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="TextElement.Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}"/>-->
     <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
   </Style>
 
diff --git a/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml
index b14a239c35..17fb2af16c 100644
--- a/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml
@@ -18,7 +18,7 @@
                           Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"
                           RecognizesAccessKey="True"
-                          TextBlock.Foreground="{TemplateBinding Foreground}"
+                          TextElement.Foreground="{TemplateBinding Foreground}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
       </ControlTemplate>
diff --git a/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
index 305f1b1814..2c831cf360 100644
--- a/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
@@ -254,7 +254,7 @@
 
   <Style Selector="ToggleSwitch:disabled /template/ Border#OuterBorder">
     <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}"/>
   </Style>
 
   <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOff">
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 6d2af1de57..468b723f5b 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -3,8 +3,9 @@
         x:Class="Avalonia.Themes.Default.DefaultTheme">
   <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ToolTip.xaml"/>
+  <!-- PathIcon also needs to be defined early so it can be overriden by other styles (e.g. ComboBox) -->
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/PathIcon.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/DataValidationErrors.xaml"/>
-
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/FocusAdorner.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Button.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Carousel.xaml"/>
@@ -13,6 +14,7 @@
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBox.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBoxItem.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ContentControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/DropDownButton.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Label.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/GridSplitter.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ItemsControl.xaml"/>
@@ -22,7 +24,6 @@
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ContextMenu.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/MenuItem.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/PathIcon.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/PopupRoot.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ProgressBar.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/RadioButton.xaml"/>
diff --git a/src/Avalonia.Themes.Default/IBitmapToImageConverter.cs b/src/Avalonia.Themes.Default/IBitmapToImageConverter.cs
new file mode 100644
index 0000000000..9b7fcecf45
--- /dev/null
+++ b/src/Avalonia.Themes.Default/IBitmapToImageConverter.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Data.Converters;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Themes.Default
+{
+    internal class IBitmapToImageConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value != null && value is IBitmap bm)
+                return new Image { Source=bm };
+                
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Avalonia.Themes.Default/SimpleTheme.cs b/src/Avalonia.Themes.Default/SimpleTheme.cs
index 1d9f2d5f9d..664c95644f 100644
--- a/src/Avalonia.Themes.Default/SimpleTheme.cs
+++ b/src/Avalonia.Themes.Default/SimpleTheme.cs
@@ -44,7 +44,7 @@ namespace Avalonia.Themes.Default
             InitStyles(_baseUri);
         }
 
-        public event EventHandler OwnerChanged
+        public event EventHandler? OwnerChanged
         {
             add
             {
@@ -116,7 +116,7 @@ namespace Avalonia.Themes.Default
             return false;
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
             if (change.Property == ModeProperty)
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
index 5b86de02d5..c5bb70bed3 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
@@ -587,9 +587,24 @@
     <StaticResource x:Key="SplitViewLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
   
     <!-- Resources for CalendarDatePicker.xaml -->
-    <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
     <StaticResource x:Key="CalendarDatePickerForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerCalendarGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerCalendarGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerTextForegroundSelected" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundPressed" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundFocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
     <StaticResource x:Key="CalendarDatePickerBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
     <Thickness x:Key="CalendarDatePickerBorderThemeThickness">1</Thickness>
 
     <!-- Resources for FlyoutPresenter.xaml -->
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
index eb68270354..8d38d39bd5 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
@@ -581,9 +581,24 @@
     <StaticResource x:Key="SplitViewLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
   
     <!-- Resources for CalendarDatePicker.xaml -->
-    <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
     <StaticResource x:Key="CalendarDatePickerForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerCalendarGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerCalendarGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerTextForegroundSelected" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundPressed" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerBackgroundFocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
     <StaticResource x:Key="CalendarDatePickerBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="CalendarDatePickerLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
     <Thickness x:Key="CalendarDatePickerBorderThemeThickness">1</Thickness>
 
     <!-- Resources for FlyoutPresenter.xaml -->
diff --git a/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt b/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..fcc74cf864
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt
@@ -0,0 +1 @@
+Total Issues: 0
diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
index 885661536c..35603fe216 100644
--- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
+++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
@@ -3,16 +3,10 @@
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />  
     <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
+    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <AvaloniaResource Include="**/*.xaml" />
     <AvaloniaResource Include="Assets\*" />  
   </ItemGroup>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Button.xaml b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
index 533fabfb44..3fb0d43342 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Button.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
@@ -4,12 +4,14 @@
       <StackPanel Spacing="20">
         <Button Content="Click Me!" />
         <Button Classes="accent" Content="Click Me!" />
-      </StackPanel>      
+      </StackPanel>
     </Border>
   </Design.PreviewWith>
+
   <Styles.Resources>
     <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
   </Styles.Resources>
+  
   <Style Selector="Button">
     <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
     <!--<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />-->
@@ -19,9 +21,7 @@
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />    
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="VerticalAlignment" Value="Center" />
     <!--<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
     <Setter Property="FocusVisualMargin" Value="-3" />-->
     <Setter Property="Template">
@@ -39,46 +39,53 @@
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <!-- PointerOverState -->  
-  <Style Selector="Button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
-  </Style>
-  
-  <Style Selector="Button:pressed  /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
-  </Style>
-  
-  <Style Selector="Button:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
-  </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
+    </Style>
 
-  <Style Selector="Button.accent /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrush}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentButtonForeground}" />
-  </Style>
+    <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
+    </Style>
 
-  <Style Selector="Button.accent: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="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+    </Style>
+
+    <Style Selector="^.accent">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
+      </Style>
 
-  <Style Selector="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 Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundPointerOver}" />
+      </Style>
+
+      <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundPressed}" />
+      </Style>
+
+      <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
+      </Style>
+    </Style>
   </Style>
 
-  <Style Selector="Button, RepeatButton, ToggleButton">
+  <Style Selector="Button, RepeatButton, ToggleButton, DropDownButton">
     <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Transitions">
       <Transitions>
@@ -87,13 +94,8 @@
     </Setter>
   </Style>
 
-  <Style Selector="Button:pressed, RepeatButton:pressed, ToggleButton:pressed">
+  <Style Selector="Button:pressed, RepeatButton:pressed, ToggleButton:pressed, DropDownButton: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>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index ffd3972b66..c6f70d05e1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -1,10 +1,3 @@
-<!--
-// (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"
@@ -18,131 +11,172 @@
   </Design.PreviewWith>
 
   <Styles.Resources>
-    <sys:Double x:Key="CalendarDatePickerCurrentDayFontSize">12</sys:Double>
+    <x:Double x:Key="CalendarDatePickerCurrentDayFontSize">12</x:Double>
+    <x:Double x:Key="CalendarDatePickerMinHeight">32</x: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="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerMinHeight}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="Padding" Value="4"/>
-    
     <Setter Property="Template">
       <ControlTemplate>
         <DataValidationErrors>
-        <Grid ColumnDefinitions="*,Auto">
+          <Panel x:Name="LayoutRoot"
+                 HorizontalAlignment="Stretch"
+                 VerticalAlignment="Stretch">
+            <Border x:Name="Background"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    Background="{TemplateBinding Background}" />
+            <Grid ColumnDefinitions="*,Auto">
+              <TextBox Name="PART_TextBox"
+                       Foreground="{TemplateBinding Foreground}"
+                       Background="Transparent"
+                       BorderBrush="Transparent"
+                       BorderThickness="0"
+                       CornerRadius="{TemplateBinding CornerRadius}"
+                       Margin="{TemplateBinding BorderThickness}"
+                       Padding="{TemplateBinding Padding}"
+                       Watermark="{TemplateBinding Watermark}"
+                       UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                       Grid.Column="0" />
+              <Button Name="PART_Button"
+                      Grid.Column="1"
+                      Focusable="False" />
+              <Popup Name="PART_Popup"
+                     PlacementTarget="{TemplateBinding}"
+                     IsLightDismissEnabled="True">
+                <Calendar Name="PART_Calendar"
+                          FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
+                          IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
+                          SelectedDate="{TemplateBinding SelectedDate, Mode=TwoWay}"
+                          DisplayDate="{TemplateBinding DisplayDate}"
+                          DisplayDateStart="{TemplateBinding DisplayDateStart}"
+                          DisplayDateEnd="{TemplateBinding DisplayDateEnd}" />
+              </Popup>
+            </Grid>
+          </Panel>
+        </DataValidationErrors>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <!-- Normal State -->
+  <Style Selector="CalendarDatePicker /template/ Button#PART_Button">
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForeground}" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Margin" Value="2,0,4,0" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="Width" Value="20" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid Height="24"
+              Width="20"
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center"
+              Margin="0"
+              ColumnDefinitions="*,*,*,*"
+              RowDefinitions="23*,19*,19*,19*"
+              ClipToBounds="False">
+          <Border Name="Background"
+                  Margin="0,-1,0,0"
+                  Grid.ColumnSpan="4"
+                  Grid.Row="1"
+                  Grid.RowSpan="3"
+                  BorderThickness="0.5,0,0.5,0.5"
+                  BorderBrush="{TemplateBinding Foreground}"
+                  CornerRadius="0,0,2,2" />
+          <Border Grid.ColumnSpan="4"
+                  Grid.RowSpan="1"
+                  BorderBrush="{TemplateBinding Foreground}"
+                  BorderThickness="0.5"
+                  CornerRadius="2,2,0,0" />
+          <TextBlock Margin="0,-1,0,0"
+                     VerticalAlignment="Center"
+                     HorizontalAlignment="Center"
+                     Grid.Column="0"
+                     Grid.Row="1"
+                     Grid.ColumnSpan="4"
+                     Grid.RowSpan="3"
+                     Foreground="{TemplateBinding Foreground}"
+                     FontSize="{DynamicResource CalendarDatePickerCurrentDayFontSize}"
+                     Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}" />
+          <Ellipse HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   Fill="{TemplateBinding Foreground}"
+                   StrokeThickness="0"
+                   Grid.ColumnSpan="4"
+                   Width="3"
+                   Height="3" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
 
-          <Grid.Styles>
+  <!-- Pressed State -->
+  <Style Selector="CalendarDatePicker:pressed /template/ Border#Background">
+    <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPressed}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPressed}" />
+  </Style>
 
-            <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">
+  <!-- Pointer-over State -->
+  <Style Selector="CalendarDatePicker:pointerover /template/ Border#Background">
+    <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPointerOver}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPointerOver}" />
+  </Style>
 
-                    <Border Name="Highlight"
-                            Margin="-1"
-                            Grid.ColumnSpan="4"
-                            Grid.Row="0"
-                            Grid.RowSpan="4"
-                            BorderThickness="1"
-                            BorderBrush="{DynamicResource SystemAccentColor}" />
-                    <Border Name="Background"
-                            Margin="0,-1,0,0"
-                            Grid.ColumnSpan="4"
-                            Grid.Row="1"
-                            Grid.RowSpan="3"
-                            BorderThickness="1"
-                            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumBrush}"
-                            CornerRadius=".5" />
-                    <Rectangle Grid.ColumnSpan="4"
-                               Grid.RowSpan="1"
-                               StrokeThickness="1"
-                               Stroke="{DynamicResource SystemControlForegroundBaseMediumBrush}"
-                               Fill="{DynamicResource SystemAccentColor}">
-                    </Rectangle>
-                    <TextBlock Margin="0,-1,0,0"
-                               VerticalAlignment="Center"
-                               HorizontalAlignment="Center"
-                               Grid.Column="0"
-                               Grid.Row="1"
-                               Grid.ColumnSpan="4"
-                               Grid.RowSpan="3"
-                               FontSize="{DynamicResource CalendarDatePickerCurrentDayFontSize}"
-                               Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}"/>
+  <!-- Disabled State -->
+  <Style Selector="CalendarDatePicker:disabled /template/ Border#Background">
+    <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundDisabled}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushDisabled}" />
+  </Style>
 
-                    <Ellipse HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{DynamicResource SystemControlBackgroundChromeBlackHighBrush}" StrokeThickness="0" Grid.ColumnSpan="4" Width="3" Height="3"/>
-                  </Grid>
-                </ControlTemplate>
-              </Setter>
-            </Style>
+  <Style Selector="CalendarDatePicker:disabled /template/ Button#PART_Button">
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundDisabled}" />
+  </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="CalendarDatePicker:disabled /template/ TextBox#PART_TextBox:disabled /template/ Border#PART_BorderElement">
+    <!-- By default the TextBox has its own disabled state, override this to make the border background show through -->
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+  </Style>
 
-            <Style Selector="Button.CalendarDropDown:pointerover /template/ Border#Background">
-              <Setter Property="Background" Value="{DynamicResource SystemAccentColorDark2}"/>
-            </Style>
-            
-          </Grid.Styles>
-          
-          <TextBox Name="PART_TextBox"
-                   Background="{TemplateBinding Background}" 
-                   BorderBrush="{TemplateBinding BorderBrush}" 
-                   BorderThickness="{TemplateBinding BorderThickness}" 
-                   CornerRadius="{TemplateBinding CornerRadius}"
-                   Padding="{TemplateBinding Padding}"
-                   Watermark="{TemplateBinding Watermark}"
-                   UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
-                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                   Grid.Column="0"/>
+  <Style Selector="CalendarDatePicker:disabled /template/ TextBox#PART_TextBox:disabled /template/ TextBlock#PART_Watermark,
+                   CalendarDatePicker:disabled /template/ TextBox#PART_TextBox:disabled /template/ TextBlock#PART_FloatingWatermark">
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundDisabled}" />
+  </Style>
 
-          <Button Name="PART_Button"
-                  Grid.Column="1"
-                  Width="20"
-                  Classes="CalendarDropDown"
-                  Foreground="{TemplateBinding Foreground}"
-                  Background="Transparent"
-                  BorderThickness="0"
-                  Margin="2,0,2,0"
-                  Padding="0"
-                  ClipToBounds="False"
-                  Focusable="False"/>
+  <!-- Focused State -->
+  <Style Selector="CalendarDatePicker:focus-within:not(CalendarDatePicker:focus) /template/ Border#Background">
+    <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}"/>
+    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
+  </Style>
 
-          <Popup Name="PART_Popup"
-                 PlacementTarget="{TemplateBinding}"
-                 IsLightDismissEnabled="True">
-            <Calendar Name="PART_Calendar"
-                      FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
-                      IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
-                      SelectedDate="{TemplateBinding SelectedDate, Mode=TwoWay}"
-                      DisplayDate="{TemplateBinding DisplayDate}"
-                      DisplayDateStart="{TemplateBinding DisplayDateStart}"
-                      DisplayDateEnd="{TemplateBinding DisplayDateEnd}" />
-          </Popup>
-        </Grid>
-        </DataValidationErrors>
-      </ControlTemplate>
-    </Setter>
+  <Style Selector="CalendarDatePicker /template/ TextBox#PART_TextBox:focus /template/ Border#PART_BorderElement">
+    <!-- By default the TextBox has its own focused state, override this to disable it here -->
+    <Setter Property="Background" Value="Transparent"/>
+    <Setter Property="BorderBrush" Value="Transparent"/>
+    <Setter Property="BorderThickness" Value="0" />
   </Style>
-  
-  <Style Selector="CalendarDatePicker:error TextBox /template/ Border#PART_BorderElement">
+
+  <!-- Error State -->
+  <Style Selector="CalendarDatePicker:error /template/ Border#Background">
     <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
   </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
index a9c8281cf0..e8e2df03b4 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
@@ -61,17 +61,17 @@
             </Style>
             <Style Selector="Button.CalendarHeader:pointerover /template/ ContentPresenter#Text">
               <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
-              <Setter Property="TextBlock.Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}"/>
+              <Setter Property="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}"/>
+              <Setter Property="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}"/>
+              <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}"/>
             </Style>
           </Border.Styles>
           <!--  To keep calendar from resizing when switching DisplayMode
diff --git a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
index 82cdc4135d..62874f4884 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
@@ -3,7 +3,7 @@
     <Setter Property="MaxHeight" Value="30" />
     <Setter Property="Template">
       <ControlTemplate>
-        <StackPanel Spacing="2" VerticalAlignment="Stretch" TextBlock.FontSize="10" Orientation="Horizontal">
+        <StackPanel Spacing="2" VerticalAlignment="Stretch" TextElement.FontSize="10" Orientation="Horizontal">
           <StackPanel.Styles>
             <Style Selector="Panel">
               <Setter Property="Width" Value="45" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
index ef28593711..e9830fb228 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
@@ -1,293 +1,297 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Style xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       Selector="CheckBox">
   <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="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="MinHeight" Value="32" />
-    <!--<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-    <Setter Property="FocusVisualMargin" Value="-7,-3,-7,-3" />-->
-    <Setter Property="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}"
-                  CornerRadius="{TemplateBinding CornerRadius}" />
-
-          <Grid VerticalAlignment="Top" Height="32">
-            <Border x:Name="NormalRectangle"
-                BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                UseLayoutRounding="False"
-                Height="20"
-                Width="20" />
-
-            <Viewbox UseLayoutRounding="False">
-              <Panel>
-                <Panel Height="16" Width="16" />
-                <Path x:Name="CheckGlyph" Stretch="Uniform" VerticalAlignment="Center" />
-              </Panel>
-            </Viewbox>
-          </Grid>
-          <ContentPresenter x:Name="ContentPresenter"
-                         ContentTemplate="{TemplateBinding ContentTemplate}"
-                         Content="{TemplateBinding Content}"
-                         Margin="{TemplateBinding Padding}"
-                         RecognizesAccessKey="True"
-                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                         Grid.Column="1" />
-          <!-- TODO: TextWrapping="Wrap" on contentpresenter -->
+  
+  <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="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  <Setter Property="MinHeight" Value="32" />
+  <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUnchecked}" />
+  <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUnchecked}" />
+  <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUnchecked}" />
+  <Setter Property="Template">
+    <ControlTemplate>
+      <Grid x:Name="RootGrid" ColumnDefinitions="20,*">
+        <Border x:Name="PART_Border"
+                Grid.ColumnSpan="2"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}" />
+
+        <Grid VerticalAlignment="Top" Height="32">
+          <Border x:Name="NormalRectangle"
+              BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}"
+              UseLayoutRounding="False"
+              Height="20"
+              Width="20" />
+
+          <Viewbox UseLayoutRounding="False">
+            <Panel>
+              <Panel Height="16" Width="16" />
+              <Path x:Name="CheckGlyph" Stretch="Uniform" VerticalAlignment="Center" />
+            </Panel>
+          </Viewbox>
         </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+        <ContentPresenter x:Name="ContentPresenter"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        Content="{TemplateBinding Content}"
+                        Margin="{TemplateBinding Padding}"
+                        RecognizesAccessKey="True"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                        Grid.Column="1" />
+        <!-- TODO: TextWrapping="Wrap" on contentpresenter -->
+      </Grid>
+    </ControlTemplate>
+  </Setter>
 
   <!-- 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">
+  <Style Selector="^ /template/ Border#NormalRectangle">
     <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}" />
     <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}" />
   </Style>
 
-  <Style Selector="CheckBox /template/ Path#CheckGlyph">
+  <Style Selector="^ /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="^:pointerover">
+    <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+      <Setter Property="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="^ /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="^ /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 Selector="^ /template/ Path#CheckGlyph">
+      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
+    </Style>
   </Style>
 
   <!-- Unchecked Pressed State -->
-  <Style Selector="CheckBox:pressed /template/ ContentPresenter#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
-  </Style>
+  <Style Selector="^:pressed">
+    <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+      <Setter Property="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="^ /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="^ /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 Selector="^ /template/ Path#CheckGlyph">
+      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
+    </Style>
   </Style>
 
   <!-- Unchecked Disabled state -->
-  <Style Selector="CheckBox:disabled /template/ ContentPresenter#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
-  </Style>
+  <Style Selector="^:disabled">
+    <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+      <Setter Property="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="^ /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="^ /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 Selector="^ /template/ Path#CheckGlyph">
+      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
+    </Style>
   </Style>
 
-
-  <!-- Checked Normal State -->
-  <Style Selector="CheckBox:checked">
+  <Style Selector="^:checked">
+    <!-- Checked Normal State -->
     <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">
+    <Style Selector="^ /template/ Border#NormalRectangle">
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
+      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
+    </Style>
+
+    <Style Selector="^ /template/ Path#CheckGlyph">
+      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundChecked}" />
+      <Setter Property="Data" Value="M1507 31L438 1101L-119 543L-29 453L438 919L1417 -59L1507 31Z" />
+      <Setter Property="Width" Value="9" />
+      <Setter Property="Opacity" Value="1" />
+      <Setter Property="FlowDirection" Value="LeftToRight" />
+    </Style>
+
+    <!-- Checked PointerOver State -->
+    <Style Selector="^:pointerover">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
+      </Style>
+    </Style>
+
+    <!-- Checked Pressed State -->
+    <Style Selector="^:pressed">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
+      </Style>
+    </Style>
+
+    <!-- Checked Disabled State -->
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
+      </Style>
+    </Style>
+  </Style>
+
+  <Style Selector="^:indeterminate">
+    <!-- Indeterminate Normal State -->
     <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminate}" />
-  </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>
+    <Style Selector="^ /template/ Border#NormalRectangle">
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminate}" />
+      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminate}" />
+    </Style>
+
+    <Style Selector="^ /template/ Path#CheckGlyph">
+      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminate}" />
+      <Setter Property="Data" Value="M1536 1536v-1024h-1024v1024h1024z" />
+      <Setter Property="Width" Value="7" />
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <!-- Indeterminate PointerOver State -->
+    <Style Selector="^:pointerover">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
+      </Style>
+    </Style>
+
+    <!-- Indeterminate Pressed State -->
+    <Style Selector="^:pressed">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
+      </Style>
+    </Style>
+
+    <!-- Indeterminate Disabled State -->
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
+      </Style>
+    </Style>
+  </Style>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index 857d70084c..93ecc438eb 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -37,6 +37,7 @@
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
     <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="MinHeight" Value="{DynamicResource ComboBoxMinHeight}" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="HorizontalAlignment" Value="Left" />
@@ -53,7 +54,7 @@
                               Grid.Column="0"
                               Grid.ColumnSpan="2"
                               IsVisible="False"
-                              TextBlock.FontWeight="{DynamicResource ComboBoxHeaderThemeFontWeight}"
+                              FontWeight="{DynamicResource ComboBoxHeaderThemeFontWeight}"
                               Margin="{DynamicResource ComboBoxTopHeaderMargin}"
                               VerticalAlignment="Top" />
             <Border x:Name="Background"
@@ -101,30 +102,25 @@
                     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"
+            <PathIcon x:Name="DropDownGlyph"
+                      Grid.Row="1"
+                      Grid.Column="1"
+                      UseLayoutRounding="False"
+                      IsHitTestVisible="False"
+                      Height="12"
+                      Width="12"
+                      Margin="0,0,10,0"
+                      HorizontalAlignment="Right"
                       VerticalAlignment="Center" />
-              </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">
+                   IsLightDismissEnabled="True"
+                   InheritsTransform="True">
               <Border x:Name="PopupBorder"
                       Background="{DynamicResource ComboBoxDropDownBackground}"
                       BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
@@ -159,10 +155,9 @@
     <Setter Property="IsVisible" Value="False" />
   </Style>
 
-  <Style Selector="ComboBox /template/ Path#DropDownGlyph">
-    <Setter Property="Fill" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
+  <Style Selector="ComboBox /template/ PathIcon#DropDownGlyph">
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
     <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
-    <Setter Property="Stretch" Value="Uniform" />
   </Style>
 
   <!--  PointerOver State  -->
@@ -184,19 +179,19 @@
   </Style>
 
   <Style Selector="ComboBox:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
   </Style>
 
   <Style Selector="ComboBox:disabled /template/ ContentControl#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
+    <Setter Property="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 Selector="ComboBox:disabled /template/ PathIcon#DropDownGlyph">
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
   </Style>
 
   <!--  Focused State  -->
@@ -206,28 +201,28 @@
   </Style>
 
   <Style Selector="ComboBox:focus-visible /template/ ContentControl#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
   </Style>
 
   <Style Selector="ComboBox:focus-visible /template/ TextBlock#PlaceholderTextBlock">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
   </Style>
 
-  <Style Selector="ComboBox:focus-visible /template/ Path#DropDownGlyph">
-    <Setter Property="Fill" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" />
+  <Style Selector="ComboBox:focus-visible /template/ PathIcon#DropDownGlyph">
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" />
   </Style>
 
   <!--  Focus Pressed State  -->
   <Style Selector="ComboBox:focused:pressed /template/ ContentControl#ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxForegroundFocusedPressed}" />
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocusedPressed}" />
   </Style>
 
   <Style Selector="ComboBox:focused:pressed /template/ TextBlock#PlaceholderTextBlock">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocusedPressed}" />
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocusedPressed}" />
   </Style>
 
-  <Style Selector="ComboBox:focused:pressed /template/ Path#DropDownGlyph">
-    <Setter Property="Fill" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
+  <Style Selector="ComboBox:focused:pressed /template/ PathIcon#DropDownGlyph">
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
   </Style>
   
   <!-- Error State -->
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
index a958d785fa..0debe87445 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
@@ -18,14 +18,14 @@
   </Design.PreviewWith>
 
   <Style Selector="ComboBoxItem">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxItemForeground}" />
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForeground}" />
     <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackground}" />
     <Setter Property="Padding" Value="{DynamicResource ComboBoxItemThemePadding}" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
-                          TextBlock.Foreground="{TemplateBinding Foreground}"
+                          Foreground="{TemplateBinding Foreground}"
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
@@ -43,48 +43,48 @@
   <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}" />
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPointerOver}" />
   </Style>
 
   <!--  Disabled state  -->
   <Style Selector="ComboBoxItem:disabled /template/ ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundDisabled}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxItemForegroundDisabled}" />
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundDisabled}" />
   </Style>
 
   <!--  Pressed state  -->
   <Style Selector="ComboBoxItem:pressed /template/ ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPressed}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxItemForegroundPressed}" />
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPressed}" />
   </Style>
 
   <!--  Selected state  -->
   <Style Selector="ComboBoxItem:selected /template/ ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelected}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelected}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}" />
+    <Setter Property="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}" />
+    <Setter Property="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}" />
+    <Setter Property="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}" />
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPressed}" />
   </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
index 12e148d2f9..649a186c7e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
@@ -29,7 +29,7 @@
   <Style Selector="DataValidationErrors">
     <Style.Resources>
       <DataTemplate x:Key="InlineDataValidationErrorTemplate">
-        <ItemsControl Items="{Binding}" x:DataType="DataValidationErrors" TextBlock.Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}">
+        <ItemsControl Items="{Binding}" x:DataType="DataValidationErrors" Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}">
           <ItemsControl.Styles>
             <Style Selector="TextBlock">
               <Setter Property="TextWrapping" Value="Wrap" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
index 7ef96ca17b..11d6b9fdfc 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -43,7 +43,7 @@
   </Style>
   <Style Selector="ListBoxItem.DateTimePickerItem:selected /template/ ContentPresenter">
     <Setter Property="Background" Value="Transparent" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
   </Style>
   <Style Selector="ListBoxItem.DateTimePickerItem.MonthItem">
     <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}"/>
@@ -70,7 +70,7 @@
                   BorderBrush="{DynamicResource DateTimePickerFlyoutButtonBorderBrush}"
                   BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
                   Content="{TemplateBinding Content}"
-                  TextBlock.Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
+                  Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
                   ContentTemplate="{TemplateBinding ContentTemplate}"
                   Padding="{TemplateBinding Padding}"
                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -84,13 +84,13 @@
   <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}"/>
+    <Setter Property="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}"/>
+    <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPressed}"/>
   </Style>
 
 
@@ -165,7 +165,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
                                     Content="{TemplateBinding Content}"
-                                    TextBlock.Foreground="{TemplateBinding Foreground}"
+                                    Foreground="{TemplateBinding Foreground}"
                                     HorizontalContentAlignment="Stretch"
                                     VerticalContentAlignment="Stretch"
                                     CornerRadius="{TemplateBinding CornerRadius}"/>
@@ -212,7 +212,7 @@
     </Setter>
   </Style>
   <Style Selector="DatePicker /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource DatePickerHeaderForeground}"/>
+    <Setter Property="Foreground" Value="{DynamicResource DatePickerHeaderForeground}"/>
   </Style>
   <Style Selector="DatePicker:disabled /template/ Rectangle">
     <Setter Property="Fill" Value="{DynamicResource DatePickerSpacerFillDisabled}"/>
@@ -221,19 +221,19 @@
   <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}"/>
+    <Setter Property="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}"/>
+    <Setter Property="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}"/>
+    <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundDisabled}"/>
   </Style>
 
   <!-- Changes foreground for watermark text when SelectedDate is null-->
diff --git a/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
new file mode 100644
index 0000000000..b96c689ab6
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
@@ -0,0 +1,103 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:CompileBindings="True">
+
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <DropDownButton Content="Click Me!" />
+        <DropDownButton Content="Disabled" IsEnabled="False" />
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <Styles.Resources>
+    <x:Double x:Key="DropDownButtonMinHeight">32</x:Double>
+  </Styles.Resources>
+  
+  <Style Selector="DropDownButton">
+    <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
+    <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
+    <Setter Property="MinHeight" Value="{DynamicResource DropDownButtonMinHeight}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <!--<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+    <Setter Property="FocusVisualMargin" Value="-3" />-->
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border x:Name="RootBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  ClipToBounds="True">
+            <Grid x:Name="InnerGrid">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+
+              <ContentPresenter x:Name="PART_ContentPresenter"
+                                Grid.Column="0"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Padding="{TemplateBinding Padding}"
+                                RecognizesAccessKey="True"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+              <PathIcon x:Name="DropDownGlyph"
+                        Grid.Column="1"
+                        UseLayoutRounding="False"
+                        IsHitTestVisible="False"
+                        Height="12"
+                        Width="12"
+                        Margin="0,0,10,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center" />
+
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!--  Normal State  -->
+  <Style Selector="DropDownButton /template/ PathIcon#DropDownGlyph">
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
+    <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
+  </Style>
+
+  <!--  PointerOver State  -->
+  <Style Selector="DropDownButton:pointerover /template/ Border#RootBorder">
+    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
+  </Style>
+
+  <!--  Pressed State  -->
+  <Style Selector="DropDownButton:pressed  /template/ Border#RootBorder">
+    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
+  </Style>
+
+  <!--  Disabled State  -->
+  <Style Selector="DropDownButton:disabled /template/ Border#RootBorder">
+    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+  </Style>
+  <Style Selector="DropDownButton:disabled /template/ PathIcon#DropDownGlyph">
+    <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+  </Style>
+
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
index c5bc7b6a38..33d502772e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
@@ -110,7 +110,7 @@
                               BorderThickness="0"
                               Content="{TemplateBinding Content}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
-                              TextBlock.Foreground="{DynamicResource ExpanderForeground}" />
+                              Foreground="{DynamicResource ExpanderForeground}" />
             <Border x:Name="ExpandCollapseChevronBorder"
                     Grid.Column="1"
                     Width="32"
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 16a6cc9c14..5b217e4764 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -3,6 +3,8 @@
         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"/>
+  <!-- PathIcon also needs to be defined early so it can be overriden by other styles (e.g. ComboBox) -->
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/PathIcon.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"/>
@@ -12,6 +14,7 @@
   <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/DropDownButton.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"/>
@@ -21,7 +24,6 @@
   <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"/>
@@ -59,8 +61,8 @@
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitButton.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitView.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DatePicker.xaml"/>  
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml"/>  
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DatePicker.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml"/>
   <!-- ManagedFileChooser comes last because it uses (and overrides) styles for a multitude of other controls...the dialogs were originally UserControls, after all-->
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
index e41e1b5fde..8011ed9daf 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
@@ -10,7 +10,7 @@
     </Border>
   </Design.PreviewWith>
   <Style Selector="ListBox">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
     <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ListBoxBorderThemeThickness}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
index 14409dda59..11f3c12772 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
@@ -35,13 +35,13 @@
   </Style>
 
   <Style Selector="ListBoxItem /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="TextBlock.FontWeight" Value="Normal" />
-    <Setter Property="TextBlock.FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
   </Style>
 
   <!--  Disabled State  -->
   <Style Selector="ListBoxItem:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
   </Style>
 
   <!--  PointerOver State  -->
@@ -49,7 +49,7 @@
     <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
   </Style>
   <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
   </Style>
 
   <!--  Pressed State  -->
@@ -57,7 +57,7 @@
     <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListMediumBrush}" />
   </Style>
   <Style Selector="ListBoxItem:pressed /template/ ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
   </Style>
 
   <!--  Selected State  -->
@@ -65,7 +65,7 @@
     <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
   </Style>
   <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
   </Style>
 
   <!--  Selected Unfocused State  -->
@@ -73,7 +73,7 @@
     <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
   </Style>
   <Style Selector="ListBoxItem:selected:not(:focus) /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
   </Style>
 
   <!--  Selected PointerOver State  -->
@@ -81,7 +81,7 @@
     <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
   </Style>
   <Style Selector="ListBoxItem:selected:pointerover /template/ ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
   </Style>
 
   <!--  Selected Pressed State  -->
@@ -89,6 +89,6 @@
     <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentHighBrush}" />
   </Style>
   <Style Selector="ListBoxItem:selected:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
   </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index 831537f578..33cf6bfdde 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -218,7 +218,7 @@
     <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
   </Style>
   <Style Selector="MenuItem:selected /template/ ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
+    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
   </Style>
   <Style Selector="MenuItem:selected /template/ TextBlock#PART_InputGestureText">
     <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver}" />
@@ -232,7 +232,7 @@
     <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}" />
+    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPressed}" />
   </Style>
   <Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot:pointerover TextBlock#PART_InputGestureText">
     <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed}" />
@@ -245,7 +245,7 @@
     <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundDisabled}" />
   </Style>
   <Style Selector="MenuItem:disabled /template/ ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource MenuFlyoutItemForegroundDisabled}" />
+    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundDisabled}" />
   </Style>
   <Style Selector="MenuItem:disabled /template/ TextBlock#PART_InputGestureText">
     <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
index 243095c004..d40ba0cc1d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
@@ -4,21 +4,24 @@
        x:CompileBindings="True"
        Selector="NativeMenuBar">
   <Style.Resources>
-    <local:InverseBooleanValueConverter x:Key="AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter" Default="True"/>
+    <local:InverseBooleanValueConverter x:Key="AvaloniaThemesFluentNativeMenuBarInverseBooleanValueConverter" Default="True"/>
+    <local:IBitmapToImageConverter x:Key="AvaloniaThemesFluentNativeMenuBarIBitmapToImageConverter"/>
   </Style.Resources>
   <Setter Property="Template">
     <ControlTemplate>
       <Menu
-        IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter}}"
+        IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesFluentNativeMenuBarInverseBooleanValueConverter}}"
         Items="{Binding $parent[TopLevel].(NativeMenu.Menu).Items}">
         <Menu.Styles>
-          <Style x:DataType="NativeMenuItem" Selector="MenuItem">
+          <Style x:CompileBindings="False" 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"/>
+            <!--NativeMenuItem is IBitmap and MenuItem is Image-->
+            <Setter Property="Icon" Value="{Binding Icon , Converter={StaticResource AvaloniaThemesFluentNativeMenuBarIBitmapToImageConverter}}"/>
           </Style>
         </Menu.Styles>
       </Menu>
diff --git a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
index 5d9d04d218..31b43c39cd 100644
--- a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
@@ -6,13 +6,15 @@
   <Setter Property="FontStyle" Value="Normal" />
   <Setter Property="Template">
     <ControlTemplate>
-      <VisualLayerManager IsPopup="True">
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"/>
-      </VisualLayerManager>
+      <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+        <VisualLayerManager IsPopup="True">
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}"/>
+        </VisualLayerManager>
+      </LayoutTransformControl>
     </ControlTemplate>
   </Setter>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
index 1e573913b9..f608cf55f5 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
@@ -10,16 +10,18 @@
     <Setter Property="FontStyle" Value="Normal" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Panel>
-          <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-          <VisualLayerManager IsPopup="True">
-            <ContentPresenter Name="PART_ContentPresenter"
+        <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+          <Panel>
+            <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+            <VisualLayerManager IsPopup="True">
+              <ContentPresenter Name="PART_ContentPresenter"
                               Background="{TemplateBinding Background}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
                               Content="{TemplateBinding Content}"
                               Padding="{TemplateBinding Padding}"/>
-          </VisualLayerManager>
-        </Panel>
+            </VisualLayerManager>
+          </Panel>
+        </LayoutTransformControl>
       </ControlTemplate>
     </Setter>
   </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
index 776519a0c7..e967dc8807 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
@@ -49,7 +49,7 @@
             <ContentPresenter Name="PART_ContentPresenter"
                               Content="{TemplateBinding Content}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
-                              TextBlock.Foreground="{TemplateBinding Foreground}"
+                              Foreground="{TemplateBinding Foreground}"
                               Margin="{TemplateBinding Padding}"
                               RecognizesAccessKey="True"
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -81,7 +81,7 @@
 
   <!-- PointerOver State -->
   <Style Selector="RadioButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="(TextBlock.Foreground)" Value="{DynamicResource RadioButtonForegroundPointerOver}" />
+    <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundPointerOver}" />
   </Style>
 
   <Style Selector="RadioButton:pointerover /template/ Border#RootBorder">
@@ -107,7 +107,7 @@
 
   <!-- Pressed State -->
   <Style Selector="RadioButton:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="(TextBlock.Foreground)" Value="{DynamicResource RadioButtonForegroundPressed}" />
+    <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundPressed}" />
   </Style>
 
   <Style Selector="RadioButton:pressed /template/ Border#RootBorder">
@@ -133,7 +133,7 @@
 
   <!-- Disabled State -->
   <Style Selector="RadioButton:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="(TextBlock.Foreground)" Value="{DynamicResource RadioButtonForegroundDisabled}" />
+    <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundDisabled}" />
   </Style>
 
   <Style Selector="RadioButton:disabled /template/ Border#RootBorder">
diff --git a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
index 6f96a1eb42..7fa515d3f7 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
@@ -46,18 +46,18 @@
   <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}" />
+    <Setter Property="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}" />
+    <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundPressed}" />
   </Style>
 
   <Style Selector="RepeatButton:disabled /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundDisabled}" />
     <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
+    <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
   </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
index 53a1b721d1..b7addcb61e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
@@ -32,7 +32,7 @@
                                   CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
                                   Content="{TemplateBinding Content}"
                                   Extent="{TemplateBinding Extent, Mode=TwoWay}"
-                                  Margin="{TemplateBinding Padding}"
+                                  Padding="{TemplateBinding Padding}"
                                   Offset="{TemplateBinding Offset, Mode=TwoWay}"
                                   Viewport="{TemplateBinding Viewport, Mode=TwoWay}"
                                   IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}">
diff --git a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
index 5ee2dc527f..cd2c02c567 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
@@ -45,7 +45,7 @@
         <DataValidationErrors>
           <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{TemplateBinding CornerRadius}">
             <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}"
+              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextElement.Foreground="{DynamicResource SliderHeaderForeground}"
               Margin="{DynamicResource SliderTopHeaderMargin}" />
               <Grid x:Name="SliderContainer" Grid.Row="1">
                 <Grid.Styles>
@@ -107,7 +107,7 @@
         <DataValidationErrors>
           <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{TemplateBinding CornerRadius}">
             <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}"
+              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextElement.Foreground="{DynamicResource SliderHeaderForeground}"
               Margin="{DynamicResource SliderTopHeaderMargin}" />
               <Grid x:Name="SliderContainer" Grid.Row="1">
                 <Grid.Styles>
@@ -208,7 +208,7 @@
   <!-- Disabled State -->
 
   <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
+    <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
   </Style>
   
   <Style Selector="Slider:disabled /template/ RepeatButton#PART_DecreaseButton">
diff --git a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
index e0dd0180b3..91c901f567 100644
--- a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
@@ -24,6 +24,7 @@
     <x:Double x:Key="SplitButtonPrimaryButtonSize">32</x:Double>
     <x:Double x:Key="SplitButtonSecondaryButtonSize">32</x:Double>
     <x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
+    <x:Double x:Key="SplitButtonMinHeight">32</x:Double>
 
     <converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True" Indent="1" />
     <converters:MarginMultiplierConverter x:Key="SecondaryButtonBorderMultiplier" Right="True" Top="True" Bottom="True" Indent="1" />
@@ -35,8 +36,11 @@
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource SplitButtonBorderThemeThickness}" />
+    <Setter Property="MinHeight" Value="{DynamicResource SplitButtonMinHeight}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
     <!--<Setter Property="UseSystemFocusVisuals" Value="True" />
     <Setter Property="FocusVisualMargin" Value="-3" />-->
     <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
@@ -122,7 +126,7 @@
          SplitButton /template/ Button#PART_SecondaryButton:pointerover /template/ ContentPresenter">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
+    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
   </Style>
   <Style Selector="SplitButton /template/ Button#PART_SecondaryButton:pointerover PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
@@ -133,7 +137,7 @@
          SplitButton /template/ Button#PART_SecondaryButton:pressed /template/ ContentPresenter">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
   </Style>
   <Style Selector="SplitButton /template/ Button#PART_SecondaryButton:pressed PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
@@ -145,7 +149,7 @@
          SplitButton:pressed /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
   </Style>
   <Style Selector="SplitButton:pressed /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
@@ -157,7 +161,7 @@
          SplitButton:flyout-open /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
   </Style>
   <Style Selector="SplitButton:flyout-open /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
@@ -169,7 +173,7 @@
          SplitButton:disabled /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundDisabled}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
   </Style>
   <Style Selector="SplitButton:disabled /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
@@ -181,7 +185,7 @@
          SplitButton:checked /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundChecked}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
   </Style>
   <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
@@ -192,7 +196,7 @@
          SplitButton:checked /template/ Button#PART_SecondaryButton:pointerover /template/ ContentPresenter">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
   </Style>
   <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton:pointerover PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
@@ -203,7 +207,7 @@
          SplitButton:checked /template/ Button#PART_SecondaryButton:pressed /template/ ContentPresenter">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
   </Style>
   <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton:pressed PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
@@ -215,7 +219,7 @@
          SplitButton:pressed:checked /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
   </Style>
   <Style Selector="SplitButton:pressed:checked /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
@@ -227,7 +231,7 @@
          SplitButton:checked:flyout-open /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
   </Style>
   <Style Selector="SplitButton:checked:flyout-open /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
@@ -239,7 +243,7 @@
          SplitButton:checked:disabled /template/ Border#SeparatorBorder">
     <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedDisabled}" />
     <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
   </Style>
   <Style Selector="SplitButton:checked:disabled /template/ Button#PART_SecondaryButton PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
index 83411b425b..ebe6f82917 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
@@ -37,9 +37,9 @@
                               Content="{TemplateBinding Header}"
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              TextBlock.FontFamily="{TemplateBinding FontFamily}"
-                              TextBlock.FontSize="{TemplateBinding FontSize}"
-                              TextBlock.FontWeight="{TemplateBinding FontWeight}" />
+                              FontFamily="{TemplateBinding FontFamily}"
+                              FontSize="{TemplateBinding FontSize}"
+                              FontWeight="{TemplateBinding FontWeight}" />
             <Border Name="PART_SelectedPipe"
                     Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
           </Panel>
@@ -61,7 +61,7 @@
   <!--  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}" />
+    <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
   </Style>
   <Style Selector="TabItem:selected /template/ Border#PART_SelectedPipe">
     <Setter Property="IsVisible" Value="True" />
@@ -70,31 +70,31 @@
   <!-- PointerOver state -->
   <Style Selector="TabItem:pointerover /template/ Border#PART_LayoutRoot">
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
   </Style>
 
   <!-- Selected PointerOver state -->
   <Style Selector="TabItem:selected:pointerover /template/ Border#PART_LayoutRoot">
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
   </Style>
 
   <!-- Pressed state -->
   <Style Selector="TabItem:pressed /template/ Border#PART_LayoutRoot">
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
   </Style>
 
   <!-- Selected Pressed state -->
   <Style Selector="TabItem:selected:pressed /template/ Border#PART_LayoutRoot">
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
   </Style>
 
   <!-- Disabled state -->
   <Style Selector="TabItem:disabled /template/ Border#PART_LayoutRoot">
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
   </Style>
 
   <!-- TabStripPlacement States Group -->
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
index 694e9ef579..59f68a1547 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
@@ -36,9 +36,9 @@
                               Content="{TemplateBinding Content}"
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              TextBlock.FontFamily="{TemplateBinding FontFamily}"
-                              TextBlock.FontSize="{TemplateBinding FontSize}"
-                              TextBlock.FontWeight="{TemplateBinding FontWeight}" />
+                              FontFamily="{TemplateBinding FontFamily}"
+                              FontSize="{TemplateBinding FontSize}"
+                              FontWeight="{TemplateBinding FontWeight}" />
             <Border Name="PART_SelectedPipe"
                     Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
           </Panel>
@@ -69,7 +69,7 @@
   <!--  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}" />
+    <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
   </Style>
   <Style Selector="TabStripItem:selected /template/ Border#PART_SelectedPipe">
     <Setter Property="IsVisible" Value="True" />
@@ -78,30 +78,30 @@
   <!--  PointerOver state  -->
   <Style Selector="TabStripItem:pointerover /template/ Border#PART_LayoutRoot">
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
   </Style>
 
   <!--  Selected PointerOver state  -->
   <Style Selector="TabStripItem:selected:pointerover /template/ Border#PART_LayoutRoot">
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
   </Style>
 
   <!--  Pressed state  -->
   <Style Selector="TabStripItem:pressed /template/ Border#PART_LayoutRoot">
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
   </Style>
 
   <!--  Selected Pressed state  -->
   <Style Selector="TabStripItem:selected:pressed /template/ Border#PART_LayoutRoot">
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
   </Style>
 
   <!--  Disabled state  -->
   <Style Selector="TabStripItem:disabled /template/ Border#PART_LayoutRoot">
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
   </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index e5b524beeb..40d9b11f7c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -1,4 +1,6 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:CompileBindings="True">
   <Design.PreviewWith>
     <Border Padding="20">
       <TextBox Text="Sample"
@@ -87,6 +89,7 @@
                                       SelectionEnd="{TemplateBinding SelectionEnd}"
                                       TextAlignment="{TemplateBinding TextAlignment}"
                                       TextWrapping="{TemplateBinding TextWrapping}"
+                                      LineHeight="{TemplateBinding LineHeight}"
                                       PasswordChar="{TemplateBinding PasswordChar}"
                                       RevealPassword="{TemplateBinding RevealPassword}"
                                       SelectionBrush="{TemplateBinding SelectionBrush}"
@@ -121,7 +124,7 @@
   </Style>
 
   <!-- PointerOver State-->
-  <Style Selector="TextBox:disabled">
+  <Style Selector="TextBox:pointerover">
     <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundPointerOver}" />
   </Style>
 
@@ -168,7 +171,7 @@
     <Setter Property="InnerRightContent">
       <Template>
         <ToggleButton Classes="passwordBoxRevealButton"
-                      IsChecked="{CompiledBinding $parent[TextBox].RevealPassword, Mode=TwoWay}" />
+                      IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}" />
       </Template>
     </Setter>
   </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
index 9aa73fc52e..e03dc76f16 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -51,7 +51,7 @@
                    ContentTemplate="{TemplateBinding HeaderTemplate}"
                    Margin="{DynamicResource TimePickerTopHeaderMargin}"
                    MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
-                   TextBlock.Foreground="{DynamicResource TimePickerHeaderForeground}"
+                   Foreground="{DynamicResource TimePickerHeaderForeground}"
                    HorizontalAlignment="Stretch"
                    VerticalAlignment="Top" />
 
@@ -77,7 +77,7 @@
                                   BorderThickness="{TemplateBinding BorderThickness}"
                                   CornerRadius="{TemplateBinding CornerRadius}"
                                   Content="{TemplateBinding Content}"
-                                  TextBlock.Foreground="{TemplateBinding Foreground}"
+                                  Foreground="{TemplateBinding Foreground}"
                                   HorizontalContentAlignment="Stretch"
                                   VerticalContentAlignment="Stretch" />
                 </ControlTemplate>
@@ -139,7 +139,7 @@
   </Style>
 
   <Style Selector="TimePicker:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TimePickerHeaderForegroundDisabled}"/>
+    <Setter Property="Foreground" Value="{DynamicResource TimePickerHeaderForegroundDisabled}"/>
   </Style>
   <Style Selector="TimePicker:disabled /template/ Rectangle">
     <Setter Property="Fill" Value="{DynamicResource TimePickerSpacerFillDisabled}"/>
@@ -148,19 +148,19 @@
   <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}"/>
+    <Setter Property="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}"/>
+    <Setter Property="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}"/>
+    <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}"/>
   </Style>
 
   <Style Selector="TimePicker:hasnotime /template/ Button#FlyoutButton TextBlock">
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
index 5ad2b3a6a7..e0d54d7232 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
@@ -48,66 +48,66 @@
   <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}" />
+    <Setter Property="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}" />
+    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPressed}" />
   </Style>
 
   <Style Selector="ToggleButton:disabled /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundDisabled}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushDisabled}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundDisabled}" />
+    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundDisabled}" />
   </Style>
 
   <Style Selector="ToggleButton:checked /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundChecked}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushChecked}" />
-    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForegroundChecked}" />
+    <Setter Property="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}" />
+    <Setter Property="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}" />
+    <Setter Property="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}" />
+    <Setter Property="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}" />
+    <Setter Property="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}" />
+    <Setter Property="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}" />
+    <Setter Property="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}" />
+    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminateDisabled}" />
   </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
index a9e6569158..a2b50a859d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
@@ -220,7 +220,7 @@
 
   <Style Selector="ToggleSwitch:disabled /template/ Border#OuterBorder">
     <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}"/>
   </Style>
 
   <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOff">
diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
index e66392113f..f86b67bb6c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
@@ -107,7 +107,7 @@
     <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}" />
+    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundPointerOver}" />
   </Style>
 
   <!--  Pressed state  -->
@@ -116,7 +116,7 @@
     <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}" />
+    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundPressed}" />
   </Style>
 
   <!--  Disabled state  -->
@@ -125,7 +125,7 @@
     <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}" />
+    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundDisabled}" />
   </Style>
 
   <!--  Selected state  -->
@@ -134,7 +134,7 @@
     <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}" />
+    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelected}" />
   </Style>
 
   <!--  Selected PointerOver state  -->
@@ -143,7 +143,7 @@
     <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}" />
+    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedPointerOver}" />
   </Style>
 
   <!--  Selected Pressed state  -->
@@ -152,7 +152,7 @@
     <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}" />
+    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedPressed}" />
   </Style>
 
   <!--  Disabled Selected state  -->
@@ -161,7 +161,7 @@
     <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}" />
+    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedDisabled}" />
   </Style>
 
   <!--  ExpandCollapseChevron Group states  -->
diff --git a/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
index 2ff5284d0d..8d14c2d972 100644
--- a/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
@@ -9,7 +9,7 @@
         <ReversibleStackPanel Name="PART_Items">
           <ReversibleStackPanel.DataTemplates>
             <DataTemplate DataType="INotification">
-              <StackPanel Spacing="8" Margin="12" TextBlock.Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}">
+              <StackPanel Spacing="8" Margin="12" TextElement.Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}">
                 <TextBlock Text="{Binding Title}" FontWeight="Medium" />
                 <TextBlock MaxHeight="80" Text="{Binding Message}" TextWrapping="Wrap" Margin="0,0,12,0"/>
               </StackPanel>
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.cs b/src/Avalonia.Themes.Fluent/FluentTheme.cs
index d1136d44a4..81601f72a1 100644
--- a/src/Avalonia.Themes.Fluent/FluentTheme.cs
+++ b/src/Avalonia.Themes.Fluent/FluentTheme.cs
@@ -50,7 +50,9 @@ namespace Avalonia.Themes.Fluent
         /// <param name="serviceProvider">The XAML service provider.</param>
         public FluentTheme(IServiceProvider serviceProvider)
         {
-            _baseUri = ((IUriContext)serviceProvider.GetService(typeof(IUriContext))).BaseUri;
+            var ctx  = serviceProvider.GetService(typeof(IUriContext)) as IUriContext
+                 ?? throw new NullReferenceException("Unable retrive UriContext");
+            _baseUri = ctx.BaseUri;
             InitStyles(_baseUri);
         }
 
@@ -78,9 +80,17 @@ namespace Avalonia.Themes.Fluent
             set => SetValue(DensityStyleProperty, value);
         }
         
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
+            
+            if (_loaded is null)
+            {
+                // If style wasn't yet loaded, no need to change children styles,
+                // it will be applied later in Loaded getter.
+                return;
+            }
+            
             if (change.Property == ModeProperty)
             {
                 if (Mode == FluentThemeMode.Dark)
@@ -146,7 +156,7 @@ namespace Avalonia.Themes.Fluent
 
         IReadOnlyList<IStyle> IStyle.Children => _loaded?.Children ?? Array.Empty<IStyle>();
 
-        public event EventHandler OwnerChanged
+        public event EventHandler? OwnerChanged
         {
             add
             {
diff --git a/src/Avalonia.Themes.Fluent/IBitmapToImageConverter.cs b/src/Avalonia.Themes.Fluent/IBitmapToImageConverter.cs
new file mode 100644
index 0000000000..34670882f8
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/IBitmapToImageConverter.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Data.Converters;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Themes.Fluent
+{
+    internal class IBitmapToImageConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value != null && value is IBitmap bm)
+                return new Image { Source=bm };
+                
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs
deleted file mode 100644
index 0979de16d0..0000000000
--- a/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using Avalonia.Data;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-
-#nullable enable
-
-namespace Avalonia.Animation.Animators
-{
-    /// <summary>
-    /// Animator that handles <see cref="SolidColorBrush"/> values. 
-    /// </summary>
-    public class GradientBrushAnimator : Animator<IGradientBrush?>
-    {
-        private static readonly RelativePointAnimator s_relativePointAnimator = new RelativePointAnimator();
-        private static readonly DoubleAnimator s_doubleAnimator = new DoubleAnimator();
-
-        public override IGradientBrush? Interpolate(double progress, IGradientBrush? oldValue, IGradientBrush? newValue)
-        {
-            if (oldValue is null || newValue is null)
-            {
-                return progress >= 0.5 ? newValue : oldValue;
-            }
-
-            switch (oldValue)
-            {
-                case IRadialGradientBrush oldRadial when newValue is IRadialGradientBrush newRadial:
-                    return new ImmutableRadialGradientBrush(
-                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
-                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
-                        oldValue.SpreadMethod,
-                        s_relativePointAnimator.Interpolate(progress, oldRadial.Center, newRadial.Center),
-                        s_relativePointAnimator.Interpolate(progress, oldRadial.GradientOrigin, newRadial.GradientOrigin),
-                        s_doubleAnimator.Interpolate(progress, oldRadial.Radius, newRadial.Radius));
-
-                case IConicGradientBrush oldConic when newValue is IConicGradientBrush newConic:
-                    return new ImmutableConicGradientBrush(
-                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
-                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
-                        oldValue.SpreadMethod,
-                        s_relativePointAnimator.Interpolate(progress, oldConic.Center, newConic.Center),
-                        s_doubleAnimator.Interpolate(progress, oldConic.Angle, newConic.Angle));
-
-                case ILinearGradientBrush oldLinear when newValue is ILinearGradientBrush newLinear:
-                    return new ImmutableLinearGradientBrush(
-                        InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
-                        s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
-                        oldValue.SpreadMethod,
-                        s_relativePointAnimator.Interpolate(progress, oldLinear.StartPoint, newLinear.StartPoint),
-                        s_relativePointAnimator.Interpolate(progress, oldLinear.EndPoint, newLinear.EndPoint));
-
-                default:
-                    return progress >= 0.5 ? newValue : oldValue;
-            }
-        }
-
-        public override IDisposable BindAnimation(Animatable control, IObservable<IGradientBrush?> instance)
-        {
-            if (Property is null)
-            {
-                throw new InvalidOperationException("Animator has no property specified.");
-            }
-
-            return control.Bind((AvaloniaProperty<IBrush?>)Property, instance, BindingPriority.Animation);
-        }
-
-        private IReadOnlyList<ImmutableGradientStop> InterpolateStops(double progress, IReadOnlyList<IGradientStop> oldValue, IReadOnlyList<IGradientStop> newValue)
-        {
-            var resultCount = Math.Max(oldValue.Count, newValue.Count);
-            var stops = new ImmutableGradientStop[resultCount];
-
-            for (int index = 0, oldIndex = 0, newIndex = 0; index < resultCount; index++)
-            {
-                stops[index] = new ImmutableGradientStop(
-                    s_doubleAnimator.Interpolate(progress, oldValue[oldIndex].Offset, newValue[newIndex].Offset),
-                    ColorAnimator.InterpolateCore(progress, oldValue[oldIndex].Color, newValue[newIndex].Color));
-
-                if (oldIndex < oldValue.Count - 1)
-                {
-                    oldIndex++;
-                }
-
-                if (newIndex < newValue.Count - 1)
-                {
-                    newIndex++;
-                }
-            }
-            
-            return stops;
-        }
-
-        internal static IGradientBrush ConvertSolidColorBrushToGradient(IGradientBrush gradientBrush, ISolidColorBrush solidColorBrush)
-        {
-            switch (gradientBrush)
-            {
-                case IRadialGradientBrush oldRadial:
-                    return new ImmutableRadialGradientBrush(
-                        CreateStopsFromSolidColorBrush(solidColorBrush, oldRadial.GradientStops), solidColorBrush.Opacity,
-                        oldRadial.SpreadMethod, oldRadial.Center, oldRadial.GradientOrigin, oldRadial.Radius);
-
-                case IConicGradientBrush oldConic:
-                    return new ImmutableConicGradientBrush(
-                        CreateStopsFromSolidColorBrush(solidColorBrush, oldConic.GradientStops), solidColorBrush.Opacity,
-                        oldConic.SpreadMethod, oldConic.Center, oldConic.Angle);
-
-                case ILinearGradientBrush oldLinear:
-                    return new ImmutableLinearGradientBrush(
-                        CreateStopsFromSolidColorBrush(solidColorBrush, oldLinear.GradientStops), solidColorBrush.Opacity,
-                        oldLinear.SpreadMethod, oldLinear.StartPoint, oldLinear.EndPoint);
-
-                default:
-                    throw new NotSupportedException($"Gradient of type {gradientBrush?.GetType()} is not supported");
-            }
-
-            static IReadOnlyList<ImmutableGradientStop> CreateStopsFromSolidColorBrush(ISolidColorBrush solidColorBrush, IReadOnlyList<IGradientStop> baseStops)
-            {
-                var stops = new ImmutableGradientStop[baseStops.Count];
-                for (int index = 0; index < baseStops.Count; index++)
-                {
-                    stops[index] = new ImmutableGradientStop(baseStops[index].Offset, solidColorBrush.Color);
-                }
-                return stops;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs
deleted file mode 100644
index 34ec8ac503..0000000000
--- a/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.Reactive.Disposables;
-using Avalonia.Logging;
-using Avalonia.Media;
-using Avalonia.Media.Transformation;
-
-namespace Avalonia.Animation.Animators
-{
-    /// <summary>
-    /// Animator that handles <see cref="Transform"/> properties.
-    /// </summary>
-    public class TransformAnimator : Animator<double>
-    {
-        DoubleAnimator? _doubleAnimator;
-
-        /// <inheritdoc/>
-        public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> obsMatch, Action? onComplete)
-        {
-            var ctrl = (Visual)control;
-
-            if (Property is null)
-            {
-                throw new InvalidOperationException("Animator has no property specified.");
-            }
-
-            // Check if the Target Property is Transform derived.
-            if (typeof(Transform).IsAssignableFrom(Property.OwnerType))
-            {
-                if (ctrl.RenderTransform is TransformOperations)
-                {
-                    // HACK: This animator cannot reasonably animate CSS transforms at the moment.
-                    return Disposable.Empty;
-                }
-
-                if (ctrl.RenderTransform == null)
-                {
-                    var normalTransform = new TransformGroup();
-
-                    // Add the transforms according to MS Expression Blend's 
-                    // default RenderTransform order.
-
-                    normalTransform.Children.Add(new ScaleTransform());
-                    normalTransform.Children.Add(new SkewTransform());
-                    normalTransform.Children.Add(new RotateTransform());
-                    normalTransform.Children.Add(new TranslateTransform());
-
-                    ctrl.RenderTransform = normalTransform;
-                }
-
-                var renderTransformType = ctrl.RenderTransform.GetType();
-
-                if (_doubleAnimator == null)
-                {
-                    _doubleAnimator = new DoubleAnimator();
-
-                    foreach (AnimatorKeyFrame keyframe in this)
-                    {
-                        _doubleAnimator.Add(keyframe);
-                    }
-
-                    _doubleAnimator.Property = Property;
-                }
-
-                // It's a transform object so let's target that.
-                if (renderTransformType == Property.OwnerType)
-                {
-                    return _doubleAnimator.Apply(animation, (Transform) ctrl.RenderTransform, clock ?? control.Clock, obsMatch, onComplete);
-                }
-                // It's a TransformGroup and try finding the target there.
-                else if (renderTransformType == typeof(TransformGroup))
-                {
-                    foreach (Transform transform in ((TransformGroup)ctrl.RenderTransform).Children)
-                    {
-                        if (transform.GetType() == Property.OwnerType)
-                        {
-                            return _doubleAnimator.Apply(animation, transform, clock ?? control.Clock, obsMatch, onComplete);
-                        }
-                    }
-                }
-
-                Logger.TryGet(LogEventLevel.Warning, LogArea.Animations)?.Log(
-                    control,
-                    $"Cannot find the appropriate transform: \"{Property.OwnerType}\" in {control}.");
-            }
-            else
-            {
-                Logger.TryGet(LogEventLevel.Error, LogArea.Animations)?.Log(
-                    control,
-                    $"Cannot apply animation: Target property owner {Property.OwnerType} is not a Transform object.");
-            }
-            return null;
-        }
-
-        /// <inheritdocs/> 
-        public override double Interpolate(double p, double o, double n) => 0;
-    }
-}
diff --git a/src/Avalonia.Visuals/Animation/CompositePageTransition.cs b/src/Avalonia.Visuals/Animation/CompositePageTransition.cs
deleted file mode 100644
index 2a6eae3e38..0000000000
--- a/src/Avalonia.Visuals/Animation/CompositePageTransition.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Avalonia.Metadata;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Defines a composite page transition that can be used to combine multiple transitions.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Instantiate the <see cref="CompositePageTransition" /> in XAML and initialize the
-    /// <see cref="Transitions" /> property in order to have many animations triggered at once.
-    /// For example, you can combine <see cref="CrossFade"/> and <see cref="PageSlide"/>.
-    /// <code>
-    /// <![CDATA[
-    /// <reactiveUi:RoutedViewHost Router="{Binding Router}">
-    ///   <reactiveUi:RoutedViewHost.PageTransition>
-    ///     <CompositePageTransition>
-    ///       <PageSlide Duration="0.5" />
-    ///       <CrossFade Duration="0.5" />
-    ///     </CompositePageTransition>
-    ///   </reactiveUi:RoutedViewHost.PageTransition>
-    /// </reactiveUi:RoutedViewHost>
-    /// ]]>
-    /// </code>
-    /// </para>
-    /// </remarks>
-    public class CompositePageTransition : IPageTransition
-    {
-        /// <summary>
-        /// Gets or sets the transitions to be executed. Can be defined from XAML.
-        /// </summary>
-        [Content]
-        public List<IPageTransition> PageTransitions { get; set; } = new List<IPageTransition>();
-
-        /// <inheritdoc />
-        public Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
-        {
-            var transitionTasks = PageTransitions
-                .Select(transition => transition.Start(from, to, forward, cancellationToken))
-                .ToList();
-            return Task.WhenAll(transitionTasks);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Animation/PageSlide.cs b/src/Avalonia.Visuals/Animation/PageSlide.cs
deleted file mode 100644
index 6f5d12d824..0000000000
--- a/src/Avalonia.Visuals/Animation/PageSlide.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Avalonia.Animation.Easings;
-using Avalonia.Media;
-using Avalonia.Styling;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Transitions between two pages by sliding them horizontally.
-    /// </summary>
-    public class PageSlide : IPageTransition
-    {
-        /// <summary>
-        /// The axis on which the PageSlide should occur
-        /// </summary>
-        public enum SlideAxis
-        {
-            Horizontal,
-            Vertical
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PageSlide"/> class.
-        /// </summary>
-        public PageSlide()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PageSlide"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        /// <param name="orientation">The axis on which the animation should occur</param>
-        public PageSlide(TimeSpan duration, SlideAxis orientation = SlideAxis.Horizontal)
-        {
-            Duration = duration;
-            Orientation = orientation;
-        }
-
-        /// <summary>
-        /// Gets the duration of the animation.
-        /// </summary>
-        public TimeSpan Duration { get; set; }
-
-        /// <summary>
-        /// Gets the duration of the animation.
-        /// </summary>
-        public SlideAxis Orientation { get; set; }
-        
-        /// <summary>
-        /// Gets or sets element entrance easing.
-        /// </summary>
-        public Easing SlideInEasing { get; set; } = new LinearEasing();
-        
-        /// <summary>
-        /// Gets or sets element exit easing.
-        /// </summary>
-        public Easing SlideOutEasing { get; set; } = new LinearEasing();
-
-        /// <inheritdoc />
-        public async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return;
-            }
-
-            var tasks = new List<Task>();
-            var parent = GetVisualParent(from, to);
-            var distance = Orientation == SlideAxis.Horizontal ? parent.Bounds.Width : parent.Bounds.Height;
-            var translateProperty = Orientation == SlideAxis.Horizontal ? TranslateTransform.XProperty : TranslateTransform.YProperty;
-
-            if (from != null)
-            {
-                var animation = new Animation
-                {
-                    Easing = SlideOutEasing,
-                    FillMode = FillMode.Forward,
-                    Children =
-                    {
-                        new KeyFrame
-                        {
-                            Setters = { new Setter { Property = translateProperty, Value = 0d } },
-                            Cue = new Cue(0d)
-                        },
-                        new KeyFrame
-                        {
-                            Setters =
-                            {
-                                new Setter
-                                {
-                                    Property = translateProperty,
-                                    Value = forward ? -distance : distance
-                                }
-                            },
-                            Cue = new Cue(1d)
-                        }
-                    },
-                    Duration = Duration
-                };
-                tasks.Add(animation.RunAsync(from, null, cancellationToken));
-            }
-
-            if (to != null)
-            {
-                to.IsVisible = true;
-                var animation = new Animation
-                {
-                    FillMode = FillMode.Forward,
-                    Easing = SlideInEasing,
-                    Children =
-                    {
-                        new KeyFrame
-                        {
-                            Setters =
-                            {
-                                new Setter
-                                {
-                                    Property = translateProperty,
-                                    Value = forward ? distance : -distance
-                                }
-                            },
-                            Cue = new Cue(0d)
-                        },
-                        new KeyFrame
-                        {
-                            Setters = { new Setter { Property = translateProperty, Value = 0d } },
-                            Cue = new Cue(1d)
-                        }
-                    },
-                    Duration = Duration
-                };
-                tasks.Add(animation.RunAsync(to, null, cancellationToken));
-            }
-
-            await Task.WhenAll(tasks);
-
-            if (from != null && !cancellationToken.IsCancellationRequested)
-            {
-                from.IsVisible = false;
-            }
-        }
-
-        /// <summary>
-        /// Gets the common visual parent of the two control.
-        /// </summary>
-        /// <param name="from">The from control.</param>
-        /// <param name="to">The to control.</param>
-        /// <returns>The common parent.</returns>
-        /// <exception cref="ArgumentException">
-        /// The two controls do not share a common parent.
-        /// </exception>
-        /// <remarks>
-        /// Any one of the parameters may be null, but not both.
-        /// </remarks>
-        private static IVisual GetVisualParent(IVisual? from, IVisual? to)
-        {
-            var p1 = (from ?? to)!.VisualParent;
-            var p2 = (to ?? from)!.VisualParent;
-
-            if (p1 != null && p2 != null && p1 != p2)
-            {
-                throw new ArgumentException("Controls for PageSlide must have same parent.");
-            }
-
-            return p1 ?? throw new InvalidOperationException("Cannot determine visual parent.");
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/ApiCompatBaseline.txt b/src/Avalonia.Visuals/ApiCompatBaseline.txt
deleted file mode 100644
index b74b678632..0000000000
--- a/src/Avalonia.Visuals/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,156 +0,0 @@
-Compat issues with assembly Avalonia.Visuals:
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.CompositePageTransition.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.CrossFade.Start(Avalonia.Visual, Avalonia.Visual)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IPageTransition.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.IPageTransition.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IPageTransition.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean, System.Threading.CancellationToken)' is present in the implementation but not in the contract.
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.PageSlide.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.DrawingContext.DrawText(Avalonia.Media.IBrush, Avalonia.Point, Avalonia.Media.FormattedText)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Boolean Avalonia.Media.FontManager.TryMatchCharacter(System.Int32, Avalonia.Media.FontStyle, Avalonia.Media.FontWeight, Avalonia.Media.FontFamily, System.Globalization.CultureInfo, Avalonia.Media.Typeface)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText..ctor()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText..ctor(Avalonia.Platform.IPlatformRenderInterface)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText..ctor(System.String, Avalonia.Media.Typeface, System.Double, Avalonia.Media.TextAlignment, Avalonia.Media.TextWrapping, Avalonia.Size)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Rect Avalonia.Media.FormattedText.Bounds.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Size Avalonia.Media.FormattedText.Constraint.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText.Constraint.set(Avalonia.Size)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Double Avalonia.Media.FormattedText.FontSize.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText.FontSize.set(System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Collections.Generic.IEnumerable<Avalonia.Media.FormattedTextLine> Avalonia.Media.FormattedText.GetLines()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextHitTestResult Avalonia.Media.FormattedText.HitTestPoint(Avalonia.Point)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Rect Avalonia.Media.FormattedText.HitTestTextPosition(System.Int32)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Collections.Generic.IEnumerable<Avalonia.Rect> Avalonia.Media.FormattedText.HitTestTextRange(System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Platform.IFormattedTextImpl Avalonia.Media.FormattedText.PlatformImpl.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Collections.Generic.IReadOnlyList<Avalonia.Media.FormattedTextStyleSpan> Avalonia.Media.FormattedText.Spans.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText.Spans.set(System.Collections.Generic.IReadOnlyList<Avalonia.Media.FormattedTextStyleSpan>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.String Avalonia.Media.FormattedText.Text.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText.Text.set(System.String)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextWrapping Avalonia.Media.FormattedText.TextWrapping.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText.TextWrapping.set(Avalonia.Media.TextWrapping)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.Typeface Avalonia.Media.FormattedText.Typeface.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.FormattedText.Typeface.set(Avalonia.Media.Typeface)' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Media.FormattedTextLine' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Media.FormattedTextStyleSpan' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun..ctor()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun..ctor(Avalonia.Media.GlyphTypeface, System.Double, Avalonia.Utilities.ReadOnlySlice<System.UInt16>, Avalonia.Utilities.ReadOnlySlice<System.Double>, Avalonia.Utilities.ReadOnlySlice<Avalonia.Vector>, Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Utilities.ReadOnlySlice<System.UInt16>, System.Int32)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Utilities.ReadOnlySlice<System.Double> Avalonia.Media.GlyphRun.GlyphAdvances.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun.GlyphAdvances.set(Avalonia.Utilities.ReadOnlySlice<System.Double>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Utilities.ReadOnlySlice<System.UInt16> Avalonia.Media.GlyphRun.GlyphClusters.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun.GlyphClusters.set(Avalonia.Utilities.ReadOnlySlice<System.UInt16>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Utilities.ReadOnlySlice<System.UInt16> Avalonia.Media.GlyphRun.GlyphIndices.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun.GlyphIndices.set(Avalonia.Utilities.ReadOnlySlice<System.UInt16>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Utilities.ReadOnlySlice<Avalonia.Vector> Avalonia.Media.GlyphRun.GlyphOffsets.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun.GlyphOffsets.set(Avalonia.Utilities.ReadOnlySlice<Avalonia.Vector>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.GlyphRun.GlyphTypeface.set(Avalonia.Media.GlyphTypeface)' does not exist in the implementation but it does exist in the contract.
-CannotSealType : Type 'Avalonia.Media.Pen' is actually (has the sealed modifier) sealed in the implementation but not sealed in the contract.
-MembersMustExist : Member 'protected void Avalonia.Media.Pen.AffectsRender<T>(Avalonia.AvaloniaProperty[])' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Media.Pen.RaiseInvalidated(System.EventArgs)' does not exist in the implementation but it does exist in the contract.
-CannotSealType : Type 'Avalonia.Media.TextHitTestResult' is actually (has the sealed modifier) sealed in the implementation but not sealed in the contract.
-TypeCannotChangeClassification : Type 'Avalonia.Media.TextHitTestResult' is a 'struct' in the implementation but is a 'class' in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextHitTestResult..ctor()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextHitTestResult.IsInside.set(System.Boolean)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextHitTestResult.IsTrailing.set(System.Boolean)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextHitTestResult.TextPosition.set(System.Int32)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.Typeface..ctor(Avalonia.Media.FontFamily, Avalonia.Media.FontStyle, Avalonia.Media.FontWeight)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.Typeface..ctor(System.String, Avalonia.Media.FontStyle, Avalonia.Media.FontWeight)' does not exist in the implementation but it does exist in the contract.
-TypeCannotChangeClassification : Type 'Avalonia.Media.Immutable.ImmutableSolidColorBrush' is a 'class' in the implementation but is a 'struct' in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.DrawableTextRun.Draw(Avalonia.Media.DrawingContext)' does not exist in the implementation but it does exist in the contract.
-CannotAddAbstractMembers : Member 'public void Avalonia.Media.TextFormatting.DrawableTextRun.Draw(Avalonia.Media.DrawingContext, Avalonia.Point)' is abstract in the implementation but is missing in the contract.
-CannotSealType : Type 'Avalonia.Media.TextFormatting.GenericTextParagraphProperties' is actually (has the sealed modifier) sealed in the implementation but not sealed in the contract.
-CannotMakeMemberNonVirtual : Member 'public Avalonia.Media.TextFormatting.TextRunProperties Avalonia.Media.TextFormatting.GenericTextParagraphProperties.DefaultTextRunProperties' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public System.Double Avalonia.Media.TextFormatting.GenericTextParagraphProperties.LineHeight' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public Avalonia.Media.TextAlignment Avalonia.Media.TextFormatting.GenericTextParagraphProperties.TextAlignment' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public Avalonia.Media.TextWrapping Avalonia.Media.TextFormatting.GenericTextParagraphProperties.TextWrapping' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public Avalonia.Media.TextFormatting.TextRunProperties Avalonia.Media.TextFormatting.GenericTextParagraphProperties.DefaultTextRunProperties.get()' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public System.Double Avalonia.Media.TextFormatting.GenericTextParagraphProperties.LineHeight.get()' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public Avalonia.Media.TextAlignment Avalonia.Media.TextFormatting.GenericTextParagraphProperties.TextAlignment.get()' is non-virtual in the implementation but is virtual in the contract.
-CannotMakeMemberNonVirtual : Member 'public Avalonia.Media.TextWrapping Avalonia.Media.TextFormatting.GenericTextParagraphProperties.TextWrapping.get()' is non-virtual in the implementation but is virtual in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.GenericTextRunProperties..ctor(Avalonia.Media.Typeface, System.Double, Avalonia.Media.TextDecorationCollection, Avalonia.Media.IBrush, Avalonia.Media.IBrush, System.Globalization.CultureInfo)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.ShapeableTextCharacters..ctor(Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Media.TextFormatting.TextRunProperties)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.ShapedTextCharacters..ctor(Avalonia.Media.GlyphRun, Avalonia.Media.TextFormatting.TextRunProperties)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.ShapedTextCharacters.Draw(Avalonia.Media.DrawingContext)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextFormatting.ShapedTextCharacters.SplitTextCharactersResult Avalonia.Media.TextFormatting.ShapedTextCharacters.Split(System.Int32)' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Media.TextFormatting.ShapedTextCharacters.SplitTextCharactersResult' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected System.Boolean Avalonia.Media.TextFormatting.TextCharacters.TryGetRunProperties(Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Media.Typeface, Avalonia.Media.Typeface, System.Int32)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextEndOfLine..ctor()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextLayout..ctor(System.String, Avalonia.Media.Typeface, System.Double, Avalonia.Media.IBrush, Avalonia.Media.TextAlignment, Avalonia.Media.TextWrapping, Avalonia.Media.TextTrimming, Avalonia.Media.TextDecorationCollection, System.Double, System.Double, System.Double, System.Int32, System.Collections.Generic.IReadOnlyList<Avalonia.Utilities.ValueSpan<Avalonia.Media.TextFormatting.TextRunProperties>>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextLayout.Draw(Avalonia.Media.DrawingContext)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Size Avalonia.Media.TextFormatting.TextLayout.Size.get()' does not exist in the implementation but it does exist in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Baseline' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Extent' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Boolean Avalonia.Media.TextFormatting.TextLine.HasOverflowed' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Height' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Int32 Avalonia.Media.TextFormatting.TextLine.NewLineLength' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.OverhangAfter' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.OverhangLeading' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.OverhangTrailing' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Start' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Int32 Avalonia.Media.TextFormatting.TextLine.TrailingWhitespaceLength' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Width' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.WidthIncludingTrailingWhitespace' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Baseline.get()' is abstract in the implementation but is missing in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextLine.Draw(Avalonia.Media.DrawingContext)' does not exist in the implementation but it does exist in the contract.
-CannotAddAbstractMembers : Member 'public void Avalonia.Media.TextFormatting.TextLine.Draw(Avalonia.Media.DrawingContext, Avalonia.Point)' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Extent.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Boolean Avalonia.Media.TextFormatting.TextLine.HasOverflowed.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Height.get()' is abstract in the implementation but is missing in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextFormatting.TextLineMetrics Avalonia.Media.TextFormatting.TextLine.LineMetrics.get()' does not exist in the implementation but it does exist in the contract.
-CannotAddAbstractMembers : Member 'public System.Int32 Avalonia.Media.TextFormatting.TextLine.NewLineLength.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.OverhangAfter.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.OverhangLeading.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.OverhangTrailing.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Start.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Int32 Avalonia.Media.TextFormatting.TextLine.TrailingWhitespaceLength.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.Width.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextLine.WidthIncludingTrailingWhitespace.get()' is abstract in the implementation but is missing in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextLineBreak..ctor(System.Collections.Generic.IReadOnlyList<Avalonia.Media.TextFormatting.ShapedTextCharacters>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.TextLineMetrics..ctor(Avalonia.Size, System.Double, Avalonia.Media.TextFormatting.TextRange, System.Boolean)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextFormatting.TextLineMetrics Avalonia.Media.TextFormatting.TextLineMetrics.Create(System.Collections.Generic.IEnumerable<Avalonia.Media.TextFormatting.TextRun>, Avalonia.Media.TextFormatting.TextRange, System.Double, Avalonia.Media.TextFormatting.TextParagraphProperties)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Size Avalonia.Media.TextFormatting.TextLineMetrics.Size.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextFormatting.TextRange Avalonia.Media.TextFormatting.TextLineMetrics.TextRange.get()' does not exist in the implementation but it does exist in the contract.
-CannotAddAbstractMembers : Member 'public System.Boolean Avalonia.Media.TextFormatting.TextParagraphProperties.FirstLineInParagraph' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public Avalonia.Media.FlowDirection Avalonia.Media.TextFormatting.TextParagraphProperties.FlowDirection' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextParagraphProperties.Indent' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Boolean Avalonia.Media.TextFormatting.TextParagraphProperties.FirstLineInParagraph.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public Avalonia.Media.FlowDirection Avalonia.Media.TextFormatting.TextParagraphProperties.FlowDirection.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public System.Double Avalonia.Media.TextFormatting.TextParagraphProperties.Indent.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public Avalonia.Media.BaselineAlignment Avalonia.Media.TextFormatting.TextRunProperties.BaselineAlignment' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'public Avalonia.Media.BaselineAlignment Avalonia.Media.TextFormatting.TextRunProperties.BaselineAlignment.get()' is abstract in the implementation but is missing in the contract.
-MembersMustExist : Member 'public Avalonia.Media.GlyphRun Avalonia.Media.TextFormatting.TextShaper.ShapeText(Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Media.Typeface, System.Double, System.Globalization.CultureInfo)' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Media.TextFormatting.Unicode.BiDiClass' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.TextFormatting.Unicode.BiDiClass Avalonia.Media.TextFormatting.Unicode.Codepoint.BiDiClass.get()' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Platform.ExportRenderingSubsystemAttribute' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IDrawingContextImpl.DrawEllipse(Avalonia.Media.IBrush, Avalonia.Media.IPen, Avalonia.Rect)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IDrawingContextImpl.DrawText(Avalonia.Media.IBrush, Avalonia.Point, Avalonia.Platform.IFormattedTextImpl)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public void Avalonia.Platform.IDrawingContextImpl.DrawText(Avalonia.Media.IBrush, Avalonia.Point, Avalonia.Platform.IFormattedTextImpl)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IDrawingContextImpl.PopBitmapBlendMode()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IDrawingContextImpl.PushBitmapBlendMode(Avalonia.Visuals.Media.Imaging.BitmapBlendingMode)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32, Avalonia.Media.FontStyle, Avalonia.Media.FontWeight, Avalonia.Media.FontFamily, System.Globalization.CultureInfo, Avalonia.Media.Typeface)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public System.Boolean Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32, Avalonia.Media.FontStyle, Avalonia.Media.FontWeight, Avalonia.Media.FontFamily, System.Globalization.CultureInfo, Avalonia.Media.Typeface)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32, Avalonia.Media.FontStyle, Avalonia.Media.FontWeight, Avalonia.Media.FontStretch, Avalonia.Media.FontFamily, System.Globalization.CultureInfo, Avalonia.Media.Typeface)' is present in the implementation but not in the contract.
-TypesMustExist : Type 'Avalonia.Platform.IFormattedTextImpl' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Double Avalonia.Platform.IGeometryImpl.ContourLength' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Double Avalonia.Platform.IGeometryImpl.ContourLength.get()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Platform.IGeometryImpl.TryGetPointAndTangentAtDistance(System.Double, Avalonia.Point, Avalonia.Point)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Platform.IGeometryImpl.TryGetPointAtDistance(System.Double, Avalonia.Point)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Platform.IGeometryImpl.TryGetSegment(System.Double, System.Double, System.Boolean, Avalonia.Platform.IGeometryImpl)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IGeometryImpl Avalonia.Platform.IPlatformRenderInterface.CreateCombinedGeometry(Avalonia.Media.GeometryCombineMode, Avalonia.Media.Geometry, Avalonia.Media.Geometry)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IFormattedTextImpl Avalonia.Platform.IPlatformRenderInterface.CreateFormattedText(System.String, Avalonia.Media.Typeface, System.Double, Avalonia.Media.TextAlignment, Avalonia.Media.TextWrapping, Avalonia.Size, System.Collections.Generic.IReadOnlyList<Avalonia.Media.FormattedTextStyleSpan>)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public Avalonia.Platform.IFormattedTextImpl Avalonia.Platform.IPlatformRenderInterface.CreateFormattedText(System.String, Avalonia.Media.Typeface, System.Double, Avalonia.Media.TextAlignment, Avalonia.Media.TextWrapping, Avalonia.Size, System.Collections.Generic.IReadOnlyList<Avalonia.Media.FormattedTextStyleSpan>)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IGeometryImpl Avalonia.Platform.IPlatformRenderInterface.CreateGeometryGroup(Avalonia.Media.FillRule, System.Collections.Generic.IReadOnlyList<Avalonia.Media.Geometry>)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IGlyphRunImpl Avalonia.Platform.IPlatformRenderInterface.CreateGlyphRun(Avalonia.Media.GlyphRun)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IGlyphRunImpl Avalonia.Platform.IPlatformRenderInterface.CreateGlyphRun(Avalonia.Media.GlyphRun, System.Double)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public Avalonia.Platform.IGlyphRunImpl Avalonia.Platform.IPlatformRenderInterface.CreateGlyphRun(Avalonia.Media.GlyphRun, System.Double)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmap(System.IO.Stream)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmap(System.String)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmapToHeight(System.IO.Stream, System.Int32, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmapToWidth(System.IO.Stream, System.Int32, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Size Avalonia.Platform.IPlatformSettings.TouchDoubleClickSize' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.TimeSpan Avalonia.Platform.IPlatformSettings.TouchDoubleClickTime' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Size Avalonia.Platform.IPlatformSettings.TouchDoubleClickSize.get()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.TimeSpan Avalonia.Platform.IPlatformSettings.TouchDoubleClickTime.get()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Media.TextFormatting.ShapedBuffer Avalonia.Platform.ITextShaperImpl.ShapeText(Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Media.GlyphTypeface, System.Double, System.Globalization.CultureInfo, System.SByte)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Media.GlyphRun Avalonia.Platform.ITextShaperImpl.ShapeText(Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Media.Typeface, System.Double, System.Globalization.CultureInfo)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public Avalonia.Media.GlyphRun Avalonia.Platform.ITextShaperImpl.ShapeText(Avalonia.Utilities.ReadOnlySlice<System.Char>, Avalonia.Media.Typeface, System.Double, System.Globalization.CultureInfo)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Rendering.RendererBase.RenderFps(Avalonia.Platform.IDrawingContextImpl, Avalonia.Rect, System.Nullable<System.Int32>)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Utilities.ReadOnlySlice<T>..ctor(System.ReadOnlyMemory<T>, System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract.
-Total Issues: 153
diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
deleted file mode 100644
index a0b1f99fa1..0000000000
--- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <RootNamespace>Avalonia</RootNamespace>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Assets\*.trie" />
-  </ItemGroup>
-  <ItemGroup> 
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Media\TextFormatting\TextRunCache.cs" />
-  </ItemGroup>
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\System.Memory.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
-  <Import Project="..\..\build\NullableEnable.props" />
-</Project>
diff --git a/src/Avalonia.Visuals/Matrix.cs b/src/Avalonia.Visuals/Matrix.cs
deleted file mode 100644
index b08a0eb98a..0000000000
--- a/src/Avalonia.Visuals/Matrix.cs
+++ /dev/null
@@ -1,438 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// A 2x3 matrix.
-    /// </summary>
-#if !BUILDTASK
-    public
-#endif
-    readonly struct Matrix : IEquatable<Matrix>
-    {
-        private readonly double _m11;
-        private readonly double _m12;
-        private readonly double _m21;
-        private readonly double _m22;
-        private readonly double _m31;
-        private readonly double _m32;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Matrix"/> struct.
-        /// </summary>
-        /// <param name="m11">The first element of the first row.</param>
-        /// <param name="m12">The second element of the first row.</param>
-        /// <param name="m21">The first element of the second row.</param>
-        /// <param name="m22">The second element of the second row.</param>
-        /// <param name="offsetX">The first element of the third row.</param>
-        /// <param name="offsetY">The second element of the third row.</param>
-        public Matrix(
-            double m11,
-            double m12,
-            double m21,
-            double m22,
-            double offsetX,
-            double offsetY)
-        {
-            _m11 = m11;
-            _m12 = m12;
-            _m21 = m21;
-            _m22 = m22;
-            _m31 = offsetX;
-            _m32 = offsetY;
-        }
-
-        /// <summary>
-        /// Returns the multiplicative identity matrix.
-        /// </summary>
-        public static Matrix Identity { get; } = new Matrix(1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
-
-        /// <summary>
-        /// Returns whether the matrix is the identity matrix.
-        /// </summary>
-        public bool IsIdentity => Equals(Identity);
-
-        /// <summary>
-        /// HasInverse Property - returns true if this matrix is invertible, false otherwise.
-        /// </summary>
-        public bool HasInverse => !MathUtilities.IsZero(GetDeterminant());
-
-        /// <summary>
-        /// The first element of the first row
-        /// </summary>
-        public double M11 => _m11;
-
-        /// <summary>
-        /// The second element of the first row
-        /// </summary>
-        public double M12 => _m12;
-
-        /// <summary>
-        /// The first element of the second row
-        /// </summary>
-        public double M21 => _m21;
-
-        /// <summary>
-        /// The second element of the second row
-        /// </summary>
-        public double M22 => _m22;
-
-        /// <summary>
-        /// The first element of the third row
-        /// </summary>
-        public double M31 => _m31;
-
-        /// <summary>
-        /// The second element of the third row
-        /// </summary>
-        public double M32 => _m32;
-
-        /// <summary>
-        /// Multiplies two matrices together and returns the resulting matrix.
-        /// </summary>
-        /// <param name="value1">The first source matrix.</param>
-        /// <param name="value2">The second source matrix.</param>
-        /// <returns>The product matrix.</returns>
-        public static Matrix operator *(Matrix value1, Matrix value2)
-        {
-            return new Matrix(
-                (value1.M11 * value2.M11) + (value1.M12 * value2.M21),
-                (value1.M11 * value2.M12) + (value1.M12 * value2.M22),
-                (value1.M21 * value2.M11) + (value1.M22 * value2.M21),
-                (value1.M21 * value2.M12) + (value1.M22 * value2.M22),
-                (value1._m31 * value2.M11) + (value1._m32 * value2.M21) + value2._m31,
-                (value1._m31 * value2.M12) + (value1._m32 * value2.M22) + value2._m32);
-        }
-
-        /// <summary>
-        /// Negates the given matrix by multiplying all values by -1.
-        /// </summary>
-        /// <param name="value">The source matrix.</param>
-        /// <returns>The negated matrix.</returns>
-        public static Matrix operator -(Matrix value)
-        {
-            return value.Invert();
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the given matrices are equal.
-        /// </summary>
-        /// <param name="value1">The first source matrix.</param>
-        /// <param name="value2">The second source matrix.</param>
-        /// <returns>True if the matrices are equal; False otherwise.</returns>
-        public static bool operator ==(Matrix value1, Matrix value2)
-        {
-            return value1.Equals(value2);
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the given matrices are not equal.
-        /// </summary>
-        /// <param name="value1">The first source matrix.</param>
-        /// <param name="value2">The second source matrix.</param>
-        /// <returns>True if the matrices are not equal; False if they are equal.</returns>
-        public static bool operator !=(Matrix value1, Matrix value2)
-        {
-            return !value1.Equals(value2);
-        }
-
-        /// <summary>
-        /// Creates a rotation matrix using the given rotation in radians.
-        /// </summary>
-        /// <param name="radians">The amount of rotation, in radians.</param>
-        /// <returns>A rotation matrix.</returns>
-        public static Matrix CreateRotation(double radians)
-        {
-            double cos = Math.Cos(radians);
-            double sin = Math.Sin(radians);
-            return new Matrix(cos, sin, -sin, cos, 0, 0);
-        }
-
-        /// <summary>
-        /// Creates a skew matrix from the given axis skew angles in radians.
-        /// </summary>
-        /// <param name="xAngle">The amount of skew along the X-axis, in radians.</param>
-        /// <param name="yAngle">The amount of skew along the Y-axis, in radians.</param>
-        /// <returns>A rotation matrix.</returns>
-        public static Matrix CreateSkew(double xAngle, double yAngle)
-        {
-            double tanX = Math.Tan(xAngle);
-            double tanY = Math.Tan(yAngle);
-            return new Matrix(1.0, tanY, tanX, 1.0, 0.0, 0.0);
-        }
-
-        /// <summary>
-        /// Creates a scale matrix from the given X and Y components.
-        /// </summary>
-        /// <param name="xScale">Value to scale by on the X-axis.</param>
-        /// <param name="yScale">Value to scale by on the Y-axis.</param>
-        /// <returns>A scaling matrix.</returns>
-        public static Matrix CreateScale(double xScale, double yScale)
-        {
-            return CreateScale(new Vector(xScale, yScale));
-        }
-
-        /// <summary>
-        /// Creates a scale matrix from the given vector scale.
-        /// </summary>
-        /// <param name="scales">The scale to use.</param>
-        /// <returns>A scaling matrix.</returns>
-        public static Matrix CreateScale(Vector scales)
-        {
-            return new Matrix(scales.X, 0, 0, scales.Y, 0, 0);
-        }
-
-        /// <summary>
-        /// Creates a translation matrix from the given vector.
-        /// </summary>
-        /// <param name="position">The translation position.</param>
-        /// <returns>A translation matrix.</returns>
-        public static Matrix CreateTranslation(Vector position)
-        {
-            return CreateTranslation(position.X, position.Y);
-        }
-
-        /// <summary>
-        /// Creates a translation matrix from the given X and Y components.
-        /// </summary>
-        /// <param name="xPosition">The X position.</param>
-        /// <param name="yPosition">The Y position.</param>
-        /// <returns>A translation matrix.</returns>
-        public static Matrix CreateTranslation(double xPosition, double yPosition)
-        {
-            return new Matrix(1.0, 0.0, 0.0, 1.0, xPosition, yPosition);
-        }
-
-        /// <summary>
-        /// Converts an angle in degrees to radians.
-        /// </summary>
-        /// <param name="angle">The angle in degrees.</param>
-        /// <returns>The angle in radians.</returns>
-        public static double ToRadians(double angle)
-        {
-            return angle * 0.0174532925;
-        }
-
-        /// <summary>
-        /// Appends another matrix as post-multiplication operation.
-        /// Equivalent to this * value;
-        /// </summary>
-        /// <param name="value">A matrix.</param>
-        /// <returns>Post-multiplied matrix.</returns>
-        public Matrix Append(Matrix value)
-        {
-            return this * value;
-        }
-
-        /// <summary>
-        /// Prpends another matrix as pre-multiplication operation.
-        /// Equivalent to value * this;
-        /// </summary>
-        /// <param name="value">A matrix.</param>
-        /// <returns>Pre-multiplied matrix.</returns>
-        public Matrix Prepend(Matrix value)
-        {
-            return value * this;
-        }
-
-        /// <summary>
-        /// Calculates the determinant for this matrix.
-        /// </summary>
-        /// <returns>The determinant.</returns>
-        /// <remarks>
-        /// The determinant is calculated by expanding the matrix with a third column whose
-        /// values are (0,0,1).
-        /// </remarks>
-        public double GetDeterminant()
-        {
-            return (_m11 * _m22) - (_m12 * _m21);
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the matrix is equal to the other given matrix.
-        /// </summary>
-        /// <param name="other">The other matrix to test equality against.</param>
-        /// <returns>True if this matrix is equal to other; False otherwise.</returns>
-        public bool Equals(Matrix other)
-        {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
-            return _m11 == other.M11 &&
-                   _m12 == other.M12 &&
-                   _m21 == other.M21 &&
-                   _m22 == other.M22 &&
-                   _m31 == other.M31 &&
-                   _m32 == other.M32;
-            // ReSharper restore CompareOfFloatsByEqualityOperator
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the given Object is equal to this matrix instance.
-        /// </summary>
-        /// <param name="obj">The Object to compare against.</param>
-        /// <returns>True if the Object is equal to this matrix; False otherwise.</returns>
-        public override bool Equals(object? obj) => obj is Matrix other && Equals(other);
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return M11.GetHashCode() + M12.GetHashCode() +
-                   M21.GetHashCode() + M22.GetHashCode() +
-                   M31.GetHashCode() + M32.GetHashCode();
-        }
-
-        /// <summary>
-        /// Returns a String representing this matrix instance.
-        /// </summary>
-        /// <returns>The string representation.</returns>
-        public override string ToString()
-        {
-            CultureInfo ci = CultureInfo.CurrentCulture;
-            return string.Format(
-                ci,
-                "{{ {{M11:{0} M12:{1}}} {{M21:{2} M22:{3}}} {{M31:{4} M32:{5}}} }}",
-                M11.ToString(ci),
-                M12.ToString(ci),
-                M21.ToString(ci),
-                M22.ToString(ci),
-                M31.ToString(ci),
-                M32.ToString(ci));
-        }
-
-        /// <summary>
-        /// Attempts to invert the Matrix.
-        /// </summary>
-        /// <returns>The inverted matrix or <see langword="null"/> when matrix is not invertible.</returns>
-        public bool TryInvert(out Matrix inverted)
-        {
-            double d = GetDeterminant();
-
-            if (MathUtilities.IsZero(d))
-            {
-                inverted = default;
-                
-                return false;
-            }
-
-            inverted = new Matrix(
-                _m22 / d,
-                -_m12 / d,
-                -_m21 / d,
-                _m11 / d,
-                ((_m21 * _m32) - (_m22 * _m31)) / d,
-                ((_m12 * _m31) - (_m11 * _m32)) / d);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Inverts the Matrix.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">Matrix is not invertible.</exception>
-        /// <returns>The inverted matrix.</returns>
-        public Matrix Invert()
-        {
-            if (!TryInvert(out Matrix inverted))
-            {
-                throw new InvalidOperationException("Transform is not invertible.");
-            }
-
-            return inverted;
-        }
-
-        /// <summary>
-        /// Parses a <see cref="Matrix"/> string.
-        /// </summary>
-        /// <param name="s">Six comma-delimited double values (m11, m12, m21, m22, offsetX, offsetY) that describe the new <see cref="Matrix"/></param>
-        /// <returns>The <see cref="Matrix"/>.</returns>
-        public static Matrix Parse(string s)
-        {
-            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Matrix."))
-            {
-                return new Matrix(
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble()
-                );
-            }
-        }
-
-        /// <summary>
-        /// Decomposes given matrix into transform operations.
-        /// </summary>
-        /// <param name="matrix">Matrix to decompose.</param>
-        /// <param name="decomposed">Decomposed matrix.</param>
-        /// <returns>The status of the operation.</returns>
-        public static bool TryDecomposeTransform(Matrix matrix, out Decomposed decomposed)
-        {
-            decomposed = default;
-
-            var determinant = matrix.GetDeterminant();
-            
-            if (MathUtilities.IsZero(determinant))
-            {
-                return false;
-            }
-
-            var m11 = matrix.M11;
-            var m21 = matrix.M21;
-            var m12 = matrix.M12;
-            var m22 = matrix.M22;
-
-            // Translation.
-            decomposed.Translate = new Vector(matrix.M31, matrix.M32);
-
-            // Scale sign.
-            var scaleX = 1d;
-            var scaleY = 1d;
-
-            if (determinant < 0)
-            {
-                if (m11 < m22)
-                {
-                    scaleX *= -1d;
-                }
-                else
-                {
-                    scaleY *= -1d;
-                }
-            }
-
-            // X Scale.
-            scaleX *= Math.Sqrt(m11 * m11 + m12 * m12);
-
-            m11 /= scaleX;
-            m12 /= scaleX;
-
-            // XY Shear.
-            double scaledShear = m11 * m21 + m12 * m22;
-
-            m21 -= m11 * scaledShear;
-            m22 -= m12 * scaledShear;
-
-            // Y Scale.
-            scaleY *= Math.Sqrt(m21 * m21 + m22 * m22);
-
-            decomposed.Scale = new Vector(scaleX, scaleY);
-            decomposed.Skew = new Vector(scaledShear / scaleY, 0d);
-            decomposed.Angle = Math.Atan2(m12, m11);
-
-            return true;
-        }
-
-        public struct Decomposed
-        {
-            public Vector Translate;
-            public Vector Scale;
-            public Vector Skew;
-            public double Angle;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Brush.cs b/src/Avalonia.Visuals/Media/Brush.cs
deleted file mode 100644
index 11fbe9393a..0000000000
--- a/src/Avalonia.Visuals/Media/Brush.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using System.ComponentModel;
-using Avalonia.Animation;
-using Avalonia.Animation.Animators;
-using Avalonia.Media.Immutable;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes how an area is painted.
-    /// </summary>
-    [TypeConverter(typeof(BrushConverter))]
-    public abstract class Brush : Animatable, IMutableBrush
-    {
-        /// <summary>
-        /// Defines the <see cref="Opacity"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> OpacityProperty =
-            AvaloniaProperty.Register<Brush, double>(nameof(Opacity), 1.0);
-
-        /// <inheritdoc/>
-        public event EventHandler? Invalidated;
-
-        static Brush()
-        {
-            Animation.Animation.RegisterAnimator<BaseBrushAnimator>(prop => typeof(IBrush).IsAssignableFrom(prop.PropertyType));
-            AffectsRender<Brush>(OpacityProperty);
-        }
-
-        /// <summary>
-        /// Gets or sets the opacity of the brush.
-        /// </summary>
-        public double Opacity
-        {
-            get { return GetValue(OpacityProperty); }
-            set { SetValue(OpacityProperty, value); }
-        }
-
-        /// <summary>
-        /// Parses a brush string.
-        /// </summary>
-        /// <param name="s">The brush string.</param>
-        /// <returns>The <see cref="Color"/>.</returns>
-        public static IBrush Parse(string s)
-        {
-            _ = s ?? throw new ArgumentNullException(nameof(s));
-
-            if (s.Length > 0)
-            {
-                if (s[0] == '#')
-                {
-                    return new ImmutableSolidColorBrush(Color.Parse(s));
-                }
-
-                var brush = KnownColors.GetKnownBrush(s);
-                if (brush != null)
-                {
-                    return brush;
-                }
-            }
-
-            throw new FormatException($"Invalid brush string: '{s}'.");
-        }
-
-        /// <inheritdoc/>
-        public abstract IBrush ToImmutable();
-
-        /// <summary>
-        /// Marks a property as affecting the brush's visual representation.
-        /// </summary>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a brush's static constructor, any change to the
-        /// property will cause the <see cref="Invalidated"/> event to be raised on the brush.
-        /// </remarks>
-        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
-            where T : Brush
-        {
-            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
-            {
-                (e.Sender as T)?.RaiseInvalidated(EventArgs.Empty);
-            }
-
-            foreach (var property in properties)
-            {
-                property.Changed.Subscribe(e => Invalidate(e));
-            }
-        }
-
-        /// <summary>
-        /// Raises the <see cref="Invalidated"/> event.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Color.cs b/src/Avalonia.Visuals/Media/Color.cs
deleted file mode 100644
index 083c15cd13..0000000000
--- a/src/Avalonia.Visuals/Media/Color.cs
+++ /dev/null
@@ -1,310 +0,0 @@
-using System;
-using System.Globalization;
-#if !BUILDTASK
-using Avalonia.Animation.Animators;
-#endif
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// An ARGB color.
-    /// </summary>
-#if !BUILDTASK
-    public
-#endif
-    readonly struct Color : IEquatable<Color>
-    {
-        static Color()
-        {
-#if !BUILDTASK
-            Animation.Animation.RegisterAnimator<ColorAnimator>(prop => typeof(Color).IsAssignableFrom(prop.PropertyType));
-#endif
-        }
-
-        /// <summary>
-        /// Gets the Alpha component of the color.
-        /// </summary>
-        public byte A { get; }
-
-        /// <summary>
-        /// Gets the Red component of the color.
-        /// </summary>
-        public byte R { get; }
-
-        /// <summary>
-        /// Gets the Green component of the color.
-        /// </summary>
-        public byte G { get; }
-
-        /// <summary>
-        /// Gets the Blue component of the color.
-        /// </summary>
-        public byte B { get; }
-
-        public Color(byte a, byte r, byte g, byte b)
-        {
-            A = a;
-            R = r;
-            G = g;
-            B = b;
-        }
-
-        /// <summary>
-        /// Creates a <see cref="Color"/> from alpha, red, green and blue components.
-        /// </summary>
-        /// <param name="a">The alpha component.</param>
-        /// <param name="r">The red component.</param>
-        /// <param name="g">The green component.</param>
-        /// <param name="b">The blue component.</param>
-        /// <returns>The color.</returns>
-        public static Color FromArgb(byte a, byte r, byte g, byte b)
-        {
-            return new Color(a, r, g, b);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="Color"/> from red, green and blue components.
-        /// </summary>
-        /// <param name="r">The red component.</param>
-        /// <param name="g">The green component.</param>
-        /// <param name="b">The blue component.</param>
-        /// <returns>The color.</returns>
-        public static Color FromRgb(byte r, byte g, byte b)
-        {
-            return new Color(0xff, r, g, b);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="Color"/> from an integer.
-        /// </summary>
-        /// <param name="value">The integer value.</param>
-        /// <returns>The color.</returns>
-        public static Color FromUInt32(uint value)
-        {
-            return new Color(
-                (byte)((value >> 24) & 0xff),
-                (byte)((value >> 16) & 0xff),
-                (byte)((value >> 8) & 0xff),
-                (byte)(value & 0xff)
-            );
-        }
-
-        /// <summary>
-        /// Parses a color string.
-        /// </summary>
-        /// <param name="s">The color string.</param>
-        /// <returns>The <see cref="Color"/>.</returns>
-        public static Color Parse(string s)
-        {
-            if (s is null)
-            {
-                throw new ArgumentNullException(nameof(s));
-            }
-
-            if (TryParse(s, out Color color))
-            {
-                return color;
-            }
-
-            throw new FormatException($"Invalid color string: '{s}'.");
-        }
-
-        /// <summary>
-        /// Parses a color string.
-        /// </summary>
-        /// <param name="s">The color string.</param>
-        /// <returns>The <see cref="Color"/>.</returns>
-        public static Color Parse(ReadOnlySpan<char> s)
-        {
-            if (TryParse(s, out Color color))
-            {
-                return color;
-            }
-
-            throw new FormatException($"Invalid color string: '{s.ToString()}'.");
-        }
-
-        /// <summary>
-        /// Parses a color string.
-        /// </summary>
-        /// <param name="s">The color string.</param>
-        /// <param name="color">The parsed color</param>
-        /// <returns>The status of the operation.</returns>
-        public static bool TryParse(string s, out Color color)
-        {
-            color = default;
-
-            if (s is null)
-            {
-                return false;
-            }
-
-            if (s.Length == 0)
-            {
-                return false;
-            }
-
-            if (s[0] == '#' && TryParseInternal(s.AsSpan(), out color))
-            {
-                return true;
-            }
-
-            var knownColor = KnownColors.GetKnownColor(s);
-
-            if (knownColor != KnownColor.None)
-            {
-                color = knownColor.ToColor();
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Parses a color string.
-        /// </summary>
-        /// <param name="s">The color string.</param>
-        /// <param name="color">The parsed color</param>
-        /// <returns>The status of the operation.</returns>
-        public static bool TryParse(ReadOnlySpan<char> s, out Color color)
-        {
-            if (s.Length == 0)
-            {
-                color = default;
-
-                return false;
-            }
-
-            if (s[0] == '#')
-            {
-                return TryParseInternal(s, out color);
-            }
-
-            var knownColor = KnownColors.GetKnownColor(s.ToString());
-
-            if (knownColor != KnownColor.None)
-            {
-                color = knownColor.ToColor();
-
-                return true;
-            }
-
-            color = default;
-
-            return false;
-        }
-
-        private static bool TryParseInternal(ReadOnlySpan<char> s, out Color color)
-        {
-            static bool TryParseCore(ReadOnlySpan<char> input, ref Color color)
-            {
-                var alphaComponent = 0u;
-
-                if (input.Length == 6)
-                {
-                    alphaComponent = 0xff000000;
-                }
-                else if (input.Length != 8)
-                {
-                    return false;
-                }
-
-                // TODO: (netstandard 2.1) Can use allocation free parsing.
-                if (!uint.TryParse(input.ToString(), NumberStyles.HexNumber, CultureInfo.InvariantCulture,
-                    out var parsed))
-                {
-                    return false;
-                }
-
-                color = FromUInt32(parsed | alphaComponent);
-
-                return true;
-            }
-
-            color = default;
-
-            ReadOnlySpan<char> input = s.Slice(1);
-
-            // Handle shorthand cases like #FFF (RGB) or #FFFF (ARGB).
-            if (input.Length == 3 || input.Length == 4)
-            {
-                var extendedLength = 2 * input.Length;
-                
-#if !BUILDTASK
-                Span<char> extended = stackalloc char[extendedLength];
-#else
-                char[] extended = new char[extendedLength];
-#endif
-
-                for (int i = 0; i < input.Length; i++)
-                {
-                    extended[2 * i + 0] = input[i];
-                    extended[2 * i + 1] = input[i];
-                }
-
-                return TryParseCore(extended, ref color);
-            }
-
-            return TryParseCore(input, ref color);
-        }
-
-        /// <summary>
-        /// Returns the string representation of the color.
-        /// </summary>
-        /// <returns>
-        /// The string representation of the color.
-        /// </returns>
-        public override string ToString()
-        {
-            uint rgb = ToUint32();
-            return KnownColors.GetKnownColorName(rgb) ?? $"#{rgb:x8}";
-        }
-
-        /// <summary>
-        /// Returns the integer representation of the color.
-        /// </summary>
-        /// <returns>
-        /// The integer representation of the color.
-        /// </returns>
-        public uint ToUint32()
-        {
-            return ((uint)A << 24) | ((uint)R << 16) | ((uint)G << 8) | (uint)B;
-        }
-
-        /// <summary>
-        /// Check if two colors are equal.
-        /// </summary>
-        public bool Equals(Color other)
-        {
-            return A == other.A && R == other.R && G == other.G && B == other.B;
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is Color other && Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hashCode = A.GetHashCode();
-                hashCode = (hashCode * 397) ^ R.GetHashCode();
-                hashCode = (hashCode * 397) ^ G.GetHashCode();
-                hashCode = (hashCode * 397) ^ B.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        public static bool operator ==(Color left, Color right)
-        {
-            return left.Equals(right);
-        }
-
-        public static bool operator !=(Color left, Color right)
-        {
-            return !left.Equals(right);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/ConicGradientBrush.cs b/src/Avalonia.Visuals/Media/ConicGradientBrush.cs
deleted file mode 100644
index 7c1266fa17..0000000000
--- a/src/Avalonia.Visuals/Media/ConicGradientBrush.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Avalonia.Media.Immutable;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Paints an area with a swept circular gradient.
-    /// </summary>
-    public sealed class ConicGradientBrush : GradientBrush, IConicGradientBrush
-    {
-        /// <summary>
-        /// Defines the <see cref="Center"/> property.
-        /// </summary>
-        public static readonly StyledProperty<RelativePoint> CenterProperty =
-            AvaloniaProperty.Register<RadialGradientBrush, RelativePoint>(
-                nameof(Center),
-                RelativePoint.Center);
-
-        /// <summary>
-        /// Defines the <see cref="Angle"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> AngleProperty =
-            AvaloniaProperty.Register<RadialGradientBrush, double>(
-                nameof(Angle),
-                0);
-        
-        static ConicGradientBrush()
-        {
-            AffectsRender<ConicGradientBrush>(CenterProperty, AngleProperty);
-        }
-
-        /// <summary>
-        /// Gets or sets the center point of the gradient.
-        /// </summary>
-        public RelativePoint Center
-        {
-            get { return GetValue(CenterProperty); }
-            set { SetValue(CenterProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the angle of the start and end of the sweep, measured from above the center point.
-        /// </summary>
-        public double Angle
-        {
-            get { return GetValue(AngleProperty); }
-            set { SetValue(AngleProperty, value); }
-        }
-
-        /// <inheritdoc/>
-        public override IBrush ToImmutable()
-        {
-            return new ImmutableConicGradientBrush(this);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/DashStyle.cs b/src/Avalonia.Visuals/Media/DashStyle.cs
deleted file mode 100644
index 2ec9436ede..0000000000
--- a/src/Avalonia.Visuals/Media/DashStyle.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using Avalonia.Animation;
-using Avalonia.Collections;
-using Avalonia.Media.Immutable;
-
-#nullable enable
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents the sequence of dashes and gaps that will be applied by a <see cref="Pen"/>.
-    /// </summary>
-    public class DashStyle : Animatable, IDashStyle, IAffectsRender
-    {
-        /// <summary>
-        /// Defines the <see cref="Dashes"/> property.
-        /// </summary>
-        public static readonly StyledProperty<AvaloniaList<double>> DashesProperty =
-            AvaloniaProperty.Register<DashStyle, AvaloniaList<double>>(nameof(Dashes));
-
-        /// <summary>
-        /// Defines the <see cref="Offset"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> OffsetProperty =
-            AvaloniaProperty.Register<DashStyle, double>(nameof(Offset));
-
-        private static ImmutableDashStyle? s_dash;
-        private static ImmutableDashStyle? s_dot;
-        private static ImmutableDashStyle? s_dashDot;
-        private static ImmutableDashStyle? s_dashDotDot;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DashStyle"/> class.
-        /// </summary>
-        public DashStyle()
-            : this(null, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DashStyle"/> class.
-        /// </summary>
-        /// <param name="dashes">The dashes collection.</param>
-        /// <param name="offset">The dash sequence offset.</param>
-        public DashStyle(IEnumerable<double>? dashes, double offset)
-        {
-            Dashes = (dashes as AvaloniaList<double>) ?? new AvaloniaList<double>(dashes ?? Array.Empty<double>());
-            Offset = offset;
-        }
-
-        static DashStyle()
-        {
-            void RaiseInvalidated(AvaloniaPropertyChangedEventArgs e)
-            {
-                ((DashStyle)e.Sender).Invalidated?.Invoke(e.Sender, EventArgs.Empty);
-            }
-
-            DashesProperty.Changed.Subscribe(RaiseInvalidated);
-            OffsetProperty.Changed.Subscribe(RaiseInvalidated);
-        }
-
-        /// <summary>
-        /// Represents a dashed <see cref="DashStyle"/>.
-        /// </summary>
-        public static IDashStyle Dash => s_dash ??= new ImmutableDashStyle(new double[] { 2, 2 }, 1);
-
-        /// <summary>
-        /// Represents a dotted <see cref="DashStyle"/>.
-        /// </summary>
-        public static IDashStyle Dot => s_dot ??= new ImmutableDashStyle(new double[] { 0, 2 }, 0);
-
-        /// <summary>
-        /// Represents a dashed dotted <see cref="DashStyle"/>.
-        /// </summary>
-        public static IDashStyle DashDot => s_dashDot ??= new ImmutableDashStyle(new double[] { 2, 2, 0, 2 }, 1);
-
-        /// <summary>
-        /// Represents a dashed double dotted <see cref="DashStyle"/>.
-        /// </summary>
-        public static IDashStyle DashDotDot => s_dashDotDot ??= new ImmutableDashStyle(new double[] { 2, 2, 0, 2, 0, 2 }, 1);
-
-        /// <summary>
-        /// Gets or sets the length of alternating dashes and gaps.
-        /// </summary>
-        public AvaloniaList<double> Dashes
-        {
-            get => GetValue(DashesProperty);
-            set => SetValue(DashesProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets how far in the dash sequence the stroke will start.
-        /// </summary>
-        public double Offset
-        {
-            get => GetValue(OffsetProperty);
-            set => SetValue(OffsetProperty, value);
-        }
-
-        IReadOnlyList<double> IDashStyle.Dashes => Dashes;
-
-        /// <summary>
-        /// Raised when the dash style changes.
-        /// </summary>
-        public event EventHandler? Invalidated;
-
-        /// <summary>
-        /// Returns an immutable clone of the <see cref="DashStyle"/>.
-        /// </summary>
-        /// <returns></returns>
-        public ImmutableDashStyle ToImmutable() => new ImmutableDashStyle(Dashes, Offset);
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == DashesProperty)
-            {
-                var oldValue = change.OldValue.GetValueOrDefault<AvaloniaList<double>>();
-                var newValue = change.NewValue.GetValueOrDefault<AvaloniaList<double>>();
-
-                if (oldValue is object)
-                {
-                    oldValue.CollectionChanged -= DashesChanged;
-                }
-
-                if (newValue is object)
-                {
-                    newValue.CollectionChanged += DashesChanged;
-                }
-            }
-        }
-
-        private void DashesChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            Invalidated?.Invoke(this, e);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/DrawingContext.cs b/src/Avalonia.Visuals/Media/DrawingContext.cs
deleted file mode 100644
index d0a73ca9a8..0000000000
--- a/src/Avalonia.Visuals/Media/DrawingContext.cs
+++ /dev/null
@@ -1,451 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Platform;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Threading;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media
-{
-    public sealed class DrawingContext : IDisposable
-    {
-        private readonly bool _ownsImpl;
-        private int _currentLevel;
-
-
-        private static ThreadSafeObjectPool<Stack<PushedState>> StateStackPool { get; } =
-            ThreadSafeObjectPool<Stack<PushedState>>.Default;
-
-        private static ThreadSafeObjectPool<Stack<TransformContainer>> TransformStackPool { get; } =
-            ThreadSafeObjectPool<Stack<TransformContainer>>.Default;
-
-        private Stack<PushedState>? _states = StateStackPool.Get();
-
-        private Stack<TransformContainer>? _transformContainers = TransformStackPool.Get();
-
-        readonly struct TransformContainer
-        {
-            public readonly Matrix LocalTransform;
-            public readonly Matrix ContainerTransform;
-
-            public TransformContainer(Matrix localTransform, Matrix containerTransform)
-            {
-                LocalTransform = localTransform;
-                ContainerTransform = containerTransform;
-            }
-        }
-
-        public DrawingContext(IDrawingContextImpl impl)
-        {
-            PlatformImpl = impl;
-            _ownsImpl = true;
-        }
-        
-        public DrawingContext(IDrawingContextImpl impl, bool ownsImpl)
-        {
-            _ownsImpl = ownsImpl;
-            PlatformImpl = impl;
-        }
-
-        public IDrawingContextImpl PlatformImpl { get; }
-
-        private Matrix _currentTransform = Matrix.Identity;
-
-        private Matrix _currentContainerTransform = Matrix.Identity;
-
-        /// <summary>
-        /// Gets the current transform of the drawing context.
-        /// </summary>
-        public Matrix CurrentTransform
-        {
-            get { return _currentTransform; }
-            private set
-            {
-                _currentTransform = value;
-                var transform = _currentTransform * _currentContainerTransform;
-                PlatformImpl.Transform = transform;
-            }
-        }
-
-        //HACK: This is a temporary hack that is used in the render loop 
-        //to update TransformedBounds property
-        [Obsolete("HACK for render loop, don't use")]
-        public Matrix CurrentContainerTransform => _currentContainerTransform;
-
-        /// <summary>
-        /// Draws an image.
-        /// </summary>
-        /// <param name="source">The image.</param>
-        /// <param name="rect">The rect in the output to draw to.</param>
-        public void DrawImage(IImage source, Rect rect)
-        {
-            _ = source ?? throw new ArgumentNullException(nameof(source));
-
-            DrawImage(source, new Rect(source.Size), rect);
-        }
-
-        /// <summary>
-        /// Draws an image.
-        /// </summary>
-        /// <param name="source">The image.</param>
-        /// <param name="sourceRect">The rect in the image to draw.</param>
-        /// <param name="destRect">The rect in the output to draw to.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        public void DrawImage(IImage source, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = default)
-        {
-            _ = source ?? throw new ArgumentNullException(nameof(source));
-
-            source.Draw(this, sourceRect, destRect, bitmapInterpolationMode);
-        }
-
-        /// <summary>
-        /// Draws a line.
-        /// </summary>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="p1">The first point of the line.</param>
-        /// <param name="p2">The second point of the line.</param>
-        public void DrawLine(IPen pen, Point p1, Point p2)
-        {
-            if (PenIsVisible(pen))
-            {
-                PlatformImpl.DrawLine(pen, p1, p2);
-            }
-        }
-
-        /// <summary>
-        /// Draws a geometry.
-        /// </summary>
-        /// <param name="brush">The fill brush.</param>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="geometry">The geometry.</param>
-        public void DrawGeometry(IBrush? brush, IPen? pen, Geometry geometry)
-        {
-            if (geometry.PlatformImpl is not null)
-                DrawGeometry(brush, pen, geometry.PlatformImpl);
-        }
-
-        /// <summary>
-        /// Draws a geometry.
-        /// </summary>
-        /// <param name="brush">The fill brush.</param>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="geometry">The geometry.</param>
-        public void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry)
-        {
-            _ = geometry ?? throw new ArgumentNullException(nameof(geometry));
-
-            if (brush != null || PenIsVisible(pen))
-            {
-                PlatformImpl.DrawGeometry(brush, pen, geometry);
-            }
-        }
-
-        /// <summary>
-        /// Draws a rectangle with the specified Brush and Pen.
-        /// </summary>
-        /// <param name="brush">The brush used to fill the rectangle, or <c>null</c> for no fill.</param>
-        /// <param name="pen">The pen used to stroke the rectangle, or <c>null</c> for no stroke.</param>
-        /// <param name="rect">The rectangle bounds.</param>
-        /// <param name="radiusX">The radius in the X dimension of the rounded corners.
-        ///     This value will be clamped to the range of 0 to Width/2
-        /// </param>
-        /// <param name="radiusY">The radius in the Y dimension of the rounded corners.
-        ///     This value will be clamped to the range of 0 to Height/2
-        /// </param>
-        /// <param name="boxShadows">Box shadow effect parameters</param>
-        /// <remarks>
-        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
-        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
-        /// </remarks>
-        public void DrawRectangle(IBrush? brush, IPen? pen, Rect rect, double radiusX = 0, double radiusY = 0,
-            BoxShadows boxShadows = default)
-        {
-            if (brush == null && !PenIsVisible(pen))
-            {
-                return;
-            }
-
-            if (!MathUtilities.IsZero(radiusX))
-            {
-                radiusX = Math.Min(radiusX, rect.Width / 2);
-            }
-
-            if (!MathUtilities.IsZero(radiusY))
-            {
-                radiusY = Math.Min(radiusY, rect.Height / 2);
-            }
-
-            PlatformImpl.DrawRectangle(brush, pen, new RoundedRect(rect, radiusX, radiusY), boxShadows);
-        }
-
-        /// <summary>
-        /// Draws the outline of a rectangle.
-        /// </summary>
-        /// <param name="pen">The pen.</param>
-        /// <param name="rect">The rectangle bounds.</param>
-        /// <param name="cornerRadius">The corner radius.</param>
-        public void DrawRectangle(IPen pen, Rect rect, float cornerRadius = 0.0f)
-        {
-            DrawRectangle(null, pen, rect, cornerRadius, cornerRadius);
-        }
-
-        /// <summary>
-        /// Draws an ellipse with the specified Brush and Pen.
-        /// </summary>
-        /// <param name="brush">The brush used to fill the ellipse, or <c>null</c> for no fill.</param>
-        /// <param name="pen">The pen used to stroke the ellipse, or <c>null</c> for no stroke.</param>
-        /// <param name="center">The location of the center of the ellipse.</param>
-        /// <param name="radiusX">The horizontal radius of the ellipse.</param>
-        /// <param name="radiusY">The vertical radius of the ellipse.</param>
-        /// <remarks>
-        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
-        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
-        /// </remarks>
-        public void DrawEllipse(IBrush? brush, IPen? pen, Point center, double radiusX, double radiusY)
-        {
-            if (brush == null && !PenIsVisible(pen))
-            {
-                return;
-            }
-
-            var originX = center.X - radiusX;
-            var originY = center.Y - radiusY;
-            var width = radiusX * 2;
-            var height = radiusY * 2;
-
-            PlatformImpl.DrawEllipse(brush, pen, new Rect(originX, originY, width, height));
-        }
-
-        /// <summary>
-        /// Draws a custom drawing operation
-        /// </summary>
-        /// <param name="custom">custom operation</param>
-        public void Custom(ICustomDrawOperation custom) => PlatformImpl.Custom(custom);
-
-        /// <summary>
-        /// Draws text.
-        /// </summary>
-        /// <param name="origin">The upper-left corner of the text.</param>
-        /// <param name="text">The text.</param>
-        public void DrawText(FormattedText text, Point origin)
-        {
-            _ = text ?? throw new ArgumentNullException(nameof(text));
-         
-           text.Draw(this, origin);            
-        }
-
-        /// <summary>
-        /// Draws a glyph run.
-        /// </summary>
-        /// <param name="foreground">The foreground brush.</param>
-        /// <param name="glyphRun">The glyph run.</param>
-        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
-        {
-            _ = glyphRun ?? throw new ArgumentNullException(nameof(glyphRun));
-
-            if (foreground != null)
-            {
-                PlatformImpl.DrawGlyphRun(foreground, glyphRun);
-            }
-        }
-
-        /// <summary>
-        /// Draws a filled rectangle.
-        /// </summary>
-        /// <param name="brush">The brush.</param>
-        /// <param name="rect">The rectangle bounds.</param>
-        /// <param name="cornerRadius">The corner radius.</param>
-        public void FillRectangle(IBrush brush, Rect rect, float cornerRadius = 0.0f)
-        {
-            DrawRectangle(brush, null, rect, cornerRadius, cornerRadius);
-        }
-
-        public readonly struct PushedState : IDisposable
-        {
-            private readonly int _level;
-            private readonly DrawingContext _context;
-            private readonly Matrix _matrix;
-            private readonly PushedStateType _type;
-
-            public enum PushedStateType
-            {
-                None,
-                Matrix,
-                Opacity,
-                Clip,
-                MatrixContainer,
-                GeometryClip,
-                OpacityMask,
-            }
-
-            public PushedState(DrawingContext context, PushedStateType type, Matrix matrix = default(Matrix))
-            {
-                if (context._states is null)
-                    throw new ObjectDisposedException(nameof(DrawingContext));
-
-                _context = context;
-                _type = type;
-                _matrix = matrix;
-                _level = context._currentLevel += 1;
-                context._states.Push(this);
-            }
-
-            public void Dispose()
-            {
-                if (_type == PushedStateType.None)
-                    return;
-                if (_context._states is null || _context._transformContainers is null)
-                    throw new ObjectDisposedException(nameof(DrawingContext));
-                if (_context._currentLevel != _level)
-                    throw new InvalidOperationException("Wrong Push/Pop state order");
-                _context._currentLevel--;
-                _context._states.Pop();
-                if (_type == PushedStateType.Matrix)
-                    _context.CurrentTransform = _matrix;
-                else if (_type == PushedStateType.Clip)
-                    _context.PlatformImpl.PopClip();
-                else if (_type == PushedStateType.Opacity)
-                    _context.PlatformImpl.PopOpacity();
-                else if (_type == PushedStateType.GeometryClip)
-                    _context.PlatformImpl.PopGeometryClip();
-                else if (_type == PushedStateType.OpacityMask)
-                    _context.PlatformImpl.PopOpacityMask();
-                else if (_type == PushedStateType.MatrixContainer)
-                {
-                    var cont = _context._transformContainers.Pop();
-                    _context._currentContainerTransform = cont.ContainerTransform;
-                    _context.CurrentTransform = cont.LocalTransform;
-                }
-            }
-        }
-
-
-        public PushedState PushClip(RoundedRect clip)
-        {
-            PlatformImpl.PushClip(clip);
-            return new PushedState(this, PushedState.PushedStateType.Clip);
-        }
-
-        /// <summary>
-        /// Pushes a clip rectangle.
-        /// </summary>
-        /// <param name="clip">The clip rectangle.</param>
-        /// <returns>A disposable used to undo the clip rectangle.</returns>
-        public PushedState PushClip(Rect clip)
-        {
-            PlatformImpl.PushClip(clip);
-            return new PushedState(this, PushedState.PushedStateType.Clip);
-        }
-
-        /// <summary>
-        /// Pushes a clip geometry.
-        /// </summary>
-        /// <param name="clip">The clip geometry.</param>
-        /// <returns>A disposable used to undo the clip geometry.</returns>
-        public PushedState PushGeometryClip(Geometry clip)
-        {
-            _ = clip ?? throw new ArgumentNullException(nameof(clip));
-
-            // HACK: This check was added when nullable annotations pointed out that we're potentially
-            // pushing a null value for the clip here. Ideally we'd return an empty PushedState here but
-            // I don't want to make that change as part of adding nullable annotations.
-            if (clip.PlatformImpl is null)
-                throw new InvalidOperationException("Cannot push empty geometry clip.");
-
-            PlatformImpl.PushGeometryClip(clip.PlatformImpl);
-            return new PushedState(this, PushedState.PushedStateType.GeometryClip);
-        }
-
-        /// <summary>
-        /// Pushes an opacity value.
-        /// </summary>
-        /// <param name="opacity">The opacity.</param>
-        /// <returns>A disposable used to undo the opacity.</returns>
-        public PushedState PushOpacity(double opacity)
-        //TODO: Eliminate platform-specific push opacity call
-        {
-            PlatformImpl.PushOpacity(opacity);
-            return new PushedState(this, PushedState.PushedStateType.Opacity);
-        }
-
-        /// <summary>
-        /// Pushes an opacity mask.
-        /// </summary>
-        /// <param name="mask">The opacity mask.</param>
-        /// <param name="bounds">
-        /// The size of the brush's target area. TODO: Are we sure this is needed?
-        /// </param>
-        /// <returns>A disposable to undo the opacity mask.</returns>
-        public PushedState PushOpacityMask(IBrush mask, Rect bounds)
-        {
-            PlatformImpl.PushOpacityMask(mask, bounds);
-            return new PushedState(this, PushedState.PushedStateType.OpacityMask);
-        }
-
-        /// <summary>
-        /// Pushes a matrix post-transformation.
-        /// </summary>
-        /// <param name="matrix">The matrix</param>
-        /// <returns>A disposable used to undo the transformation.</returns>
-        public PushedState PushPostTransform(Matrix matrix) => PushSetTransform(CurrentTransform * matrix);
-
-        /// <summary>
-        /// Pushes a matrix pre-transformation.
-        /// </summary>
-        /// <param name="matrix">The matrix</param>
-        /// <returns>A disposable used to undo the transformation.</returns>
-        public PushedState PushPreTransform(Matrix matrix) => PushSetTransform(matrix * CurrentTransform);
-
-        /// <summary>
-        /// Sets the current matrix transformation.
-        /// </summary>
-        /// <param name="matrix">The matrix</param>
-        /// <returns>A disposable used to undo the transformation.</returns>
-        public PushedState PushSetTransform(Matrix matrix)
-        {
-            var oldMatrix = CurrentTransform;
-            CurrentTransform = matrix;
-
-            return new PushedState(this, PushedState.PushedStateType.Matrix, oldMatrix);
-        }
-
-        /// <summary>
-        /// Pushes a new transform context.
-        /// </summary>
-        /// <returns>A disposable used to undo the transformation.</returns>
-        public PushedState PushTransformContainer()
-        {
-            if (_transformContainers is null)
-                throw new ObjectDisposedException(nameof(DrawingContext));
-            _transformContainers.Push(new TransformContainer(CurrentTransform, _currentContainerTransform));
-            _currentContainerTransform = CurrentTransform * _currentContainerTransform;
-            _currentTransform = Matrix.Identity;
-            return new PushedState(this, PushedState.PushedStateType.MatrixContainer);
-        }
-
-        /// <summary>
-        /// Disposes of any resources held by the <see cref="DrawingContext"/>.
-        /// </summary>
-        public void Dispose()
-        {
-            if (_states is null || _transformContainers is null)
-                throw new ObjectDisposedException(nameof(DrawingContext));
-            while (_states.Count != 0)
-                _states.Peek().Dispose();
-            StateStackPool.Return(_states);
-            _states = null;
-            if (_transformContainers.Count != 0)
-                throw new InvalidOperationException("Transform container stack is non-empty");
-            TransformStackPool.Return(_transformContainers);
-            _transformContainers = null;
-            if (_ownsImpl)
-                PlatformImpl.Dispose();
-        }
-
-        private static bool PenIsVisible(IPen? pen)
-        {
-            return pen?.Brush != null && pen.Thickness > 0;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/DrawingImage.cs b/src/Avalonia.Visuals/Media/DrawingImage.cs
deleted file mode 100644
index 488822b693..0000000000
--- a/src/Avalonia.Visuals/Media/DrawingImage.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using Avalonia.Data;
-using Avalonia.Metadata;
-using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// An <see cref="IImage"/> that uses a <see cref="Drawing"/> for content.
-    /// </summary>
-    public class DrawingImage : AvaloniaObject, IImage, IAffectsRender
-    {
-        public DrawingImage() 
-        { 
-        }
-
-        public DrawingImage(Drawing drawing)
-        {
-            Drawing = drawing;
-        }
-        /// <summary>
-        /// Defines the <see cref="Drawing"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Drawing> DrawingProperty =
-            AvaloniaProperty.Register<DrawingImage, Drawing>(nameof(Drawing));
-
-        /// <inheritdoc/>
-        public event EventHandler? Invalidated;
-
-        /// <summary>
-        /// Gets or sets the drawing content.
-        /// </summary>
-        [Content]
-        public Drawing Drawing
-        {
-            get => GetValue(DrawingProperty);
-            set => SetValue(DrawingProperty, value);
-        }
-
-        /// <inheritdoc/>
-        public Size Size => Drawing?.GetBounds().Size ?? default;
-
-        /// <inheritdoc/>
-        void IImage.Draw(
-            DrawingContext context,
-            Rect sourceRect,
-            Rect destRect,
-            BitmapInterpolationMode bitmapInterpolationMode)
-        {
-            var drawing = Drawing;
-
-            if (drawing == null)
-            {
-                return;
-            }
-
-            var bounds = drawing.GetBounds();
-            var scale = Matrix.CreateScale(
-                destRect.Width / sourceRect.Width,
-                destRect.Height / sourceRect.Height);
-            var translate = Matrix.CreateTranslation(
-                -sourceRect.X + destRect.X - bounds.X,
-                -sourceRect.Y + destRect.Y - bounds.Y);
-
-            using (context.PushClip(destRect))
-            using (context.PushPreTransform(translate * scale))
-            {
-                Drawing?.Draw(context);
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == DrawingProperty)
-            {
-                RaiseInvalidated(EventArgs.Empty);
-            }
-        }
-
-        /// <summary>
-        /// Raises the <see cref="Invalidated"/> event.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/ExperimentalAcrylicMaterial.cs b/src/Avalonia.Visuals/Media/ExperimentalAcrylicMaterial.cs
deleted file mode 100644
index cdea5f5fa3..0000000000
--- a/src/Avalonia.Visuals/Media/ExperimentalAcrylicMaterial.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-using System;
-
-namespace Avalonia.Media
-{
-    public class ExperimentalAcrylicMaterial : AvaloniaObject, IMutableExperimentalAcrylicMaterial
-    {
-        private Color _effectiveTintColor;
-        private Color _effectiveLuminosityColor;
-
-        static ExperimentalAcrylicMaterial()
-        {
-            AffectsRender<ExperimentalAcrylicMaterial>(
-                TintColorProperty,
-                BackgroundSourceProperty,
-                TintOpacityProperty,
-                MaterialOpacityProperty,
-                PlatformTransparencyCompensationLevelProperty);
-
-            TintColorProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
-            {
-                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
-                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
-            });
-
-            TintOpacityProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
-            {
-                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
-                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
-            });
-
-            MaterialOpacityProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
-            {
-                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
-                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
-            });
-
-            PlatformTransparencyCompensationLevelProperty.Changed.AddClassHandler<ExperimentalAcrylicMaterial>((b, e) =>
-            {
-                b._effectiveTintColor = GetEffectiveTintColor(b.TintColor, b.TintOpacity);
-                b._effectiveLuminosityColor = b.GetEffectiveLuminosityColor();
-            });
-        }
-
-        /// <summary>
-        /// Defines the <see cref="TintColor"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Color> TintColorProperty =
-            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, Color>(nameof(TintColor));
-
-        /// <summary>
-        /// Defines the <see cref="BackgroundSource"/> property.
-        /// </summary>
-        public static readonly StyledProperty<AcrylicBackgroundSource> BackgroundSourceProperty =
-            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, AcrylicBackgroundSource>(nameof(BackgroundSource));
-
-        /// <summary>
-        /// Defines the <see cref="TintOpacity"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> TintOpacityProperty =
-            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, double>(nameof(TintOpacity), 0.8);
-
-        /// <summary>
-        /// Defines the <see cref="MaterialOpacity"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MaterialOpacityProperty =
-            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, double>(nameof(MaterialOpacity), 0.5);
-
-        /// <summary>
-        /// Defines the <see cref="PlatformTransparencyCompensationLevel"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> PlatformTransparencyCompensationLevelProperty =
-            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, double>(nameof(PlatformTransparencyCompensationLevel), 0.0);
-
-        /// <summary>
-        /// Defines the <see cref="FallbackColor"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Color> FallbackColorProperty =
-            AvaloniaProperty.Register<ExperimentalAcrylicMaterial, Color>(nameof(FallbackColor));
-
-        /// <inheritdoc/>
-        public event EventHandler? Invalidated;
-
-        /// <summary>
-        /// Gets or Sets the BackgroundSource <seealso cref="AcrylicBackgroundSource"/>.
-        /// </summary>
-        public AcrylicBackgroundSource BackgroundSource
-        {
-            get => GetValue(BackgroundSourceProperty);
-            set => SetValue(BackgroundSourceProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or Sets the TintColor.
-        /// </summary>
-        public Color TintColor
-        {
-            get => GetValue(TintColorProperty);
-            set => SetValue(TintColorProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or Sets the Tint Opacity.
-        /// </summary>
-        public double TintOpacity
-        {
-            get => GetValue(TintOpacityProperty);
-            set => SetValue(TintOpacityProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or Sets the Fallback Color.
-        /// This is used on rendering plaforms that dont support acrylic.
-        /// </summary>
-        public Color FallbackColor
-        {
-            get => GetValue(FallbackColorProperty);
-            set => SetValue(FallbackColorProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or Sets the MaterialOpacity.
-        /// This makes the material more or less opaque.
-        /// </summary>
-        public double MaterialOpacity
-        {
-            get => GetValue(MaterialOpacityProperty);
-            set => SetValue(MaterialOpacityProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or Sets the PlatformTransparencyCompensationLevel.
-        /// This value defines the minimum <see cref="MaterialOpacity"/> that can be used.
-        /// It means material opacity is re-scaled from this value to 1.
-        /// </summary>
-        public double PlatformTransparencyCompensationLevel
-        {
-            get => GetValue(PlatformTransparencyCompensationLevelProperty);
-            set => SetValue(PlatformTransparencyCompensationLevelProperty, value);
-        }
-
-        Color IExperimentalAcrylicMaterial.MaterialColor => _effectiveLuminosityColor;
-
-        Color IExperimentalAcrylicMaterial.TintColor => _effectiveTintColor;
-
-        private struct HsvColor
-        {
-            public float Hue { get; set; }
-            public float Saturation { get; set; }
-            public float Value { get; set; }
-        }
-
-        private static HsvColor RgbToHsv(Color color)
-        {
-            var r = color.R / 255.0f;
-            var g = color.G / 255.0f;
-            var b = color.B / 255.0f;
-            var max = Math.Max(r, Math.Max(g, b));
-            var min = Math.Min(r, Math.Min(g, b));
-
-            float h, s, v;
-            h = v = max;
-
-            var d = max - min;
-            s = max == 0 ? 0 : d / max;
-
-            if (max == min)
-            {
-                h = 0; // achromatic
-            }
-            else
-            {
-                if (max == r)
-                {
-                    h = (g - b) / d + (g < b ? 6 : 0);
-                }
-                else if (max == g)
-                {
-                    h = (b - r) / d + 2;
-                }
-                else if (max == b)
-                {
-                    h = (r - g) / d + 4;
-                }
-
-                h /= 6;
-            }
-
-            return new HsvColor { Hue = h, Saturation = s, Value = v };
-        }
-
-        private static Color GetEffectiveTintColor(Color tintColor, double tintOpacity)
-        {
-            // Update tintColor's alpha with the combined opacity value
-            double tintOpacityModifier = GetTintOpacityModifier(tintColor);
-
-            return new Color((byte)(255 * ((255.0 / tintColor.A) * tintOpacity) * tintOpacityModifier), tintColor.R, tintColor.G, tintColor.B);
-        }
-
-        private static double GetTintOpacityModifier(Color tintColor)
-        {
-            // This method supresses the maximum allowable tint opacity depending on the luminosity and saturation of a color by 
-            // compressing the range of allowable values - for example, a user-defined value of 100% will be mapped to 45% for pure 
-            // white (100% luminosity), 85% for pure black (0% luminosity), and 90% for pure gray (50% luminosity).  The intensity of 
-            // the effect increases linearly as luminosity deviates from 50%.  After this effect is calculated, we cancel it out
-            // linearly as saturation increases from zero.
-
-            const double midPoint = 0.5; // Mid point of HsvV range that these calculations are based on. This is here for easy tuning.
-
-            const double whiteMaxOpacity = 0.2; // 100% luminosity
-            const double midPointMaxOpacity = 0.45; // 50% luminosity
-            const double blackMaxOpacity = 0.45; // 0% luminosity
-
-            var hsv = RgbToHsv(tintColor);
-
-            double opacityModifier = midPointMaxOpacity;
-
-            if (hsv.Value != midPoint)
-            {
-                // Determine maximum suppression amount
-                double lowestMaxOpacity = midPointMaxOpacity;
-                double maxDeviation = midPoint;
-
-                if (hsv.Value > midPoint)
-                {
-                    lowestMaxOpacity = whiteMaxOpacity; // At white (100% hsvV)
-                    maxDeviation = 1 - maxDeviation;
-                }
-                else if (hsv.Value < midPoint)
-                {
-                    lowestMaxOpacity = blackMaxOpacity; // At black (0% hsvV)
-                }
-
-                double maxOpacitySuppression = midPointMaxOpacity - lowestMaxOpacity;
-
-                // Determine normalized deviation from the midpoint
-                double deviation = Math.Abs(hsv.Value - midPoint);
-                double normalizedDeviation = deviation / maxDeviation;
-
-                // If we have saturation, reduce opacity suppression to allow that color to come through more
-                if (hsv.Saturation > 0)
-                {
-                    // Dampen opacity suppression based on how much saturation there is
-                    maxOpacitySuppression *= Math.Max(1 - (hsv.Saturation * 2), 0.0);
-                }
-
-                double opacitySuppression = maxOpacitySuppression * normalizedDeviation;
-
-                opacityModifier = midPointMaxOpacity - opacitySuppression;
-            }
-
-            return opacityModifier;
-        }
-
-        private Color GetEffectiveLuminosityColor()
-        {
-            double? luminosityOpacity = MaterialOpacity;
-
-            return GetLuminosityColor(luminosityOpacity);
-        }
-
-        private static byte Trim(double value)
-        {
-            value = Math.Min(Math.Floor(value * 256), 255);
-
-            if (value < 0)
-            {
-                return 0;
-            }
-            else if (value > 255)
-            {
-                return 255;
-            }
-
-            return (byte)value;
-        }
-
-        private static float RGBMax(Color color)
-        {
-            if (color.R > color.G)
-                return (color.R > color.B) ? color.R : color.B;
-            else
-                return (color.G > color.B) ? color.G : color.B;
-        }
-
-        private static float RGBMin(Color color)
-        {
-            if (color.R < color.G)
-                return (color.R < color.B) ? color.R : color.B;
-            else
-                return (color.G < color.B) ? color.G : color.B;
-        }
-
-        // The tintColor passed into this method should be the original, unmodified color created using user values for TintColor + TintOpacity
-        private Color GetLuminosityColor(double? luminosityOpacity)
-        {
-            // Calculate the HSL lightness value of the color.
-            var max = (float)RGBMax(TintColor) / 255.0f;
-            var min = (float)RGBMin(TintColor) / 255.0f;
-
-            var lightness = (max + min) / 2.0;
-
-            lightness = 1 - ((1 - lightness) * (luminosityOpacity ?? 1));
-
-            lightness = 0.13 + (lightness * 0.74);
-
-            var luminosityColor = new Color(255, Trim(lightness), Trim(lightness), Trim(lightness));
-
-            var compensationMultiplier = 1 - PlatformTransparencyCompensationLevel;
-            return new Color((byte)(255 * Math.Max(Math.Min(PlatformTransparencyCompensationLevel + ((luminosityOpacity ?? 1) * compensationMultiplier), 1.0), 0.0)), luminosityColor.R, luminosityColor.G, luminosityColor.B);
-        }
-
-        /// <summary>
-        /// Marks a property as affecting the brush's visual representation.
-        /// </summary>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a brush's static constructor, any change to the
-        /// property will cause the <see cref="Invalidated"/> event to be raised on the brush.
-        /// </remarks>
-        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
-            where T : ExperimentalAcrylicMaterial
-        {
-            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
-            {
-                (e.Sender as T)?.RaiseInvalidated(EventArgs.Empty);
-            }
-
-            foreach (var property in properties)
-            {
-                property.Changed.Subscribe(e => Invalidate(e));
-            }
-        }
-
-        /// <summary>
-        /// Raises the <see cref="Invalidated"/> event.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-
-        public IExperimentalAcrylicMaterial ToImmutable()
-        {
-            return new ImmutableExperimentalAcrylicMaterial(this);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs b/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs
deleted file mode 100644
index a54dad7623..0000000000
--- a/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Platform;
-
-namespace Avalonia.Media.Fonts
-{
-    public static class FontFamilyLoader
-    {
-        /// <summary>
-        /// Loads all font assets that belong to the specified <see cref="FontFamilyKey"/>
-        /// </summary>
-        /// <param name="fontFamilyKey"></param>
-        /// <returns></returns>
-        public static IEnumerable<Uri> LoadFontAssets(FontFamilyKey fontFamilyKey)
-        {
-            var sourceWithoutArguments = fontFamilyKey.Source.OriginalString.Split('?').First();
-
-            if (sourceWithoutArguments.EndsWith(".ttf")
-                || sourceWithoutArguments.EndsWith(".otf"))
-            {
-                return GetFontAssetsByExpression(fontFamilyKey);
-            }
-
-            return GetFontAssetsBySource(fontFamilyKey);
-        }
-
-        /// <summary>
-        /// Searches for font assets at a given location and returns a quantity of found assets
-        /// </summary>
-        /// <param name="fontFamilyKey"></param>
-        /// <returns></returns>
-        private static IEnumerable<Uri> GetFontAssetsBySource(FontFamilyKey fontFamilyKey)
-        {
-            var assetLoader = AvaloniaLocator.Current.GetRequiredService<IAssetLoader>();
-            var availableAssets = assetLoader.GetAssets(fontFamilyKey.Source, fontFamilyKey.BaseUri);
-
-            var matchingAssets =
-                availableAssets.Where(x => x.AbsolutePath.EndsWith(".ttf") || x.AbsolutePath.EndsWith(".otf"));
-
-            return matchingAssets;
-        }
-
-        /// <summary>
-        /// Searches for font assets at a given location and only accepts assets that fit to a given filename expression.
-        /// <para>File names can target multiple files with * wildcard. For example "FontFile*.ttf"</para>
-        /// </summary>
-        /// <param name="fontFamilyKey"></param>
-        /// <returns></returns>
-        private static IEnumerable<Uri> GetFontAssetsByExpression(FontFamilyKey fontFamilyKey)
-        {
-            var assetLoader = AvaloniaLocator.Current.GetRequiredService<IAssetLoader>();
-
-            var fileName = GetFileName(fontFamilyKey, out var fileExtension, out var location);
-
-            var availableResources = assetLoader.GetAssets(location, fontFamilyKey.BaseUri);
-
-            string compareTo;
-
-            if (fontFamilyKey.Source.IsAbsoluteUri)
-            {
-                if (fontFamilyKey.Source.Scheme == "resm")
-                {
-                    compareTo = location.AbsolutePath + "." + fileName.Split('*').First();
-                }
-                else
-                {
-                    compareTo = location.AbsolutePath + fileName.Split('*').First();
-                }
-            }
-            else
-            {
-                compareTo = location.AbsolutePath + fileName.Split('*').First();
-            }
-
-            var matchingResources = availableResources.Where(
-                x => x.AbsolutePath.Contains(compareTo)
-                     && x.AbsolutePath.EndsWith(fileExtension));
-
-            return matchingResources;
-        }
-
-        private static string GetFileName(FontFamilyKey fontFamilyKey, out string fileExtension, out Uri location)
-        {
-            if (fontFamilyKey.Source.IsAbsoluteUri && fontFamilyKey.Source.Scheme == "resm")
-            {
-                fileExtension = "." + fontFamilyKey.Source.AbsolutePath.Split('.').LastOrDefault();
-
-                var fileName = fontFamilyKey.Source.LocalPath.Replace(fileExtension, string.Empty).Split('.').Last();
-
-                location = new Uri(fontFamilyKey.Source.AbsoluteUri.Replace("." + fileName + fileExtension, string.Empty), UriKind.RelativeOrAbsolute);
-
-                return fileName;
-            }
-
-            var pathSegments = fontFamilyKey.Source.OriginalString.Split('/');
-
-            var fileNameWithExtension = pathSegments.Last();
-
-            var fileNameSegments = fileNameWithExtension.Split('.');
-
-            fileExtension = "." + fileNameSegments.Last();
-
-            if (fontFamilyKey.BaseUri != null)
-            {
-                var relativePath = fontFamilyKey.Source.OriginalString
-                    .Replace(fileNameWithExtension, string.Empty);
-
-                location = new Uri(fontFamilyKey.BaseUri, relativePath);
-            }
-            else
-            {
-                location = new Uri(fontFamilyKey.Source.AbsolutePath.Replace(fileNameWithExtension, string.Empty));
-            }
-
-            return fileNameSegments.First();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/FormattedText.cs b/src/Avalonia.Visuals/Media/FormattedText.cs
deleted file mode 100644
index 12c40e4d59..0000000000
--- a/src/Avalonia.Visuals/Media/FormattedText.cs
+++ /dev/null
@@ -1,1415 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using Avalonia.Media.TextFormatting;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// The FormattedText class is targeted at programmers needing to add some simple text to a MIL visual.
-    /// </summary>
-    public class FormattedText
-    {
-        public const double DefaultRealToIdeal = 28800.0 / 96;
-        public const double DefaultIdealToReal = 1 / DefaultRealToIdeal;
-        public const int IdealInfiniteWidth = 0x3FFFFFFE;
-        public const double RealInfiniteWidth = IdealInfiniteWidth * DefaultIdealToReal;
-
-        public const double GreatestMultiplierOfEm = 100;
-
-        private const double MaxFontEmSize = RealInfiniteWidth / GreatestMultiplierOfEm;
-
-        // properties and format runs
-        private ReadOnlySlice<char> _text;
-        private readonly SpanVector _formatRuns = new SpanVector(null);
-        private SpanPosition _latestPosition;
-
-        private GenericTextParagraphProperties _defaultParaProps;
-
-        private double _maxTextWidth = double.PositiveInfinity;
-        private double[]? _maxTextWidths;
-        private double _maxTextHeight = double.PositiveInfinity;
-        private int _maxLineCount = int.MaxValue;
-        private TextTrimming _trimming = TextTrimming.WordEllipsis;
-
-        // text source callbacks
-        private TextSourceImplementation? _textSourceImpl;
-
-        // cached metrics
-        private CachedMetrics? _metrics;
-
-        /// <summary>
-        /// Construct a FormattedText object.
-        /// </summary>
-        /// <param name="textToFormat">String of text to be displayed.</param>
-        /// <param name="culture">Culture of text.</param>
-        /// <param name="flowDirection">Flow direction of text.</param>
-        /// <param name="typeface">Type face used to display text.</param>
-        /// <param name="emSize">Font em size in visual units (1/96 of an inch).</param>
-        /// <param name="foreground">Foreground brush used to render text.</param>
-        public FormattedText(
-            string textToFormat,
-            CultureInfo culture,
-            FlowDirection flowDirection,
-            Typeface typeface,
-            double emSize,
-            IBrush foreground)
-        {
-            if (culture is null)
-            {
-                throw new ArgumentNullException(nameof(culture));
-            }
-
-            ValidateFlowDirection(flowDirection, nameof(flowDirection));
-
-            ValidateFontSize(emSize);
-
-            _text = textToFormat != null ?
-                new ReadOnlySlice<char>(textToFormat.AsMemory()) :
-                throw new ArgumentNullException(nameof(textToFormat));
-
-            var runProps = new GenericTextRunProperties(
-                typeface,
-                emSize,
-                null, // decorations
-                foreground,
-                null, // highlight background
-                BaselineAlignment.Baseline,
-                culture
-            );
-
-            _latestPosition = _formatRuns.SetValue(0, _text.Length, runProps, _latestPosition);
-
-            _defaultParaProps = new GenericTextParagraphProperties(
-                flowDirection,
-                TextAlignment.Left,
-                false,
-                false,
-                runProps,
-                TextWrapping.WrapWithOverflow,
-                0, // line height not specified
-                0 // indentation not specified
-            );
-
-            InvalidateMetrics();
-        }
-
-        private static void ValidateFontSize(double emSize)
-        {
-            if (emSize <= 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(emSize), "The parameter value must be greater than zero.");
-            }
-
-            if (emSize > MaxFontEmSize)
-            {
-                throw new ArgumentOutOfRangeException(nameof(emSize), $"The parameter value cannot be greater than '{MaxFontEmSize}'");
-            }
-
-            if (double.IsNaN(emSize))
-            {
-                throw new ArgumentOutOfRangeException(nameof(emSize), "The parameter value must be a number.");
-            }
-        }
-
-        private static void ValidateFlowDirection(FlowDirection flowDirection, string parameterName)
-        {
-            if ((int)flowDirection < 0 || (int)flowDirection > (int)FlowDirection.RightToLeft)
-            {
-                throw new InvalidEnumArgumentException(parameterName, (int)flowDirection, typeof(FlowDirection));
-            }
-        }
-
-        private int ValidateRange(int startIndex, int count)
-        {
-            if (startIndex < 0 || startIndex > _text.Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(startIndex));
-            }
-
-            var limit = startIndex + count;
-
-            if (count < 0 || limit < startIndex || limit > _text.Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(count));
-            }
-
-            return limit;
-        }
-
-        private void InvalidateMetrics()
-        {
-            _metrics = null;
-        }
-
-        /// <summary>
-        /// Sets foreground brush used for drawing text
-        /// </summary>
-        /// <param name="foregroundBrush">Foreground brush</param>
-        public void SetForegroundBrush(IBrush foregroundBrush)
-        {
-            SetForegroundBrush(foregroundBrush, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets foreground brush used for drawing text
-        /// </summary>
-        /// <param name="foregroundBrush">Foreground brush</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetForegroundBrush(IBrush foregroundBrush, int startIndex, int count)
-        {
-            var limit = ValidateRange(startIndex, count);
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                if (runProps.ForegroundBrush == foregroundBrush)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    runProps.Typeface,
-                    runProps.FontRenderingEmSize,
-                    runProps.TextDecorations,
-                    foregroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                );
-
-#pragma warning restore 6506
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
-                    newProps, formatRider.SpanPosition);
-            }
-        }
-
-        /// <summary>
-        /// Sets or changes the font family for the text object 
-        /// </summary>
-        /// <param name="fontFamily">Font family name</param>
-        public void SetFontFamily(string fontFamily)
-        {
-            SetFontFamily(fontFamily, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the font family for the text object 
-        /// </summary>
-        /// <param name="fontFamily">Font family name</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetFontFamily(string fontFamily, int startIndex, int count)
-        {
-            if (fontFamily == null)
-            {
-                throw new ArgumentNullException(nameof(fontFamily));
-            }
-
-            SetFontFamily(new FontFamily(fontFamily), startIndex, count);
-        }
-
-        /// <summary>
-        /// Sets or changes the font family for the text object 
-        /// </summary>
-        /// <param name="fontFamily">Font family</param>
-        public void SetFontFamily(FontFamily fontFamily)
-        {
-            SetFontFamily(fontFamily, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the font family for the text object 
-        /// </summary>
-        /// <param name="fontFamily">Font family</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetFontFamily(FontFamily fontFamily, int startIndex, int count)
-        {
-            if (fontFamily == null)
-            {
-                throw new ArgumentNullException(nameof(fontFamily));
-            }
-
-            var limit = ValidateRange(startIndex, count);
-
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                var oldTypeface = runProps.Typeface;
-
-                if (fontFamily.Equals(oldTypeface.FontFamily))
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    new Typeface(fontFamily, oldTypeface.Style, oldTypeface.Weight),
-                    runProps.FontRenderingEmSize,
-                    runProps.TextDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                    );
-
-#pragma warning restore 6506
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
-                    newProps, formatRider.SpanPosition);
-
-                InvalidateMetrics();
-            }
-        }
-
-
-        /// <summary>
-        /// Sets or changes the font em size measured in MIL units
-        /// </summary>
-        /// <param name="emSize">Font em size</param>
-        public void SetFontSize(double emSize)
-        {
-            SetFontSize(emSize, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the font em size measured in MIL units
-        /// </summary>
-        /// <param name="emSize">Font em size</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetFontSize(double emSize, int startIndex, int count)
-        {
-            ValidateFontSize(emSize);
-
-            var limit = ValidateRange(startIndex, count);
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                if (runProps.FontRenderingEmSize == emSize)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    runProps.Typeface,
-                    emSize,
-                    runProps.TextDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                );
-
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
-                    newProps, formatRider.SpanPosition);
-
-#pragma warning restore 6506
-                InvalidateMetrics();
-            }
-        }
-
-        /// <summary>
-        /// Sets or changes the culture for the text object.
-        /// </summary>
-        /// <param name="culture">The new culture for the text object.</param>
-        public void SetCulture(CultureInfo culture)
-        {
-            SetCulture(culture, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the culture for the text object.
-        /// </summary>
-        /// <param name="culture">The new culture for the text object.</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetCulture(CultureInfo culture, int startIndex, int count)
-        {
-            if (culture is null)
-            {
-                throw new ArgumentNullException(nameof(culture));
-            }
-
-            var limit = ValidateRange(startIndex, count);
-
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506 
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                if (runProps.CultureInfo == culture)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    runProps.Typeface,
-                    runProps.FontRenderingEmSize,
-                    runProps.TextDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    culture
-                );
-
-#pragma warning restore 6506
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
-                    newProps, formatRider.SpanPosition);
-
-                InvalidateMetrics();
-            }
-        }
-
-        /// <summary>
-        /// Sets or changes the font weight
-        /// </summary>
-        /// <param name="weight">Font weight</param>
-        public void SetFontWeight(FontWeight weight)
-        {
-            SetFontWeight(weight, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the font weight
-        /// </summary>
-        /// <param name="weight">Font weight</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetFontWeight(FontWeight weight, int startIndex, int count)
-        {
-            var limit = ValidateRange(startIndex, count);
-
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506 
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                var oldTypeface = runProps.Typeface;
-
-                if (oldTypeface.Weight == weight)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    new Typeface(oldTypeface.FontFamily, oldTypeface.Style, weight),
-                    runProps.FontRenderingEmSize,
-                    runProps.TextDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                    );
-#pragma warning restore 6506 
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition, newProps, formatRider.SpanPosition);
-
-                InvalidateMetrics();
-            }
-        }
-
-        /// <summary>
-        /// Sets or changes the font style
-        /// </summary>
-        /// <param name="style">Font style</param>
-        public void SetFontStyle(FontStyle style)
-        {
-            SetFontStyle(style, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the font style
-        /// </summary>
-        /// <param name="style">Font style</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetFontStyle(FontStyle style, int startIndex, int count)
-        {
-            var limit = ValidateRange(startIndex, count);
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506 
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                var oldTypeface = runProps.Typeface;
-
-                if (oldTypeface.Style == style)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    new Typeface(oldTypeface.FontFamily, style, oldTypeface.Weight),
-                    runProps.FontRenderingEmSize,
-                    runProps.TextDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                    );
-#pragma warning restore 6506
-
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition, newProps, formatRider.SpanPosition);
-
-                InvalidateMetrics(); // invalidate cached metrics
-            }
-        }
-
-        /// <summary>
-        /// Sets or changes the type face
-        /// </summary>
-        /// <param name="typeface">Typeface</param>
-        public void SetFontTypeface(Typeface typeface)
-        {
-            SetFontTypeface(typeface, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the type face
-        /// </summary>
-        /// <param name="typeface">Typeface</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetFontTypeface(Typeface typeface, int startIndex, int count)
-        {
-            var limit = ValidateRange(startIndex, count);
-
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506 
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                if (runProps.Typeface == typeface)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    typeface,
-                    runProps.FontRenderingEmSize,
-                    runProps.TextDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                    );
-#pragma warning restore 6506
-
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
-                    newProps, formatRider.SpanPosition);
-
-                InvalidateMetrics();
-            }
-        }
-
-        /// <summary>
-        /// Sets or changes the text decorations
-        /// </summary>
-        /// <param name="textDecorations">Text decorations</param>
-        public void SetTextDecorations(TextDecorationCollection textDecorations)
-        {
-            SetTextDecorations(textDecorations, 0, _text.Length);
-        }
-
-        /// <summary>
-        /// Sets or changes the text decorations
-        /// </summary>
-        /// <param name="textDecorations">Text decorations</param>
-        /// <param name="startIndex">The start index of initial character to apply the change to.</param>
-        /// <param name="count">The number of characters the change should be applied to.</param>
-        public void SetTextDecorations(TextDecorationCollection textDecorations, int startIndex, int count)
-        {
-            var limit = ValidateRange(startIndex, count);
-
-            for (var i = startIndex; i < limit;)
-            {
-                var formatRider = new SpanRider(_formatRuns, _latestPosition, i);
-
-                i = Math.Min(limit, i + formatRider.Length);
-
-#pragma warning disable 6506 
-                // Presharp warns that runProps is not validated, but it can never be null 
-                // because the rider is already checked to be in range
-
-                if (!(formatRider.CurrentElement is GenericTextRunProperties runProps))
-                {
-                    throw new NotSupportedException($"{nameof(runProps)} can not be null.");
-                }
-
-                if (runProps.TextDecorations == textDecorations)
-                {
-                    continue;
-                }
-
-                var newProps = new GenericTextRunProperties(
-                    runProps.Typeface,
-                    runProps.FontRenderingEmSize,
-                    textDecorations,
-                    runProps.ForegroundBrush,
-                    runProps.BackgroundBrush,
-                    runProps.BaselineAlignment,
-                    runProps.CultureInfo
-                    );
-#pragma warning restore 6506
-
-                _latestPosition = _formatRuns.SetValue(formatRider.CurrentPosition, i - formatRider.CurrentPosition,
-                    newProps, formatRider.SpanPosition);
-            }
-        }
-
-        /// Note: enumeration is temporarily made private
-        /// because of PS #828532
-        /// 
-        /// <summary>
-        /// Strongly typed enumerator used for enumerating text lines
-        /// </summary>
-        private struct LineEnumerator : IEnumerator, IDisposable
-        {
-            private int _lineCount;
-            private double _totalHeight;
-            private TextLine? _nextLine;
-            private readonly TextFormatter _formatter;
-            private readonly FormattedText _that;
-            private readonly ITextSource _textSource;
-
-            // these are needed because _currentLine can be disposed before the next MoveNext() call
-            private double _previousHeight;
-
-            // line break before _currentLine, needed in case we have to reformat it with collapsing symbol
-            private TextLineBreak? _previousLineBreak;
-
-            internal LineEnumerator(FormattedText text)
-            {
-                _previousHeight = 0;
-                Length = 0;
-                _previousLineBreak = null;
-
-                Position = 0;
-                _lineCount = 0;
-                _totalHeight = 0;
-                Current = null;
-                _nextLine = null;
-                _formatter = TextFormatter.Current;
-                _that = text;
-                _textSource = _that._textSourceImpl ??= new TextSourceImplementation(_that);
-            }
-
-            public void Dispose()
-            {
-                Current = null;
-
-                _nextLine = null;
-            }
-
-            private int Position { get; set; }
-
-            private int Length { get; set; }
-
-            /// <summary>
-            /// Gets the current text line in the collection
-            /// </summary>
-            public TextLine? Current { get; private set; }
-
-            /// <summary>
-            /// Gets the current text line in the collection
-            /// </summary>
-            object? IEnumerator.Current => Current;
-
-            /// <summary>
-            /// Gets the paragraph width used to format the current text line
-            /// </summary>
-            internal double CurrentParagraphWidth
-            {
-                get
-                {
-                    return MaxLineLength(_lineCount);
-                }
-            }
-
-            private double MaxLineLength(int line)
-            {
-                if (_that._maxTextWidths == null)
-                    return _that._maxTextWidth;
-                return _that._maxTextWidths[Math.Min(line, _that._maxTextWidths.Length - 1)];
-            }
-
-            /// <summary>
-            /// Advances the enumerator to the next text line of the collection
-            /// </summary>
-            /// <returns>true if the enumerator was successfully advanced to the next element;
-            /// false if the enumerator has passed the end of the collection</returns>
-            public bool MoveNext()
-            {
-                if (Current == null)
-                {   // this is the first line
-                    if (_that._text.Length == 0)
-                    {
-                        return false;
-                    }
-
-                    Current = FormatLine(
-                        _textSource,
-                        Position,
-                        MaxLineLength(_lineCount),
-                        _that._defaultParaProps!,
-                        null // no previous line break
-                        );
-
-                    // check if this line fits the text height
-                    if (_totalHeight + Current.Height > _that._maxTextHeight)
-                    {
-                        Current = null;
-
-                        return false;
-                    }
-                    Debug.Assert(_nextLine == null);
-                }
-                else
-                {
-                    // there is no next line or it didn't fit
-                    // either way we're finished
-                    if (_nextLine == null)
-                    {
-                        return false;
-                    }
-
-                    _totalHeight += _previousHeight;
-                    Position += Length;
-                    ++_lineCount;
-
-                    Current = _nextLine;
-                    _nextLine = null;
-                }
-
-                var currentLineBreak = Current.TextLineBreak;
-
-                // this line is guaranteed to fit the text height
-                Debug.Assert(_totalHeight + Current.Height <= _that._maxTextHeight);
-
-                // now, check if the next line fits, we need to do this on this iteration
-                // because we might need to add ellipsis to the current line
-                // as a result of the next line measurement
-
-                // maybe there is no next line at all
-                if (Position + Current.TextRange.Length < _that._text.Length)
-                {
-                    bool nextLineFits;
-
-                    if (_lineCount + 1 >= _that._maxLineCount)
-                    {
-                        nextLineFits = false;
-                    }
-                    else
-                    {
-                        _nextLine = FormatLine(
-                            _textSource,
-                            Position + Current.TextRange.Length,
-                            MaxLineLength(_lineCount + 1),
-                            _that._defaultParaProps,
-                            currentLineBreak
-                            );
-
-                        nextLineFits = (_totalHeight + Current.Height + _nextLine.Height <= _that._maxTextHeight);
-                    }
-
-                    if (!nextLineFits)
-                    {
-                        _nextLine = null;
-
-                        if (_that._trimming != TextTrimming.None && !Current.HasCollapsed)
-                        {
-                            // recreate the current line with ellipsis added
-                            // Note: Paragraph ellipsis is not supported today. We'll workaround
-                            // it here by faking a non-wrap text on finite column width.
-                            var currentWrap = _that._defaultParaProps!.TextWrapping;
-
-                            _that._defaultParaProps.SetTextWrapping(TextWrapping.NoWrap);
-
-                            Current = FormatLine(
-                                _that._textSourceImpl!,
-                                Position,
-                                MaxLineLength(_lineCount),
-                                _that._defaultParaProps,
-                                _previousLineBreak
-                                );
-
-                            currentLineBreak = Current.TextLineBreak;
-
-                            _that._defaultParaProps.SetTextWrapping(currentWrap);
-                        }
-                    }
-                }
-
-                _previousHeight = Current.Height;
-
-                Length = Current.TextRange.Length;
-
-                _previousLineBreak = currentLineBreak;
-
-                return true;
-            }
-
-            /// <summary>
-            /// Wrapper of TextFormatter.FormatLine that auto-collapses the line if needed.
-            /// </summary>
-            private TextLine FormatLine(ITextSource textSource, int textSourcePosition, double maxLineLength, TextParagraphProperties paraProps, TextLineBreak? lineBreak)
-            {
-                var line = _formatter.FormatLine(
-                    textSource,
-                    textSourcePosition,
-                    maxLineLength,
-                    paraProps,
-                    lineBreak
-                    );
-
-                if (_that._trimming != TextTrimming.None && line.HasOverflowed && line.TextRange.Length > 0)
-                {
-                    // what I really need here is the last displayed text run of the line
-                    // textSourcePosition + line.Length - 1 works except the end of paragraph case,
-                    // where line length includes the fake paragraph break run
-                    Debug.Assert(_that._text.Length > 0 && textSourcePosition + line.TextRange.Length <= _that._text.Length + 1);
-
-                    var thatFormatRider = new SpanRider(
-                        _that._formatRuns,
-                        _that._latestPosition,
-                        Math.Min(textSourcePosition + line.TextRange.Length - 1, _that._text.Length - 1)
-                        );
-
-                    var lastRunProps = (GenericTextRunProperties)thatFormatRider.CurrentElement!;
-
-                    TextCollapsingProperties trailingEllipsis;
-
-                    if (_that._trimming == TextTrimming.CharacterEllipsis)
-                    {
-                        trailingEllipsis = new TextTrailingCharacterEllipsis(maxLineLength, lastRunProps);
-                    }
-                    else
-                    {
-                        Debug.Assert(_that._trimming == TextTrimming.WordEllipsis);
-                        trailingEllipsis = new TextTrailingWordEllipsis(maxLineLength, lastRunProps);
-                    }
-
-                    var collapsedLine = line.Collapse(trailingEllipsis);
-
-                    line = collapsedLine;
-                }
-                return line;
-            }
-
-
-            /// <summary>
-            /// Sets the enumerator to its initial position,
-            /// which is before the first element in the collection
-            /// </summary>
-            public void Reset()
-            {
-                Position = 0;
-                _lineCount = 0;
-                _totalHeight = 0;
-                Current = null;
-                _nextLine = null;
-            }
-        }
-
-        /// <summary>
-        /// Returns an enumerator that can iterate through the text line collection
-        /// </summary>
-        private LineEnumerator GetEnumerator()
-        {
-            return new LineEnumerator(this);
-        }
-#if NEVER
-        /// <summary>
-        /// Returns an enumerator that can iterate through the text line collection
-        /// </summary>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-#endif
-
-        private void AdvanceLineOrigin(ref Point lineOrigin, TextLine currentLine)
-        {
-            var height = currentLine.Height;
-
-            // advance line origin according to the flow direction
-            switch (_defaultParaProps.FlowDirection)
-            {
-                case FlowDirection.LeftToRight:
-                case FlowDirection.RightToLeft:
-                    lineOrigin = lineOrigin.WithY(lineOrigin.Y + height);
-                    break;
-            }
-        }
-
-        private class CachedMetrics
-        {
-            // vertical
-            public double Height;
-            public double Baseline;
-
-            // horizontal
-            public double Width;
-            public double WidthIncludingTrailingWhitespace;
-
-            // vertical bounding box metrics
-            public double Extent;
-            public double OverhangAfter;
-
-            // horizontal bounding box metrics
-            public double OverhangLeading;
-            public double OverhangTrailing;
-        }
-
-        /// <summary>
-        /// Defines the flow direction
-        /// </summary>
-        public FlowDirection FlowDirection
-        {
-            set
-            {
-                ValidateFlowDirection(value, "value");
-                _defaultParaProps.SetFlowDirection(value);
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _defaultParaProps.FlowDirection;
-            }
-        }
-
-        /// <summary>
-        /// Defines the alignment of text within the column
-        /// </summary>
-        public TextAlignment TextAlignment
-        {
-            set
-            {
-                _defaultParaProps.SetTextAlignment(value);
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _defaultParaProps.TextAlignment;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the height of, or the spacing between, each line where
-        /// zero represents the default line height.
-        /// </summary>
-        public double LineHeight
-        {
-            set
-            {
-                if (value < 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value), "Parameter must be greater than or equal to zero.");
-                }
-
-                _defaultParaProps.SetLineHeight(value);
-
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _defaultParaProps.LineHeight;
-            }
-        }
-
-        /// <summary>
-        /// The MaxTextWidth property defines the alignment edges for the FormattedText.
-        /// For example, left aligned text is wrapped such that the leftmost glyph alignment point
-        /// on each line falls exactly on the left edge of the rectangle.
-        /// Note that for many fonts, especially in italic style, some glyph strokes may extend beyond the edges of the alignment rectangle.
-        /// For this reason, it is recommended that clients draw text with at least 1/6 em (i.e of the font size) unused margin space either side.
-        /// Zero value of MaxTextWidth is equivalent to the maximum possible paragraph width.
-        /// </summary>
-        public double MaxTextWidth
-        {
-            set
-            {
-                if (value < 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value), "Parameter must be greater than or equal to zero.");
-                }
-
-                _maxTextWidth = value;
-
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _maxTextWidth;
-            }
-        }
-
-        /// <summary>
-        /// Sets the array of lengths,
-        /// which will be applied to each line of text in turn.
-        /// If the text covers more lines than there are entries in the length array,
-        /// the last entry is reused as many times as required.
-        /// The maxTextWidths array overrides the MaxTextWidth property.
-        /// </summary>
-        /// <param name="maxTextWidths">The max text width array</param>
-        public void SetMaxTextWidths(double[] maxTextWidths)
-        {
-            if (maxTextWidths == null || maxTextWidths.Length <= 0)
-            {
-                throw new ArgumentNullException(nameof(maxTextWidths));
-            }
-
-            _maxTextWidths = maxTextWidths;
-
-            InvalidateMetrics();
-        }
-
-        /// <summary>
-        /// Obtains a copy of the array of lengths,
-        /// which will be applied to each line of text in turn.
-        /// If the text covers more lines than there are entries in the length array,
-        /// the last entry is reused as many times as required.
-        /// The maxTextWidths array overrides the MaxTextWidth property.
-        /// </summary>
-        /// <returns>The copy of max text width array</returns>
-        public double[] GetMaxTextWidths()
-        {
-            return _maxTextWidths != null ? (double[])_maxTextWidths.Clone() : Array.Empty<double>();
-        }
-
-        /// <summary>
-        /// Sets the maximum length of a column of text.
-        /// The last line of text displayed is the last whole line that will fit within this limit,
-        /// or the nth line as specified by MaxLineCount, whichever occurs first.
-        /// Use the Trimming property to control how the omission of text is indicated.
-        /// </summary>
-        public double MaxTextHeight
-        {
-            set
-            {
-                if (value <= 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value), $"'{nameof(MaxTextHeight)}' property value must be greater than zero.");
-                }
-
-                if (double.IsNaN(value))
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value), $"'{nameof(MaxTextHeight)}' property value cannot be NaN.");
-                }
-
-                _maxTextHeight = value;
-
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _maxTextHeight;
-            }
-        }
-
-        /// <summary>
-        /// Defines the maximum number of lines to display.
-        /// The last line of text displayed is the lineCount-1'th line,
-        /// or the last whole line that will fit within the count set by MaxTextHeight,
-        /// whichever occurs first.
-        /// Use the Trimming property to control how the omission of text is indicated
-        /// </summary>
-        public int MaxLineCount
-        {
-            set
-            {
-                if (value <= 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value), "The parameter value must be greater than zero.");
-                }
-
-                _maxLineCount = value;
-
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _maxLineCount;
-            }
-        }
-
-        /// <summary>
-        /// Defines how omission of text is indicated.
-        /// CharacterEllipsis trimming allows partial words to be displayed,
-        /// while WordEllipsis removes whole words to fit.
-        /// Both guarantee to include an ellipsis ('...') at the end of the lines
-        /// where text has been trimmed as a result of line and column limits.
-        /// </summary>
-        public TextTrimming Trimming
-        {
-            set
-            {
-                if ((int)value < 0 || (int)value > (int)TextTrimming.WordEllipsis)
-                {
-                    throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(TextTrimming));
-                }
-
-                _trimming = value;
-
-                _defaultParaProps.SetTextWrapping(_trimming == TextTrimming.None ?
-                    TextWrapping.Wrap :
-                    TextWrapping.WrapWithOverflow);
-
-                InvalidateMetrics();
-            }
-            get
-            {
-                return _trimming;
-            }
-        }
-
-        /// <summary>
-        /// Lazily initializes the cached metrics EXCEPT for black box metrics and
-        /// returns the CachedMetrics structure.
-        /// </summary>
-        private CachedMetrics Metrics
-        {
-            get
-            {
-                return _metrics ??= DrawAndCalculateMetrics(
-                    null, // drawing context
-                    new Point(), // drawing offset
-                    false);
-            }
-        }
-
-        /// <summary>
-        /// Lazily initializes the cached metrics INCLUDING black box metrics and
-        /// returns the CachedMetrics structure.
-        /// </summary>
-        private CachedMetrics BlackBoxMetrics
-        {
-            get
-            {
-                if (_metrics == null || double.IsNaN(_metrics.Extent))
-                {
-                    // We need to obtain the metrics, including black box metrics.
-
-                    _metrics = DrawAndCalculateMetrics(
-                        null,           // drawing context
-                        new Point(),    // drawing offset
-                        true);          // calculate black box metrics
-                }
-                return _metrics;
-            }
-        }
-
-        /// <summary>
-        /// The distance from the top of the first line to the bottom of the last line.
-        /// </summary>
-        public double Height
-        {
-            get
-            {
-                return Metrics.Height;
-            }
-        }
-
-        /// <summary>
-        /// The distance from the topmost black pixel of the first line
-        /// to the bottommost black pixel of the last line. 
-        /// </summary>
-        public double Extent
-        {
-            get
-            {
-                return BlackBoxMetrics.Extent;
-            }
-        }
-
-        /// <summary>
-        /// The distance from the top of the first line to the baseline of the first line.
-        /// </summary>
-        public double Baseline
-        {
-            get
-            {
-                return Metrics.Baseline;
-            }
-        }
-
-        /// <summary>
-        /// The distance from the bottom of the last line to the extent bottom.
-        /// </summary>
-        public double OverhangAfter
-        {
-            get
-            {
-                return BlackBoxMetrics.OverhangAfter;
-            }
-        }
-
-        /// <summary>
-        /// The maximum distance from the leading black pixel to the leading alignment point of a line.
-        /// </summary>
-        public double OverhangLeading
-        {
-            get
-            {
-                return BlackBoxMetrics.OverhangLeading;
-            }
-        }
-
-        /// <summary>
-        /// The maximum distance from the trailing black pixel to the trailing alignment point of a line.
-        /// </summary>
-        public double OverhangTrailing
-        {
-            get
-        {
-                return BlackBoxMetrics.OverhangTrailing;
-            }
-        }
-
-        /// <summary>
-        /// The maximum advance width between the leading and trailing alignment points of a line,
-        /// excluding the width of whitespace characters at the end of the line.
-        /// </summary>
-        public double Width
-        {
-            get
-            {
-                return Metrics.Width;
-            }
-        }
-
-        /// <summary>
-        /// The maximum advance width between the leading and trailing alignment points of a line,
-        /// including the width of whitespace characters at the end of the line.
-        /// </summary>
-        public double WidthIncludingTrailingWhitespace
-        {
-            get
-            {
-                return Metrics.WidthIncludingTrailingWhitespace;
-            }
-        }
-
-        /// <summary>
-        /// Draws the text object
-        /// </summary>
-        internal void Draw(DrawingContext drawingContext, Point origin)
-        {
-            var lineOrigin = origin;
-
-            if (_metrics != null && !double.IsNaN(_metrics.Extent))
-            {
-                // we can't use foreach because it requires GetEnumerator and associated classes to be public
-                // foreach (TextLine currentLine in this)
-                using (var enumerator = GetEnumerator())
-                {
-                    while (enumerator.MoveNext())
-                    {
-                        var currentLine = enumerator.Current!;
-
-                        currentLine.Draw(drawingContext, lineOrigin);
-
-                        AdvanceLineOrigin(ref lineOrigin, currentLine);
-                    }
-                }
-            }
-            else
-            {
-                // Calculate metrics as we draw to avoid formatting again if we need metrics later; we compute
-                // black box metrics too because these are already known as a side-effect of drawing
-
-                _metrics = DrawAndCalculateMetrics(drawingContext, origin, true);
-            }
-        }
-
-        private CachedMetrics DrawAndCalculateMetrics(DrawingContext? drawingContext, Point drawingOffset, bool getBlackBoxMetrics)
-        {
-            var metrics = new CachedMetrics();
-
-            if (_text.Length == 0)
-            {
-                return metrics;
-            }
-
-            // we can't use foreach because it requires GetEnumerator and associated classes to be public
-            // foreach (TextLine currentLine in this)
-
-            using (var enumerator = GetEnumerator())
-            {
-                var first = true;
-
-                double accBlackBoxLeft, accBlackBoxTop, accBlackBoxRight, accBlackBoxBottom;
-                accBlackBoxLeft = accBlackBoxTop = double.MaxValue;
-                accBlackBoxRight = accBlackBoxBottom = double.MinValue;
-
-                var origin = new Point(0, 0);
-
-                // Holds the TextLine.Start of the longest line. Thus it will hold the minimum value 
-                // of TextLine.Start among all the lines that forms the text. The overhangs (leading and trailing) 
-                // are calculated with an offset as a result of the same issue with TextLine.Start. 
-                // So, we compute this offset and remove it later from the values of the overhangs.
-                var lineStartOfLongestLine = double.MaxValue;
-
-                while (enumerator.MoveNext())
-                {
-                    // enumerator will dispose the currentLine
-                    var currentLine = enumerator.Current!;
-
-                    // if we're drawing, do it first as this will compute black box metrics as a side-effect
-                    if (drawingContext != null)
-                    {
-                        currentLine.Draw(drawingContext,
-                            new Point(origin.X + drawingOffset.X, origin.Y + drawingOffset.Y));
-                    }
-
-                    if (getBlackBoxMetrics)
-                    {
-                        var blackBoxLeft = origin.X + currentLine.Start + currentLine.OverhangLeading;
-                        var blackBoxRight = origin.X + currentLine.Start + currentLine.Width - currentLine.OverhangTrailing;
-                        var blackBoxBottom = origin.Y + currentLine.Height + currentLine.OverhangAfter;
-                        var blackBoxTop = blackBoxBottom - currentLine.Extent;
-
-                        accBlackBoxLeft = Math.Min(accBlackBoxLeft, blackBoxLeft);
-                        accBlackBoxRight = Math.Max(accBlackBoxRight, blackBoxRight);
-                        accBlackBoxBottom = Math.Max(accBlackBoxBottom, blackBoxBottom);
-                        accBlackBoxTop = Math.Min(accBlackBoxTop, blackBoxTop);
-
-                        metrics.OverhangAfter = currentLine.OverhangAfter;
-                    }
-
-                    metrics.Height += currentLine.Height;
-                    metrics.Width = Math.Max(metrics.Width, currentLine.Width);
-                    metrics.WidthIncludingTrailingWhitespace = Math.Max(metrics.WidthIncludingTrailingWhitespace, currentLine.WidthIncludingTrailingWhitespace);
-                    lineStartOfLongestLine = Math.Min(lineStartOfLongestLine, currentLine.Start);
-
-                    if (first)
-                    {
-                        metrics.Baseline = currentLine.Baseline;
-                        first = false;
-                    }
-
-                    AdvanceLineOrigin(ref origin, currentLine);
-                }
-
-                if (getBlackBoxMetrics)
-                {
-                    metrics.Extent = accBlackBoxBottom - accBlackBoxTop;
-                    metrics.OverhangLeading = accBlackBoxLeft - lineStartOfLongestLine;
-                    metrics.OverhangTrailing = metrics.Width - (accBlackBoxRight - lineStartOfLongestLine);
-                }
-                else
-                {
-                    // indicate that black box metrics are not known
-                    metrics.Extent = double.NaN;
-                }
-            }
-
-            return metrics;
-        }
-
-        private class TextSourceImplementation : ITextSource
-        {
-            private readonly FormattedText _that;
-
-            public TextSourceImplementation(FormattedText text)
-            {
-                _that = text;
-            }
-
-            /// <inheritdoc/>
-            public TextRun? GetTextRun(int textSourceCharacterIndex)
-            {
-                if (textSourceCharacterIndex >= _that._text.Length)
-                {
-                    return null;
-                }
-
-                var thatFormatRider = new SpanRider(_that._formatRuns, _that._latestPosition, textSourceCharacterIndex);
-
-                TextRunProperties properties = (GenericTextRunProperties)thatFormatRider.CurrentElement!;
-
-                var textCharacters = new TextCharacters(_that._text, textSourceCharacterIndex, thatFormatRider.Length,
-                    properties);
-
-                return textCharacters;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/GeometryDrawing.cs b/src/Avalonia.Visuals/Media/GeometryDrawing.cs
deleted file mode 100644
index e46e3a7d5f..0000000000
--- a/src/Avalonia.Visuals/Media/GeometryDrawing.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using Avalonia.Media.Immutable;
-using Avalonia.Metadata;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a drawing operation that combines 
-    /// a geometry with and brush and/or pen to produce rendered content.
-    /// </summary>
-    public class GeometryDrawing : Drawing
-    {
-        // Adding the Pen's stroke thickness here could yield wrong results due to transforms.
-        private static readonly IPen s_boundsPen = new ImmutablePen(Colors.Black.ToUint32(), 0);
-
-        /// <summary>
-        /// Defines the <see cref="Geometry"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Geometry> GeometryProperty =
-            AvaloniaProperty.Register<GeometryDrawing, Geometry>(nameof(Geometry));
-
-        /// <summary>
-        /// Defines the <see cref="Brush"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IBrush> BrushProperty =
-            AvaloniaProperty.Register<GeometryDrawing, IBrush>(nameof(Brush), Brushes.Transparent);
-
-        /// <summary>
-        /// Defines the <see cref="Pen"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Pen> PenProperty =
-            AvaloniaProperty.Register<GeometryDrawing, Pen>(nameof(Pen));
-
-        /// <summary>
-        /// Gets or sets the <see cref="Avalonia.Media.Geometry"/> that describes the shape of this <see cref="GeometryDrawing"/>.
-        /// </summary>
-        [Content]
-        public Geometry Geometry
-        {
-            get => GetValue(GeometryProperty);
-            set => SetValue(GeometryProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="Avalonia.Media.IBrush"/> used to fill the interior of the shape described by this <see cref="GeometryDrawing"/>.
-        /// </summary>
-        public IBrush Brush
-        {
-            get => GetValue(BrushProperty);
-            set => SetValue(BrushProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="Avalonia.Media.IPen"/> used to stroke this <see cref="GeometryDrawing"/>.
-        /// </summary>
-        public IPen Pen
-        {
-            get => GetValue(PenProperty);
-            set => SetValue(PenProperty, value);
-        }
-
-        public override void Draw(DrawingContext context)
-        {
-            if (Geometry != null)
-            {
-                context.DrawGeometry(Brush, Pen, Geometry);
-            }
-        }
-
-        public override Rect GetBounds()
-        {
-            return Geometry?.GetRenderBounds(s_boundsPen) ?? Rect.Empty;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/GeometryGroup.cs b/src/Avalonia.Visuals/Media/GeometryGroup.cs
deleted file mode 100644
index c6b666b2eb..0000000000
--- a/src/Avalonia.Visuals/Media/GeometryGroup.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Metadata;
-using Avalonia.Platform;
-
-#nullable enable
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a composite geometry, composed of other <see cref="Geometry"/> objects.
-    /// </summary>
-    public class GeometryGroup : Geometry
-    {
-        public static readonly DirectProperty<GeometryGroup, GeometryCollection?> ChildrenProperty =
-            AvaloniaProperty.RegisterDirect<GeometryGroup, GeometryCollection?> (
-                nameof(Children),
-                o => o.Children,
-                (o, v) => o.Children = v);
-
-        public static readonly StyledProperty<FillRule> FillRuleProperty =
-            AvaloniaProperty.Register<GeometryGroup, FillRule>(nameof(FillRule));
-
-        private GeometryCollection? _children;
-        private bool _childrenSet;
-
-        /// <summary>
-        /// Gets or sets the collection that contains the child geometries.
-        /// </summary>
-        [Content]
-        public GeometryCollection? Children
-        {
-            get => _children ??= (!_childrenSet ? new GeometryCollection() : null);
-            set
-            {
-                SetAndRaise(ChildrenProperty, ref _children, value);
-                _childrenSet = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets how the intersecting areas of the objects contained in this
-        /// <see cref="GeometryGroup"/> are combined. The default is <see cref="FillRule.EvenOdd"/>.
-        /// </summary>
-        public FillRule FillRule
-        {
-            get => GetValue(FillRuleProperty);
-            set => SetValue(FillRuleProperty, value);
-        }
-
-        public override Geometry Clone()
-        {
-            var result = new GeometryGroup { FillRule = FillRule, Transform = Transform };
-            if (_children?.Count > 0)
-                result.Children = new GeometryCollection(_children);
-            return result;
-        }
-
-        protected override IGeometryImpl? CreateDefiningGeometry()
-        {
-            if (_children?.Count > 0)
-            {
-                var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                return factory.CreateGeometryGroup(FillRule, _children);
-            }
-
-            return null;
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == ChildrenProperty || change.Property == FillRuleProperty)
-            {
-                InvalidateGeometry();
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/GlyphRun.cs b/src/Avalonia.Visuals/Media/GlyphRun.cs
deleted file mode 100644
index ec270d796a..0000000000
--- a/src/Avalonia.Visuals/Media/GlyphRun.cs
+++ /dev/null
@@ -1,761 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    ///     Represents a sequence of glyphs from a single face of a single font at a single size, and with a single rendering style.
-    /// </summary>
-    public sealed class GlyphRun : IDisposable
-    {
-        private static readonly IComparer<int> s_ascendingComparer = Comparer<int>.Default;
-        private static readonly IComparer<int> s_descendingComparer = new ReverseComparer<int>();
-
-        private IGlyphRunImpl? _glyphRunImpl;
-        private GlyphTypeface _glyphTypeface;
-        private double _fontRenderingEmSize;
-        private int _biDiLevel;
-        private Point? _baselineOrigin;
-        private GlyphRunMetrics? _glyphRunMetrics;
-
-        private ReadOnlySlice<char> _characters;
-
-        private IReadOnlyList<ushort> _glyphIndices;
-        private IReadOnlyList<double>? _glyphAdvances;
-        private IReadOnlyList<Vector>? _glyphOffsets;
-        private IReadOnlyList<int>? _glyphClusters;
-
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="GlyphRun"/> class by specifying properties of the class.
-        /// </summary>
-        /// <param name="glyphTypeface">The glyph typeface.</param>
-        /// <param name="fontRenderingEmSize">The rendering em size.</param>
-        /// <param name="glyphIndices">The glyph indices.</param>
-        /// <param name="glyphAdvances">The glyph advances.</param>
-        /// <param name="glyphOffsets">The glyph offsets.</param>
-        /// <param name="characters">The characters.</param>
-        /// <param name="glyphClusters">The glyph clusters.</param>
-        /// <param name="biDiLevel">The bidi level.</param>
-        public GlyphRun(
-            GlyphTypeface glyphTypeface,
-            double fontRenderingEmSize,
-            ReadOnlySlice<char> characters,
-            IReadOnlyList<ushort> glyphIndices,
-            IReadOnlyList<double>? glyphAdvances = null,
-            IReadOnlyList<Vector>? glyphOffsets = null,
-            IReadOnlyList<int>? glyphClusters = null,
-            int biDiLevel = 0)
-        {
-            _glyphTypeface = glyphTypeface;  
-
-            FontRenderingEmSize = fontRenderingEmSize;
-
-            Characters = characters;
-
-            _glyphIndices = glyphIndices;
-
-            GlyphAdvances = glyphAdvances;
-
-            GlyphOffsets = glyphOffsets;
-
-            GlyphClusters = glyphClusters;
-
-            BiDiLevel = biDiLevel;
-        }
-
-        /// <summary>
-        ///     Gets the <see cref="Media.GlyphTypeface"/> for the <see cref="GlyphRun"/>.
-        /// </summary>
-        public GlyphTypeface GlyphTypeface => _glyphTypeface;
-
-        /// <summary>
-        ///     Gets or sets the em size used for rendering the <see cref="GlyphRun"/>.
-        /// </summary>
-        public double FontRenderingEmSize
-        {
-            get => _fontRenderingEmSize;
-            set => Set(ref _fontRenderingEmSize, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets the conservative bounding box of the <see cref="GlyphRun"/>.
-        /// </summary>
-        public Size Size => new Size(Metrics.WidthIncludingTrailingWhitespace, Metrics.Height);
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public GlyphRunMetrics Metrics
-        {
-            get
-            {
-                _glyphRunMetrics ??= CreateGlyphRunMetrics();
-
-                return _glyphRunMetrics.Value;
-            }
-        }
-
-        /// <summary>
-        ///     Gets or sets the baseline origin of the<see cref="GlyphRun"/>.
-        /// </summary>
-        public Point BaselineOrigin
-        {
-            get
-            {
-                _baselineOrigin ??= CalculateBaselineOrigin();
-
-                return _baselineOrigin.Value;
-            }
-            set => Set(ref _baselineOrigin, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets an array of <see cref="ushort"/> values that represent the glyph indices in the rendering physical font.
-        /// </summary>
-        public IReadOnlyList<ushort> GlyphIndices
-        {
-            get => _glyphIndices;
-            set => Set(ref _glyphIndices, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets an array of <see cref="double"/> values that represent the advances corresponding to the glyph indices.
-        /// </summary>
-        public IReadOnlyList<double>? GlyphAdvances
-        {
-            get => _glyphAdvances;
-            set => Set(ref _glyphAdvances, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets an array of <see cref="Vector"/> values representing the offsets of the glyphs in the <see cref="GlyphRun"/>.
-        /// </summary>
-        public IReadOnlyList<Vector>? GlyphOffsets
-        {
-            get => _glyphOffsets;
-            set => Set(ref _glyphOffsets, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets the list of UTF16 code points that represent the Unicode content of the <see cref="GlyphRun"/>.
-        /// </summary>
-        public ReadOnlySlice<char> Characters
-        {
-            get => _characters;
-            set => Set(ref _characters, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets a list of <see cref="int"/> values representing a mapping from character index to glyph index.
-        /// </summary>
-        public IReadOnlyList<int>? GlyphClusters
-        {
-            get => _glyphClusters;
-            set => Set(ref _glyphClusters, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets the bidirectional nesting level of the <see cref="GlyphRun"/>.
-        /// </summary>
-        public int BiDiLevel
-        {
-            get => _biDiLevel;
-            set => Set(ref _biDiLevel, value);
-        }
-
-        /// <summary>
-        /// Gets the scale of the current <see cref="Media.GlyphTypeface"/>
-        /// </summary>
-        internal double Scale => FontRenderingEmSize / GlyphTypeface.DesignEmHeight;
-
-        /// <summary>
-        /// Returns <c>true</c> if the text direction is left-to-right. Otherwise, returns <c>false</c>.
-        /// </summary>
-        public bool IsLeftToRight => ((BiDiLevel & 1) == 0);
-
-        /// <summary>
-        /// The platform implementation of the <see cref="GlyphRun"/>.
-        /// </summary>
-        public IGlyphRunImpl GlyphRunImpl
-        {
-            get
-            {
-                if (_glyphRunImpl == null)
-                {
-                    Initialize();
-                }
-
-                return _glyphRunImpl!;
-            }
-        }
-
-        /// <summary>
-        /// Retrieves the offset from the leading edge of the <see cref="GlyphRun"/>
-        /// to the leading or trailing edge of a caret stop containing the specified character hit.
-        /// </summary>
-        /// <param name="characterHit">The <see cref="CharacterHit"/> to use for computing the offset.</param>
-        /// <returns>
-        /// A <see cref="double"/> that represents the offset from the leading edge of the <see cref="GlyphRun"/>
-        /// to the leading or trailing edge of a caret stop containing the character hit.
-        /// </returns>
-        public double GetDistanceFromCharacterHit(CharacterHit characterHit)
-        {
-            var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-           
-            var distance = 0.0;
-
-            if (IsLeftToRight)
-            {
-                if (GlyphClusters != null)
-                {
-                    if (characterIndex < GlyphClusters[0])
-                    {
-                        return 0;
-                    }
-
-                    if (characterIndex > GlyphClusters[GlyphClusters.Count - 1])
-                    {
-                        return Metrics.WidthIncludingTrailingWhitespace;
-                    }
-                }
-
-                var glyphIndex = FindGlyphIndex(characterIndex);
-                
-                if (GlyphClusters != null)
-                {
-                    var currentCluster = GlyphClusters[glyphIndex];
-
-                    //Move to the end of the glyph cluster
-                    if (characterHit.TrailingLength > 0)
-                    {
-                        while (glyphIndex + 1 < GlyphClusters.Count && GlyphClusters[glyphIndex + 1] == currentCluster)
-                        {
-                            glyphIndex++;
-                        }
-                    }
-                }
-
-                for (var i = 0; i < glyphIndex; i++)
-                {
-                    distance += GetGlyphAdvance(i, out _);
-                }
-
-                return distance;
-            }
-            else
-            {
-                //RightToLeft
-                var glyphIndex = FindGlyphIndex(characterIndex);
-                
-                if (GlyphClusters != null)
-                {
-                    if (characterIndex > GlyphClusters[0])
-                    {
-                        return 0;
-                    }
-
-                    if (characterIndex <= GlyphClusters[GlyphClusters.Count - 1])
-                    {
-                        return Size.Width;
-                    }
-                }
-
-                for (var i = glyphIndex + 1; i < GlyphIndices.Count; i++)
-                {
-                    distance += GetGlyphAdvance(i, out _);
-                }
-
-                return Size.Width - distance;
-            }
-        }
-
-        /// <summary>
-        /// Retrieves the <see cref="CharacterHit"/> value that represents the character hit of the caret of the <see cref="GlyphRun"/>.
-        /// </summary>
-        /// <param name="distance">Offset to use for computing the caret character hit.</param>
-        /// <param name="isInside">Determines whether the character hit is inside the <see cref="GlyphRun"/>.</param>
-        /// <returns>
-        /// A <see cref="CharacterHit"/> value that represents the character hit that is closest to the distance value.
-        /// The out parameter <c>isInside</c> returns <c>true</c> if the character hit is inside the <see cref="GlyphRun"/>; otherwise, <c>false</c>.
-        /// </returns>
-        public CharacterHit GetCharacterHitFromDistance(double distance, out bool isInside)
-        {
-            var characterIndex = 0;
-            
-            // Before
-            if (distance <= 0)
-            {
-                isInside = false;
-
-                if(GlyphClusters != null)
-                {
-                    characterIndex = GlyphClusters[characterIndex];
-                }
-
-                var firstCharacterHit = FindNearestCharacterHit(characterIndex, out _);
-
-                return IsLeftToRight ? new CharacterHit(firstCharacterHit.FirstCharacterIndex) : firstCharacterHit;
-            }
-
-            //After
-            if (distance >= Size.Width)
-            {
-                isInside = false;
-
-                characterIndex = GlyphIndices.Count - 1;
-
-                if(GlyphClusters != null)
-                {
-                    characterIndex = GlyphClusters[characterIndex];
-                }
-                
-                var lastCharacterHit = FindNearestCharacterHit(characterIndex, out _);
-
-                return IsLeftToRight ? lastCharacterHit : new CharacterHit(lastCharacterHit.FirstCharacterIndex);
-            }
-
-            //Within
-            var currentX = 0d;
-
-            if (IsLeftToRight)
-            {
-                for (var index = 0; index < GlyphIndices.Count; index++)
-                {
-                    var advance = GetGlyphAdvance(index, out var cluster);
-
-                    characterIndex = cluster;
-                    
-                    if (distance > currentX && distance <= currentX + advance)
-                    {
-                        break;
-                    }
-
-                    currentX += advance;
-                }
-            }
-            else
-            {
-                currentX = Size.Width;
-
-                for (var index = GlyphIndices.Count - 1; index >= 0; index--)
-                {
-                    var advance = GetGlyphAdvance(index, out var cluster);
-
-                    characterIndex = cluster;
-                    
-                    if (currentX - advance < distance)
-                    {
-                        break;
-                    }
-
-                    currentX -= advance;
-                }
-            }
-
-            isInside = true;
-
-            var characterHit = FindNearestCharacterHit(characterIndex, out var width);
-
-            var delta = width / 2;
-            var offset = IsLeftToRight ? distance - currentX : currentX - distance;
-
-            var isTrailing = offset > delta;
-
-            return isTrailing ? characterHit : new CharacterHit(characterHit.FirstCharacterIndex);
-        }
-
-        /// <summary>
-        /// Retrieves the next valid caret character hit in the logical direction in the <see cref="GlyphRun"/>.
-        /// </summary>
-        /// <param name="characterHit">The <see cref="CharacterHit"/> to use for computing the next hit value.</param>
-        /// <returns>
-        /// A <see cref="CharacterHit"/> that represents the next valid caret character hit in the logical direction.
-        /// If the return value is equal to <c>characterHit</c>, no further navigation is possible in the <see cref="GlyphRun"/>.
-        /// </returns>
-        public CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit)
-        {
-            if (characterHit.TrailingLength == 0)
-            {
-                characterHit = FindNearestCharacterHit(characterHit.FirstCharacterIndex, out _);
-
-                var textPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-
-                return textPosition > _characters.End ?
-                    characterHit :
-                    new CharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength);
-            }
-
-            var nextCharacterHit =
-                FindNearestCharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength, out _);
-
-            if (characterHit == nextCharacterHit)
-            {
-                return characterHit;
-            }
-
-            return characterHit.TrailingLength > 0 ?
-                nextCharacterHit :
-                new CharacterHit(nextCharacterHit.FirstCharacterIndex);
-        }
-
-        /// <summary>
-        /// Retrieves the previous valid caret character hit in the logical direction in the <see cref="GlyphRun"/>.
-        /// </summary>
-        /// <param name="characterHit">The <see cref="CharacterHit"/> to use for computing the previous hit value.</param>
-        /// <returns>
-        /// A cref="CharacterHit"/> that represents the previous valid caret character hit in the logical direction.
-        /// If the return value is equal to <c>characterHit</c>, no further navigation is possible in the <see cref="GlyphRun"/>.
-        /// </returns>
-        public CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit)
-        {
-            if (characterHit.TrailingLength != 0)
-            {
-                return new CharacterHit(characterHit.FirstCharacterIndex);
-            }
-
-            var previousCharacterHit = FindNearestCharacterHit(characterHit.FirstCharacterIndex - 1, out _);
-
-            return new CharacterHit(previousCharacterHit.FirstCharacterIndex);
-        }
-
-        /// <summary>
-        /// Finds a glyph index for given character index.
-        /// </summary>
-        /// <param name="characterIndex">The character index.</param>
-        /// <returns>
-        /// The glyph index.
-        /// </returns>
-        public int FindGlyphIndex(int characterIndex)
-        {
-            if (GlyphClusters == null)
-            {
-                return characterIndex;
-            }
-
-            if (IsLeftToRight)
-            {
-                if (characterIndex < GlyphClusters[0])
-                {
-                    return 0;
-                }
-
-                if (characterIndex > GlyphClusters[GlyphClusters.Count - 1])
-                {
-                    return GlyphClusters.Count - 1;
-                }
-            }
-            else
-            {
-                if (characterIndex < GlyphClusters[GlyphClusters.Count - 1])
-                {
-                    return GlyphClusters.Count - 1;
-                }
-
-                if (characterIndex > GlyphClusters[0])
-                {
-                    return 0;
-                }
-            }
-
-            var comparer = IsLeftToRight ? s_ascendingComparer : s_descendingComparer;
-
-            var clusters = GlyphClusters;
-
-            // Find the start of the cluster at the character index.
-            var start = clusters.BinarySearch(characterIndex, comparer);
-
-            // No cluster found.
-            if (start < 0)
-            {
-                while (characterIndex > 0 && start < 0)
-                {
-                    characterIndex--;
-
-                    start = clusters.BinarySearch(characterIndex, comparer);
-                }
-
-                if (start < 0)
-                {
-                    return -1;
-                }
-            }
-
-            if (IsLeftToRight)
-            {
-                while (start > 0 && clusters[start - 1] == clusters[start])
-                {
-                    start--;
-                }
-            }
-            else
-            {
-                while (start + 1 < clusters.Count && clusters[start + 1] == clusters[start])
-                {
-                    start++;
-                }
-            }
-
-            return start;
-        }
-
-        /// <summary>
-        /// Finds the nearest <see cref="CharacterHit"/> at given index.
-        /// </summary>
-        /// <param name="index">The index.</param>
-        /// <param name="width">The width of found cluster.</param>
-        /// <returns>
-        /// The nearest <see cref="CharacterHit"/>.
-        /// </returns>
-        public CharacterHit FindNearestCharacterHit(int index, out double width)
-        {
-            width = 0.0;
-
-            var start = FindGlyphIndex(index);
-
-            if (GlyphClusters == null)
-            {
-                width = GetGlyphAdvance(index, out _);
-
-                return new CharacterHit(start, 1);
-            }
-
-            var cluster = GlyphClusters[start];
-
-            var nextCluster = cluster;
-
-            var currentIndex = start;
-
-            while (nextCluster == cluster)
-            {
-                width += GetGlyphAdvance(currentIndex, out _);
-
-                if (IsLeftToRight)
-                {
-                    currentIndex++;
-
-                    if (currentIndex == GlyphClusters.Count)
-                    {
-                        break;
-                    }
-                }
-                else
-                {
-                    currentIndex--;
-
-                    if (currentIndex < 0)
-                    {
-                        break;
-                    }
-                }
-
-                nextCluster = GlyphClusters[currentIndex];
-            }
-
-            int trailingLength;
-
-            if (nextCluster == cluster)
-            {
-                trailingLength = Characters.Start + Characters.Length - cluster;
-            }
-            else
-            {
-                trailingLength = nextCluster - cluster;
-            }
-
-            return new CharacterHit(cluster, trailingLength);
-        }
-
-        /// <summary>
-        /// Gets a glyph's width.
-        /// </summary>
-        /// <param name="index">The glyph index.</param>
-        /// <param name="cluster">The current cluster.</param>
-        /// <returns>The glyph's width.</returns>
-        private double GetGlyphAdvance(int index, out int cluster)
-        {
-            cluster = GlyphClusters != null ? GlyphClusters[index] : index;
-            
-            if (GlyphAdvances != null)
-            {
-                return GlyphAdvances[index];
-            }
-
-            var glyph = GlyphIndices[index];
-
-            return GlyphTypeface.GetGlyphAdvance(glyph) * Scale;
-        }
-
-        /// <summary>
-        /// Calculates the default baseline origin of the <see cref="GlyphRun"/>.
-        /// </summary>
-        /// <returns>The baseline origin.</returns>
-        private Point CalculateBaselineOrigin()
-        {
-            return new Point(0, -GlyphTypeface.Ascent * Scale);
-        }
-
-        private GlyphRunMetrics CreateGlyphRunMetrics()
-        {
-            var height = (GlyphTypeface.Descent - GlyphTypeface.Ascent + GlyphTypeface.LineGap) * Scale;
-            var widthIncludingTrailingWhitespace = 0d;
-
-            var trailingWhitespaceLength = GetTrailingWhitespaceLength(out var newLineLength, out var glyphCount);
-            
-            for (var index = 0; index < GlyphIndices.Count; index++)
-            {
-                var advance = GetGlyphAdvance(index, out _);
-
-                widthIncludingTrailingWhitespace += advance;
-            }
-
-            var width = widthIncludingTrailingWhitespace;
-
-            if (IsLeftToRight)
-            {
-                for (var index = GlyphIndices.Count - glyphCount; index <GlyphIndices.Count; index++)
-                {
-                    width -= GetGlyphAdvance(index, out _);
-                }
-            }
-            else
-            {
-                for (var index = 0; index < glyphCount; index++)
-                {
-                    width -= GetGlyphAdvance(index, out _);
-                }
-            }
-
-            return new GlyphRunMetrics(width, widthIncludingTrailingWhitespace, trailingWhitespaceLength, newLineLength,
-                height);
-        }
-
-        private int GetTrailingWhitespaceLength(out int newLineLength, out int glyphCount)
-        {
-            glyphCount = 0;
-            newLineLength = 0;
-
-            if (Characters.IsEmpty)
-            {
-                return 0;
-            }
-
-            var trailingWhitespaceLength = 0;
-
-            if (GlyphClusters == null)
-            {
-                for (var i = _characters.Length - 1; i >= 0;)
-                {
-                    var codepoint = Codepoint.ReadAt(_characters, i, out var count);
-
-                    if (!codepoint.IsWhiteSpace)
-                    {
-                        break;
-                    }
-
-                    if (codepoint.IsBreakChar)
-                    {
-                        newLineLength++;
-                    }
-
-                    trailingWhitespaceLength++;
-
-                    i -= count;
-                    glyphCount++;
-                }
-            }
-            else
-            {
-                for (var i = GlyphClusters.Count - 1; i >= 0; i--)
-                {
-                    var cluster = GlyphClusters[i];
-
-                    var codepointIndex = IsLeftToRight ? cluster - _characters.Start : _characters.End - cluster;
-
-                    if (codepointIndex < 0)
-                    {
-                        trailingWhitespaceLength = _characters.Length;
-                        
-                        glyphCount = GlyphClusters.Count;
-                        
-                        break;
-                    }
-                    
-                    var codepoint = Codepoint.ReadAt(_characters, codepointIndex, out _);
-
-                    if (!codepoint.IsWhiteSpace)
-                    {
-                        break;
-                    }
-
-                    if (codepoint.IsBreakChar)
-                    {
-                        newLineLength++;
-                    }
-
-                    trailingWhitespaceLength++;
-                    
-                    glyphCount++;
-                }
-            }
-
-            return trailingWhitespaceLength;
-        }
-
-        private void Set<T>(ref T field, T value)
-        {
-            if (_glyphRunImpl != null)
-            {
-                throw new InvalidOperationException("GlyphRun can't be changed after it has been initialized.'");
-            }
-
-            _glyphRunMetrics = null;
-
-            _baselineOrigin = null;
-
-            field = value;
-        }
-
-        /// <summary>
-        /// Initializes the <see cref="GlyphRun"/>.
-        /// </summary>
-        private void Initialize()
-        {
-            if (GlyphIndices == null)
-            {
-                throw new InvalidOperationException();
-            }
-
-            var glyphCount = GlyphIndices.Count;
-
-            if (GlyphAdvances != null && GlyphAdvances.Count > 0 && GlyphAdvances.Count != glyphCount)
-            {
-                throw new InvalidOperationException();
-            }
-
-            if (GlyphOffsets != null && GlyphOffsets.Count > 0 && GlyphOffsets.Count != glyphCount)
-            {
-                throw new InvalidOperationException();
-            }
-
-            var platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-
-            _glyphRunImpl = platformRenderInterface.CreateGlyphRun(this);
-        }
-
-        void IDisposable.Dispose()
-        {
-            _glyphRunImpl?.Dispose();
-        }
-
-        private class ReverseComparer<T> : IComparer<T>
-        {
-            public int Compare(T? x, T? y)
-            {
-                return Comparer<T>.Default.Compare(y, x);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/GradientStops.cs b/src/Avalonia.Visuals/Media/GradientStops.cs
deleted file mode 100644
index efc11bacd6..0000000000
--- a/src/Avalonia.Visuals/Media/GradientStops.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Collections;
-using Avalonia.Media.Immutable;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// A collection of <see cref="GradientStop"/>s.
-    /// </summary>
-    public class GradientStops : AvaloniaList<GradientStop>
-    {
-        public GradientStops()
-        {
-            ResetBehavior = ResetBehavior.Remove;
-        }
-
-        public IReadOnlyList<ImmutableGradientStop> ToImmutable()
-        {
-            return this.Select(x => new ImmutableGradientStop(x.Offset, x.Color)).ToList();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IBrush.cs b/src/Avalonia.Visuals/Media/IBrush.cs
deleted file mode 100644
index 15b7681be4..0000000000
--- a/src/Avalonia.Visuals/Media/IBrush.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.ComponentModel;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes how an area is painted.
-    /// </summary>
-    [TypeConverter(typeof(BrushConverter))]
-    public interface IBrush
-    {
-        /// <summary>
-        /// Gets the opacity of the brush.
-        /// </summary>
-        double Opacity { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IConicGradientBrush.cs b/src/Avalonia.Visuals/Media/IConicGradientBrush.cs
deleted file mode 100644
index 5368dd1851..0000000000
--- a/src/Avalonia.Visuals/Media/IConicGradientBrush.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Paints an area with a conic gradient.
-    /// </summary>
-    public interface IConicGradientBrush : IGradientBrush
-    {
-        /// <summary>
-        /// Gets the center point for the gradient.
-        /// </summary>
-        RelativePoint Center { get; }
-
-        /// <summary>
-        /// Gets the starting angle for the gradient in degrees, measured from
-        /// the point above the center point.
-        /// </summary>
-        double Angle { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IDashStyle.cs b/src/Avalonia.Visuals/Media/IDashStyle.cs
deleted file mode 100644
index 7835c7a1e9..0000000000
--- a/src/Avalonia.Visuals/Media/IDashStyle.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents the sequence of dashes and gaps that will be applied by a <see cref="Pen"/>.
-    /// </summary>
-    public interface IDashStyle
-    {
-        /// <summary>
-        /// Gets or sets the length of alternating dashes and gaps.
-        /// </summary>
-        IReadOnlyList<double> Dashes { get; }
-
-        /// <summary>
-        /// Gets or sets how far in the dash sequence the stroke will start.
-        /// </summary>
-        double Offset { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IExperimentalAcrylicMaterial.cs b/src/Avalonia.Visuals/Media/IExperimentalAcrylicMaterial.cs
deleted file mode 100644
index e71584258a..0000000000
--- a/src/Avalonia.Visuals/Media/IExperimentalAcrylicMaterial.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Experimental Interface for producing Acrylic-like materials.
-    /// </summary>
-    public interface IExperimentalAcrylicMaterial
-    {
-        /// <summary>
-        /// Gets the <see cref="AcrylicBackgroundSource"/> of the material.
-        /// </summary>
-        AcrylicBackgroundSource BackgroundSource { get; }
-
-        /// <summary>
-        /// Gets the TintColor of the material.
-        /// </summary>
-        Color TintColor { get; }
-
-        /// <summary>
-        /// Gets the TintOpacity of the material.
-        /// </summary>
-        double TintOpacity { get; }
-
-        /// <summary>
-        /// Gets the effective material color.
-        /// </summary>
-        Color MaterialColor { get; }        
-
-        /// <summary>
-        /// Gets the fallback color.
-        /// </summary>
-        Color FallbackColor { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IGradientBrush.cs b/src/Avalonia.Visuals/Media/IGradientBrush.cs
deleted file mode 100644
index 18db0af660..0000000000
--- a/src/Avalonia.Visuals/Media/IGradientBrush.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// A brush that draws with a gradient.
-    /// </summary>
-    public interface IGradientBrush : IBrush
-    {
-        /// <summary>
-        /// Gets the brush's gradient stops.
-        /// </summary>
-        IReadOnlyList<IGradientStop> GradientStops { get; }
-
-        /// <summary>
-        /// Gets the brush's spread method that defines how to draw a gradient that doesn't fill
-        /// the bounds of the destination control.
-        /// </summary>
-        GradientSpreadMethod SpreadMethod { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IGradientStop.cs b/src/Avalonia.Visuals/Media/IGradientStop.cs
deleted file mode 100644
index 22eb9df60d..0000000000
--- a/src/Avalonia.Visuals/Media/IGradientStop.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes the location and color of a transition point in a gradient.
-    /// </summary>
-    public interface IGradientStop
-    {
-        /// <summary>
-        /// Gets the gradient stop color.
-        /// </summary>
-        Color Color { get; }
-
-        /// <summary>
-        /// Gets the gradient stop offset.
-        /// </summary>
-        double Offset { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IImage.cs b/src/Avalonia.Visuals/Media/IImage.cs
deleted file mode 100644
index aff2a9ddf9..0000000000
--- a/src/Avalonia.Visuals/Media/IImage.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a raster or vector image.
-    /// </summary>
-    public interface IImage
-    {
-        /// <summary>
-        /// Gets the size of the image, in device independent pixels.
-        /// </summary>
-        Size Size { get; }
-
-        /// <summary>
-        /// Draws the image to a <see cref="DrawingContext"/>.
-        /// </summary>
-        /// <param name="context">The drawing context.</param>
-        /// <param name="sourceRect">The rect in the image to draw.</param>
-        /// <param name="destRect">The rect in the output to draw to.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        void Draw(
-            DrawingContext context,
-            Rect sourceRect,
-            Rect destRect,
-            BitmapInterpolationMode bitmapInterpolationMode);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IImageBrush.cs b/src/Avalonia.Visuals/Media/IImageBrush.cs
deleted file mode 100644
index aaa481bd28..0000000000
--- a/src/Avalonia.Visuals/Media/IImageBrush.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Avalonia.Media.Imaging;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Paints an area with an <see cref="IBitmap"/>.
-    /// </summary>
-    public interface IImageBrush : ITileBrush
-    {
-        /// <summary>
-        /// Gets the image to draw.
-        /// </summary>
-        IBitmap Source { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/ILinearGradientBrush.cs b/src/Avalonia.Visuals/Media/ILinearGradientBrush.cs
deleted file mode 100644
index 3e2a5a0e22..0000000000
--- a/src/Avalonia.Visuals/Media/ILinearGradientBrush.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// A brush that draws with a linear gradient.
-    /// </summary>
-    public interface ILinearGradientBrush : IGradientBrush
-    {
-        /// <summary>
-        /// Gets or sets the start point for the gradient.
-        /// </summary>
-        RelativePoint StartPoint { get; }
-
-        /// <summary>
-        /// Gets or sets the end point for the gradient.
-        /// </summary>
-        RelativePoint EndPoint { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/IMutableBrush.cs b/src/Avalonia.Visuals/Media/IMutableBrush.cs
deleted file mode 100644
index 415db61d68..0000000000
--- a/src/Avalonia.Visuals/Media/IMutableBrush.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a mutable brush which can return an immutable clone of itself.
-    /// </summary>
-    public interface IMutableBrush : IBrush, IAffectsRender
-    {
-        /// <summary>
-        /// Creates an immutable clone of the brush.
-        /// </summary>
-        /// <returns>The immutable clone.</returns>
-        IBrush ToImmutable();
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IMutableExperimentalAcrylicMaterial.cs b/src/Avalonia.Visuals/Media/IMutableExperimentalAcrylicMaterial.cs
deleted file mode 100644
index fcfe4631a6..0000000000
--- a/src/Avalonia.Visuals/Media/IMutableExperimentalAcrylicMaterial.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a mutable brush which can return an immutable clone of itself.
-    /// </summary>
-    public interface IMutableExperimentalAcrylicMaterial : IExperimentalAcrylicMaterial, IAffectsRender
-    {
-        /// <summary>
-        /// Creates an immutable clone of the brush.
-        /// </summary>
-        /// <returns>The immutable clone.</returns>
-        IExperimentalAcrylicMaterial ToImmutable();
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IMutableTransform.cs b/src/Avalonia.Visuals/Media/IMutableTransform.cs
deleted file mode 100644
index 2033c434c0..0000000000
--- a/src/Avalonia.Visuals/Media/IMutableTransform.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace Avalonia.Media
-{
-    public interface IMutableTransform : ITransform
-    {
-        /// <summary>
-        /// Raised when the transform changes.
-        /// </summary>
-        event EventHandler Changed;
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IPen.cs b/src/Avalonia.Visuals/Media/IPen.cs
deleted file mode 100644
index 1cad9948b4..0000000000
--- a/src/Avalonia.Visuals/Media/IPen.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes how a stroke is drawn.
-    /// </summary>
-    public interface IPen
-    {
-        /// <summary>
-        /// Gets the brush used to draw the stroke.
-        /// </summary>
-        IBrush? Brush { get; }
-
-        /// <summary>
-        /// Gets the style of dashed lines drawn with a <see cref="Pen"/> object.
-        /// </summary>
-        IDashStyle? DashStyle { get; }
-
-        /// <summary>
-        /// Gets the type of shape to use on both ends of a line.
-        /// </summary>
-        PenLineCap LineCap { get; }
-
-        /// <summary>
-        /// Gets a value describing how to join consecutive line or curve segments in a 
-        /// <see cref="PathFigure"/> contained in a <see cref="PathGeometry"/> object.
-        /// </summary>
-        PenLineJoin LineJoin { get; }
-
-        /// <summary>
-        /// Gets the limit of the thickness of the join on a mitered corner.
-        /// </summary>
-        double MiterLimit { get; }
-
-        /// <summary>
-        /// Gets the stroke thickness.
-        /// </summary>
-        double Thickness { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IRadialGradientBrush.cs b/src/Avalonia.Visuals/Media/IRadialGradientBrush.cs
deleted file mode 100644
index cadf53cc18..0000000000
--- a/src/Avalonia.Visuals/Media/IRadialGradientBrush.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Paints an area with a radial gradient.
-    /// </summary>
-    public interface IRadialGradientBrush : IGradientBrush
-    {
-        /// <summary>
-        /// Gets the start point for the gradient.
-        /// </summary>
-        RelativePoint Center { get; }
-
-        /// <summary>
-        /// Gets the location of the two-dimensional focal point that defines the beginning of the
-        /// gradient.
-        /// </summary>
-        RelativePoint GradientOrigin { get; }
-
-        /// <summary>
-        /// Gets the horizontal and vertical radius of the outermost circle of the radial gradient.
-        /// </summary>
-        double Radius { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/ISolidColorBrush.cs b/src/Avalonia.Visuals/Media/ISolidColorBrush.cs
deleted file mode 100644
index d0ab00599b..0000000000
--- a/src/Avalonia.Visuals/Media/ISolidColorBrush.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Fills an area with a solid color.
-    /// </summary>
-    public interface ISolidColorBrush : IBrush
-    {
-        /// <summary>
-        /// Gets the color of the brush.
-        /// </summary>
-        Color Color { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/ITileBrush.cs b/src/Avalonia.Visuals/Media/ITileBrush.cs
deleted file mode 100644
index 12fb221a89..0000000000
--- a/src/Avalonia.Visuals/Media/ITileBrush.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media
-{  
-    /// <summary>
-    /// A brush which displays a repeating image.
-    /// </summary>
-    public interface ITileBrush : IBrush
-    {
-        /// <summary>
-        /// Gets the horizontal alignment of a tile in the destination.
-        /// </summary>
-        AlignmentX AlignmentX { get; }
-
-        /// <summary>
-        /// Gets the horizontal alignment of a tile in the destination.
-        /// </summary>
-        AlignmentY AlignmentY { get; }
-
-        /// <summary>
-        /// Gets the rectangle on the destination in which to paint a tile.
-        /// </summary>
-        RelativeRect DestinationRect { get; }
-
-        /// <summary>
-        /// Gets the rectangle of the source image that will be displayed.
-        /// </summary>
-        RelativeRect SourceRect { get; }
-
-        /// <summary>
-        /// Gets a value indicating how the source rectangle will be stretched to fill the
-        /// destination rect.
-        /// </summary>
-        Stretch Stretch { get; }
-
-        /// <summary>
-        /// Gets the brush's tile mode.
-        /// </summary>
-        TileMode TileMode { get; }
-
-        /// <summary>
-        /// Gets the bitmap interpolation mode.
-        /// </summary>
-        /// <value>
-        /// The bitmap interpolation mode.
-        /// </value>
-        BitmapInterpolationMode BitmapInterpolationMode { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/IVisualBrush.cs b/src/Avalonia.Visuals/Media/IVisualBrush.cs
deleted file mode 100644
index e74892b218..0000000000
--- a/src/Avalonia.Visuals/Media/IVisualBrush.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Avalonia.VisualTree;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Paints an area with an <see cref="IVisual"/>.
-    /// </summary>
-    public interface IVisualBrush : ITileBrush
-    {
-        /// <summary>
-        /// Gets the visual to draw.
-        /// </summary>
-        IVisual Visual { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs b/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
deleted file mode 100644
index 647ce13528..0000000000
--- a/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-using System;
-using System.IO;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media.Imaging
-{
-    /// <summary>
-    /// Holds a bitmap image.
-    /// </summary>
-    public class Bitmap : IBitmap
-    {
-        /// <summary>
-        /// Loads a Bitmap from a stream and decodes at the desired width. Aspect ratio is maintained.
-        /// This is more efficient than loading and then resizing.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
-        /// <param name="width">The desired width of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
-        /// <returns>An instance of the <see cref="Bitmap"/> class.</returns>
-        public static Bitmap DecodeToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            return new Bitmap(GetFactory().LoadBitmapToWidth(stream, width, interpolationMode));
-        }
-
-        /// <summary>
-        /// Loads a Bitmap from a stream and decodes at the desired height. Aspect ratio is maintained.
-        /// This is more efficient than loading and then resizing.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
-        /// <param name="height">The desired height of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
-        /// <returns>An instance of the <see cref="Bitmap"/> class.</returns>
-        public static Bitmap DecodeToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            return new Bitmap(GetFactory().LoadBitmapToHeight(stream, height, interpolationMode));
-        }
-
-        /// <summary>
-        /// Creates a Bitmap scaled to a specified size from the current bitmap.
-        /// </summary>        
-        /// <param name="destinationSize">The destination size.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
-        /// <returns>An instance of the <see cref="Bitmap"/> class.</returns>
-        public Bitmap CreateScaledBitmap(PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            return new Bitmap(GetFactory().ResizeBitmap(PlatformImpl.Item, destinationSize, interpolationMode));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bitmap"/> class.
-        /// </summary>
-        /// <param name="fileName">The filename of the bitmap.</param>
-        public Bitmap(string fileName)
-        {
-            PlatformImpl = RefCountable.Create(GetFactory().LoadBitmap(fileName));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bitmap"/> class.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param>
-        public Bitmap(Stream stream)
-        {
-            PlatformImpl = RefCountable.Create(GetFactory().LoadBitmap(stream));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bitmap"/> class.
-        /// </summary>
-        /// <param name="impl">A platform-specific bitmap implementation.</param>
-        public Bitmap(IRef<IBitmapImpl> impl)
-        {
-            PlatformImpl = impl.Clone();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bitmap"/> class.
-        /// </summary>
-        /// <param name="impl">A platform-specific bitmap implementation. Bitmap class takes the ownership.</param>
-        protected Bitmap(IBitmapImpl impl)
-        {
-            PlatformImpl = RefCountable.Create(impl);
-        }
-
-        /// <inheritdoc/>
-        public virtual void Dispose()
-        {
-            PlatformImpl.Dispose();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bitmap"/> class.
-        /// </summary>
-        /// <param name="format">The pixel format.</param>
-        /// <param name="data">The pointer to the source bytes.</param>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <param name="stride">The number of bytes per row.</param>
-        [Obsolete("Use overload taking an AlphaFormat.")]
-        public Bitmap(PixelFormat format, IntPtr data, PixelSize size, Vector dpi, int stride)
-        {
-            var ri = GetFactory();
-            PlatformImpl = RefCountable.Create(ri
-                .LoadBitmap(format, ri.DefaultAlphaFormat, data, size, dpi, stride));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bitmap"/> class.
-        /// </summary>
-        /// <param name="format">The pixel format.</param>
-        /// <param name="alphaFormat">The alpha format.</param>
-        /// <param name="data">The pointer to the source bytes.</param>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <param name="stride">The number of bytes per row.</param>
-        public Bitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
-        {
-            PlatformImpl = RefCountable.Create(GetFactory().LoadBitmap(format, alphaFormat, data, size, dpi, stride));
-        }
-
-        /// <inheritdoc/>
-        public Vector Dpi => PlatformImpl.Item.Dpi;
-
-        /// <inheritdoc/>
-        public Size Size => PlatformImpl.Item.PixelSize.ToSizeWithDpi(Dpi);
-
-        /// <inheritdoc/>
-        public PixelSize PixelSize => PlatformImpl.Item.PixelSize;
-
-        /// <summary>
-        /// Gets the platform-specific bitmap implementation.
-        /// </summary>
-        public IRef<IBitmapImpl> PlatformImpl { get; }
-
-        /// <summary>
-        /// Saves the bitmap to a file.
-        /// </summary>
-        /// <param name="fileName">The filename.</param>
-        public void Save(string fileName)
-        {
-            PlatformImpl.Item.Save(fileName);
-        }
-
-        /// <summary>
-        /// Saves the bitmap to a stream.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        public void Save(Stream stream)
-        {
-            PlatformImpl.Item.Save(stream);
-        }
-
-        /// <inheritdoc/>
-        void IImage.Draw(
-            DrawingContext context,
-            Rect sourceRect,
-            Rect destRect,
-            BitmapInterpolationMode bitmapInterpolationMode)
-        {
-            context.PlatformImpl.DrawBitmap(
-                PlatformImpl,
-                1,
-                sourceRect,
-                destRect,
-                bitmapInterpolationMode);
-        }
-
-        private static IPlatformRenderInterface GetFactory()
-        {
-            return AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Imaging/BitmapBlendingMode.cs b/src/Avalonia.Visuals/Media/Imaging/BitmapBlendingMode.cs
deleted file mode 100644
index 473b43dab3..0000000000
--- a/src/Avalonia.Visuals/Media/Imaging/BitmapBlendingMode.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-namespace Avalonia.Visuals.Media.Imaging
-{
-    /// <summary>
-    /// Controls the way the bitmaps are drawn together.
-    /// </summary>
-    public enum BitmapBlendingMode
-    {
-        /// <summary>
-        /// Source is placed over the destination.
-        /// </summary>
-        SourceOver,
-        /// <summary>
-        /// Only the source will be present.
-        /// </summary>
-        Source,
-        /// <summary>
-        /// Only the destination will be present.
-        /// </summary>
-        Destination,
-        /// <summary>
-        /// Destination is placed over the source.
-        /// </summary>
-        DestinationOver,
-        /// <summary>
-        /// The source that overlaps the destination, replaces the destination.
-        /// </summary>
-        SourceIn,
-        /// <summary>
-        /// Destination which overlaps the source, replaces the source.
-        /// </summary>
-        DestinationIn,
-        /// <summary>
-        /// Source is placed, where it falls outside of the destination.
-        /// </summary>
-        SourceOut,
-        /// <summary>
-        /// Destination is placed, where it falls outside of the source.
-        /// </summary>
-        DestinationOut,
-        /// <summary>
-        /// Source which overlaps the destination, replaces the destination.
-        /// </summary>
-        SourceAtop,
-        /// <summary>
-        /// Destination which overlaps the source replaces the source.
-        /// </summary>
-        DestinationAtop,
-        /// <summary>
-        /// The non-overlapping regions of source and destination are combined.
-        /// </summary>
-        Xor,
-        /// <summary>
-        /// Display the sum of the source image and destination image.
-        /// </summary>
-        Plus,
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Imaging/BitmapInterpolationMode.cs b/src/Avalonia.Visuals/Media/Imaging/BitmapInterpolationMode.cs
deleted file mode 100644
index 5fa48a5ec8..0000000000
--- a/src/Avalonia.Visuals/Media/Imaging/BitmapInterpolationMode.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Avalonia.Visuals.Media.Imaging
-{
-    /// <summary>
-    /// Controls the performance and quality of bitmap scaling.
-    /// </summary>
-    public enum BitmapInterpolationMode
-    {
-        /// <summary>
-        /// Uses the default behavior of the underling render backend.
-        /// </summary>
-        Default,
-
-        /// <summary>
-        /// The best performance but worst image quality.
-        /// </summary>
-        LowQuality,
-
-        /// <summary>
-        /// Good performance and decent image quality.
-        /// </summary>
-        MediumQuality,      
-
-        /// <summary>
-        /// Highest quality but worst performance.
-        /// </summary>
-        HighQuality
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Imaging/CroppedBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/CroppedBitmap.cs
deleted file mode 100644
index be1f6db561..0000000000
--- a/src/Avalonia.Visuals/Media/Imaging/CroppedBitmap.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media.Imaging
-{
-    /// <summary>
-    /// Crops a Bitmap.
-    /// </summary>
-    public class CroppedBitmap : AvaloniaObject, IImage, IAffectsRender, IDisposable
-    {
-        /// <summary>
-        /// Defines the <see cref="Source"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IImage?> SourceProperty =
-            AvaloniaProperty.Register<CroppedBitmap, IImage?>(nameof(Source));
-
-        /// <summary>
-        /// Defines the <see cref="SourceRect"/> property.
-        /// </summary>
-        public static readonly StyledProperty<PixelRect> SourceRectProperty =
-            AvaloniaProperty.Register<CroppedBitmap, PixelRect>(nameof(SourceRect));
-
-        public event EventHandler? Invalidated;
-
-        static CroppedBitmap()
-        {
-            SourceRectProperty.Changed.AddClassHandler<CroppedBitmap>((x, e) => x.SourceRectChanged(e));
-            SourceProperty.Changed.AddClassHandler<CroppedBitmap>((x, e) => x.SourceChanged(e));
-        }
-
-        /// <summary>
-        /// Gets or sets the source for the bitmap.
-        /// </summary>
-        public IImage? Source
-        {
-            get => GetValue(SourceProperty);
-            set => SetValue(SourceProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the rectangular area that the bitmap is cropped to.
-        /// </summary>
-        public PixelRect SourceRect
-        {
-            get => GetValue(SourceRectProperty);
-            set => SetValue(SourceRectProperty, value);
-        }
-
-        public CroppedBitmap()
-        {
-            Source = null;
-            SourceRect = default;
-        }
-
-        public CroppedBitmap(IImage source, PixelRect sourceRect)
-        {
-            Source = source;
-            SourceRect = sourceRect;
-        }
-
-        private void SourceChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.NewValue == null)
-                return;
-            if (!(e.NewValue is IBitmap))
-                throw new ArgumentException("Only IBitmap supported as source");
-            Invalidated?.Invoke(this, e);
-        }
-
-        private void SourceRectChanged(AvaloniaPropertyChangedEventArgs e) => Invalidated?.Invoke(this, e);
-
-        public virtual void Dispose()
-        {
-            (Source as IBitmap)?.Dispose();
-        }
-
-        public Size Size {
-            get
-            {
-                if (Source is not IBitmap bmp)
-                    return Size.Empty;
-                if (SourceRect.IsEmpty)
-                    return Source.Size;
-                return SourceRect.Size.ToSizeWithDpi(bmp.Dpi);
-            }
-        }
-
-        public void Draw(DrawingContext context, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
-        {
-            if (Source is not IBitmap bmp)
-                return;
-            var topLeft = SourceRect.TopLeft.ToPointWithDpi(bmp.Dpi);
-            Source.Draw(context, sourceRect.Translate(new Vector(topLeft.X, topLeft.Y)), destRect, bitmapInterpolationMode);           
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs
deleted file mode 100644
index 134bebc002..0000000000
--- a/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.IO;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.Imaging
-{
-    /// <summary>
-    /// Represents a bitmap image.
-    /// </summary>
-    public interface IBitmap : IImage, IDisposable
-    {
-        /// <summary>
-        /// Gets the dots per inch (DPI) of the image.
-        /// </summary>
-        /// <remarks>
-        /// Note that Skia does not currently support reading the DPI of an image so this value
-        /// will always be 96dpi on Skia.
-        /// </remarks>
-        Vector Dpi { get; }
-
-        /// <summary>
-        /// Gets the size of the bitmap, in device pixels.
-        /// </summary>
-        PixelSize PixelSize { get; }
-
-        /// <summary>
-        /// Gets the platform-specific bitmap implementation.
-        /// </summary>
-        IRef<IBitmapImpl> PlatformImpl { get; }
-
-        /// <summary>
-        /// Saves the bitmap to a file.
-        /// </summary>
-        /// <param name="fileName">The filename.</param>
-        void Save(string fileName);
-
-        /// <summary>
-        /// Saves the bitmap to a stream in png format.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        void Save(Stream stream);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
deleted file mode 100644
index 40a24db338..0000000000
--- a/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media.Imaging
-{
-    /// <summary>
-    /// Holds a writeable bitmap image.
-    /// </summary>
-    public class WriteableBitmap : Bitmap
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WriteableBitmap"/> class.
-        /// </summary>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <param name="format">The pixel format (optional).</param>
-        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
-        [Obsolete("Use overload taking an AlphaFormat.")]
-        public WriteableBitmap(PixelSize size, Vector dpi, PixelFormat? format = null)
-            : base(CreatePlatformImpl(size, dpi, format, null))
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WriteableBitmap"/> class.
-        /// </summary>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <param name="format">The pixel format (optional).</param>
-        /// <param name="alphaFormat">The alpha format (optional).</param>
-        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
-        public WriteableBitmap(PixelSize size, Vector dpi, PixelFormat format, AlphaFormat alphaFormat) 
-            : base(CreatePlatformImpl(size, dpi, format, alphaFormat))
-        {
-        }
-
-        private WriteableBitmap(IWriteableBitmapImpl impl) : base(impl)
-        {
-            
-        }
-
-        public ILockedFramebuffer Lock() => ((IWriteableBitmapImpl) PlatformImpl.Item).Lock();
-
-        public static WriteableBitmap Decode(Stream stream)
-        {
-            var ri = GetFactory();
-
-            return new WriteableBitmap(ri.LoadWriteableBitmap(stream));
-        }
-        
-        /// <summary>
-        /// Loads a WriteableBitmap from a stream and decodes at the desired width. Aspect ratio is maintained.
-        /// This is more efficient than loading and then resizing.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
-        /// <param name="width">The desired width of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
-        /// <returns>An instance of the <see cref="WriteableBitmap"/> class.</returns>
-        public new static WriteableBitmap DecodeToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            var ri = GetFactory();
-
-            return new WriteableBitmap(ri.LoadWriteableBitmapToWidth(stream, width, interpolationMode));
-        }
-
-        /// <summary>
-        /// Loads a Bitmap from a stream and decodes at the desired height. Aspect ratio is maintained.
-        /// This is more efficient than loading and then resizing.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from. This can be any supported image format.</param>
-        /// <param name="height">The desired height of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should any scaling be required.</param>
-        /// <returns>An instance of the <see cref="WriteableBitmap"/> class.</returns>
-        public new static WriteableBitmap DecodeToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            var ri = GetFactory();
-
-            return new WriteableBitmap(ri.LoadWriteableBitmapToHeight(stream, height, interpolationMode));
-        }
-
-        private static IBitmapImpl CreatePlatformImpl(PixelSize size, in Vector dpi, PixelFormat? format, AlphaFormat? alphaFormat)
-        {
-            var ri = GetFactory();
-
-            PixelFormat finalFormat = format ?? ri.DefaultPixelFormat;
-            AlphaFormat finalAlphaFormat = alphaFormat ?? ri.DefaultAlphaFormat;
-
-            return ri.CreateWriteableBitmap(size, dpi, finalFormat, finalAlphaFormat);
-        }
-
-        private static IPlatformRenderInterface GetFactory()
-        {
-            return AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableConicGradientBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableConicGradientBrush.cs
deleted file mode 100644
index d3c80dfcad..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableConicGradientBrush.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// A brush that draws with a sweep gradient.
-    /// </summary>
-    public class ImmutableConicGradientBrush : ImmutableGradientBrush, IConicGradientBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableConicGradientBrush"/> class.
-        /// </summary>
-        /// <param name="gradientStops">The gradient stops.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="spreadMethod">The spread method.</param>
-        /// <param name="center">The center point for the gradient.</param>
-        /// <param name="angle">The starting angle for the gradient.</param>
-        public ImmutableConicGradientBrush(
-            IReadOnlyList<ImmutableGradientStop> gradientStops,
-            double opacity = 1,
-            GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
-            RelativePoint? center = null,
-            double angle = 0)
-            : base(gradientStops, opacity, spreadMethod)
-        {
-            Center = center ?? RelativePoint.Center;
-            Angle = angle;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableConicGradientBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableConicGradientBrush(ConicGradientBrush source)
-            : base(source)
-        {
-            Center = source.Center;
-            Angle = source.Angle;
-        }
-
-        /// <inheritdoc/>
-        public RelativePoint Center { get; }
-
-        /// <inheritdoc/>
-        public double Angle { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientBrush.cs
deleted file mode 100644
index 1f6e3bbcfd..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableGradientBrush.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// A brush that draws with a gradient.
-    /// </summary>
-    public abstract class ImmutableGradientBrush : IGradientBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableGradientBrush"/> class.
-        /// </summary>
-        /// <param name="gradientStops">The gradient stops.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="spreadMethod">The spread method.</param>
-        protected ImmutableGradientBrush(
-            IReadOnlyList<ImmutableGradientStop> gradientStops,
-            double opacity,
-            GradientSpreadMethod spreadMethod)
-        {
-            GradientStops = gradientStops;
-            Opacity = opacity;
-            SpreadMethod = spreadMethod;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableGradientBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        protected ImmutableGradientBrush(GradientBrush source)
-            : this(source.GradientStops.ToImmutable(), source.Opacity, source.SpreadMethod)
-        {
-
-        }
-
-        /// <inheritdoc/>
-        public IReadOnlyList<IGradientStop> GradientStops { get; }
-
-        /// <inheritdoc/>
-        public double Opacity { get; }
-
-        /// <inheritdoc/>
-        public GradientSpreadMethod SpreadMethod { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableImageBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableImageBrush.cs
deleted file mode 100644
index 15da8f8b43..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableImageBrush.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Avalonia.Media.Imaging;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// Paints an area with an <see cref="IBitmap"/>.
-    /// </summary>
-    internal class ImmutableImageBrush : ImmutableTileBrush, IImageBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableImageBrush"/> class.
-        /// </summary>
-        /// <param name="source">The image to draw.</param>
-        /// <param name="alignmentX">The horizontal alignment of a tile in the destination.</param>
-        /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
-        /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
-        /// <param name="stretch">
-        /// How the source rectangle will be stretched to fill the destination rect.
-        /// </param>
-        /// <param name="tileMode">The tile mode.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        public ImmutableImageBrush(
-            IBitmap source,
-            AlignmentX alignmentX = AlignmentX.Center,
-            AlignmentY alignmentY = AlignmentY.Center,
-            RelativeRect? destinationRect = null,
-            double opacity = 1,
-            RelativeRect? sourceRect = null,
-            Stretch stretch = Stretch.Uniform,
-            TileMode tileMode = TileMode.None,
-            BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default)
-            : base(
-                  alignmentX,
-                  alignmentY,
-                  destinationRect ?? RelativeRect.Fill,
-                  opacity,
-                  sourceRect ?? RelativeRect.Fill,
-                  stretch,
-                  tileMode,
-                  bitmapInterpolationMode)
-        {
-            Source = source;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableImageBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableImageBrush(IImageBrush source)
-            : base(source)
-        {
-            Source = source.Source;
-        }
-
-        /// <inheritdoc/>
-        public IBitmap Source { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableLinearGradientBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableLinearGradientBrush.cs
deleted file mode 100644
index 912d77d763..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableLinearGradientBrush.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// A brush that draws with a linear gradient.
-    /// </summary>
-    public class ImmutableLinearGradientBrush : ImmutableGradientBrush, ILinearGradientBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableLinearGradientBrush"/> class.
-        /// </summary>
-        /// <param name="gradientStops">The gradient stops.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="spreadMethod">The spread method.</param>
-        /// <param name="startPoint">The start point for the gradient.</param>
-        /// <param name="endPoint">The end point for the gradient.</param>
-        public ImmutableLinearGradientBrush(
-            IReadOnlyList<ImmutableGradientStop> gradientStops,
-            double opacity = 1,
-            GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
-            RelativePoint? startPoint = null,
-            RelativePoint? endPoint = null)
-            : base(gradientStops, opacity, spreadMethod)
-        {
-            StartPoint = startPoint ?? RelativePoint.TopLeft;
-            EndPoint = endPoint ?? RelativePoint.BottomRight;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableLinearGradientBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableLinearGradientBrush(LinearGradientBrush source)
-            : base(source)
-        {
-            StartPoint = source.StartPoint;
-            EndPoint = source.EndPoint;
-        }
-
-        /// <inheritdoc/>
-        public RelativePoint StartPoint { get; }
-
-        /// <inheritdoc/>
-        public RelativePoint EndPoint { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableRadialGradientBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableRadialGradientBrush.cs
deleted file mode 100644
index e26fbab5f5..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableRadialGradientBrush.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// A brush that draws with a radial gradient.
-    /// </summary>
-    public class ImmutableRadialGradientBrush : ImmutableGradientBrush, IRadialGradientBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableRadialGradientBrush"/> class.
-        /// </summary>
-        /// <param name="gradientStops">The gradient stops.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="spreadMethod">The spread method.</param>
-        /// <param name="center">The start point for the gradient.</param>
-        /// <param name="gradientOrigin">
-        /// The location of the two-dimensional focal point that defines the beginning of the gradient.
-        /// </param>
-        /// <param name="radius">
-        /// The horizontal and vertical radius of the outermost circle of the radial gradient.
-        /// </param>
-        public ImmutableRadialGradientBrush(
-            IReadOnlyList<ImmutableGradientStop> gradientStops,
-            double opacity = 1,
-            GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
-            RelativePoint? center = null,
-            RelativePoint? gradientOrigin = null,
-            double radius = 0.5)
-            : base(gradientStops, opacity, spreadMethod)
-        {
-            Center = center ?? RelativePoint.Center;
-            GradientOrigin = gradientOrigin ?? RelativePoint.Center;
-            Radius = radius;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableRadialGradientBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableRadialGradientBrush(RadialGradientBrush source)
-            : base(source)
-        {
-            Center = source.Center;
-            GradientOrigin = source.GradientOrigin;
-            Radius = source.Radius;
-        }
-
-        /// <inheritdoc/>
-        public RelativePoint Center { get; }
-
-        /// <inheritdoc/>
-        public RelativePoint GradientOrigin { get; }
-
-        /// <inheritdoc/>
-        public double Radius { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableSolidColorBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableSolidColorBrush.cs
deleted file mode 100644
index 46e1df4054..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableSolidColorBrush.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// Fills an area with a solid color.
-    /// </summary>
-    public class ImmutableSolidColorBrush : ISolidColorBrush, IEquatable<ImmutableSolidColorBrush>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
-        /// </summary>
-        /// <param name="color">The color to use.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        public ImmutableSolidColorBrush(Color color, double opacity = 1)
-        {
-            Color = color;
-            Opacity = opacity;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
-        /// </summary>
-        /// <param name="color">The color to use.</param>
-        public ImmutableSolidColorBrush(uint color)
-            : this(Color.FromUInt32(color))
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableSolidColorBrush(ISolidColorBrush source)
-            : this(source.Color, source.Opacity)
-        {
-        }
-
-        /// <summary>
-        /// Gets the color of the brush.
-        /// </summary>
-        public Color Color { get; }
-
-        /// <summary>
-        /// Gets the opacity of the brush.
-        /// </summary>
-        public double Opacity { get; }
-
-        public bool Equals(ImmutableSolidColorBrush? other)
-        {
-            if (ReferenceEquals(null, other)) return false;
-            if (ReferenceEquals(this, other)) return true;
-            return Color.Equals(other.Color) && Opacity.Equals(other.Opacity);
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is ImmutableSolidColorBrush other && Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return (Color.GetHashCode() * 397) ^ Opacity.GetHashCode();
-            }
-        }
-
-        public static bool operator ==(ImmutableSolidColorBrush left, ImmutableSolidColorBrush right)
-        {
-            return Equals(left, right);
-        }
-
-        public static bool operator !=(ImmutableSolidColorBrush left, ImmutableSolidColorBrush right)
-        {
-            return !Equals(left, right);
-        }
-
-        /// <summary>
-        /// Returns a string representation of the brush.
-        /// </summary>
-        /// <returns>A string representation of the brush.</returns>
-        public override string ToString()
-        {
-            return Color.ToString();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableTileBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableTileBrush.cs
deleted file mode 100644
index fd4d921516..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableTileBrush.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// A brush which displays a repeating image.
-    /// </summary>
-    public abstract class ImmutableTileBrush : ITileBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBrush"/> class.
-        /// </summary>
-        /// <param name="alignmentX">The horizontal alignment of a tile in the destination.</param>
-        /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
-        /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
-        /// <param name="stretch">
-        /// How the source rectangle will be stretched to fill the destination rect.
-        /// </param>
-        /// <param name="tileMode">The tile mode.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        protected ImmutableTileBrush(
-            AlignmentX alignmentX,
-            AlignmentY alignmentY,
-            RelativeRect destinationRect,
-            double opacity,
-            RelativeRect sourceRect,
-            Stretch stretch,
-            TileMode tileMode,
-            BitmapInterpolationMode bitmapInterpolationMode)
-        {
-            AlignmentX = alignmentX;
-            AlignmentY = alignmentY;
-            DestinationRect = destinationRect;
-            Opacity = opacity;
-            SourceRect = sourceRect;
-            Stretch = stretch;
-            TileMode = tileMode;
-            BitmapInterpolationMode = bitmapInterpolationMode;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        protected ImmutableTileBrush(ITileBrush source)
-            : this(
-                  source.AlignmentX,
-                  source.AlignmentY,
-                  source.DestinationRect,
-                  source.Opacity,
-                  source.SourceRect,
-                  source.Stretch,
-                  source.TileMode,
-                  source.BitmapInterpolationMode)
-        {
-        }
-
-        /// <inheritdoc/>
-        public AlignmentX AlignmentX { get; }
-
-        /// <inheritdoc/>
-        public AlignmentY AlignmentY { get; }
-
-        /// <inheritdoc/>
-        public RelativeRect DestinationRect { get; }
-
-        /// <inheritdoc/>
-        public double Opacity { get; }
-
-        /// <inheritdoc/>
-        public RelativeRect SourceRect { get; }
-
-        /// <inheritdoc/>
-        public Stretch Stretch { get; }
-
-        /// <inheritdoc/>
-        public TileMode TileMode { get; }
-
-        /// <inheritdoc/>
-        public BitmapInterpolationMode BitmapInterpolationMode { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableVisualBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableVisualBrush.cs
deleted file mode 100644
index 4c6aae08ab..0000000000
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableVisualBrush.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Avalonia.Visuals.Media.Imaging;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Media.Immutable
-{
-    /// <summary>
-    /// Paints an area with an <see cref="IVisual"/>.
-    /// </summary>
-    internal class ImmutableVisualBrush : ImmutableTileBrush, IVisualBrush
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableImageBrush"/> class.
-        /// </summary>
-        /// <param name="visual">The visual to draw.</param>
-        /// <param name="alignmentX">The horizontal alignment of a tile in the destination.</param>
-        /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
-        /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
-        /// <param name="opacity">The opacity of the brush.</param>
-        /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
-        /// <param name="stretch">
-        /// How the source rectangle will be stretched to fill the destination rect.
-        /// </param>
-        /// <param name="tileMode">The tile mode.</param>
-        /// <param name="bitmapInterpolationMode">Controls the quality of interpolation.</param>
-        public ImmutableVisualBrush(
-            IVisual visual,
-            AlignmentX alignmentX = AlignmentX.Center,
-            AlignmentY alignmentY = AlignmentY.Center,
-            RelativeRect? destinationRect = null,
-            double opacity = 1,
-            RelativeRect? sourceRect = null,
-            Stretch stretch = Stretch.Uniform,
-            TileMode tileMode = TileMode.None,
-            BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default)
-            : base(
-                  alignmentX,
-                  alignmentY,
-                  destinationRect ?? RelativeRect.Fill,
-                  opacity,
-                  sourceRect ?? RelativeRect.Fill,
-                  stretch,
-                  tileMode,
-                  bitmapInterpolationMode)
-        {
-            Visual = visual;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableVisualBrush"/> class.
-        /// </summary>
-        /// <param name="source">The brush from which this brush's properties should be copied.</param>
-        public ImmutableVisualBrush(IVisualBrush source)
-            : base(source)
-        {
-            Visual = source.Visual;
-        }
-
-        /// <inheritdoc/>
-        public IVisual Visual { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Pen.cs b/src/Avalonia.Visuals/Media/Pen.cs
deleted file mode 100644
index 65ba851100..0000000000
--- a/src/Avalonia.Visuals/Media/Pen.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-using System;
-using Avalonia.Media.Immutable;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes how a stroke is drawn.
-    /// </summary>
-    public sealed class Pen : AvaloniaObject, IPen, IWeakEventSubscriber<EventArgs>
-    {
-        /// <summary>
-        /// Defines the <see cref="Brush"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IBrush?> BrushProperty =
-            AvaloniaProperty.Register<Pen, IBrush?>(nameof(Brush));
-
-        /// <summary>
-        /// Defines the <see cref="Thickness"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> ThicknessProperty =
-            AvaloniaProperty.Register<Pen, double>(nameof(Thickness), 1.0);
-
-        /// <summary>
-        /// Defines the <see cref="DashStyle"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IDashStyle?> DashStyleProperty =
-            AvaloniaProperty.Register<Pen, IDashStyle?>(nameof(DashStyle));
-
-        /// <summary>
-        /// Defines the <see cref="LineCap"/> property.
-        /// </summary>
-        public static readonly StyledProperty<PenLineCap> LineCapProperty =
-            AvaloniaProperty.Register<Pen, PenLineCap>(nameof(LineCap));
-
-        /// <summary>
-        /// Defines the <see cref="LineJoin"/> property.
-        /// </summary>
-        public static readonly StyledProperty<PenLineJoin> LineJoinProperty =
-            AvaloniaProperty.Register<Pen, PenLineJoin>(nameof(LineJoin));
-
-        /// <summary>
-        /// Defines the <see cref="MiterLimit"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> MiterLimitProperty =
-            AvaloniaProperty.Register<Pen, double>(nameof(MiterLimit), 10.0);
-
-        private EventHandler? _invalidated;
-        private IAffectsRender? _subscribedToBrush;
-        private IAffectsRender? _subscribedToDashes;
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Pen"/> class.
-        /// </summary>
-        public Pen()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Pen"/> class.
-        /// </summary>
-        /// <param name="color">The stroke color.</param>
-        /// <param name="thickness">The stroke thickness.</param>
-        /// <param name="dashStyle">The dash style.</param>
-        /// <param name="lineCap">Specifies the type of graphic shape to use on both ends of a line.</param>
-        /// <param name="lineJoin">The line join.</param>
-        /// <param name="miterLimit">The miter limit.</param>
-        public Pen(
-            uint color,
-            double thickness = 1.0,
-            IDashStyle? dashStyle = null,
-            PenLineCap lineCap = PenLineCap.Flat,
-            PenLineJoin lineJoin = PenLineJoin.Miter,
-            double miterLimit = 10.0) : this(new SolidColorBrush(color), thickness, dashStyle, lineCap, lineJoin, miterLimit)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Pen"/> class.
-        /// </summary>
-        /// <param name="brush">The brush used to draw.</param>
-        /// <param name="thickness">The stroke thickness.</param>
-        /// <param name="dashStyle">The dash style.</param>
-        /// <param name="lineCap">The line cap.</param>
-        /// <param name="lineJoin">The line join.</param>
-        /// <param name="miterLimit">The miter limit.</param>
-        public Pen(
-            IBrush? brush,
-            double thickness = 1.0,
-            IDashStyle? dashStyle = null,
-            PenLineCap lineCap = PenLineCap.Flat,
-            PenLineJoin lineJoin = PenLineJoin.Miter,
-            double miterLimit = 10.0)
-        {
-            Brush = brush;
-            Thickness = thickness;
-            LineCap = lineCap;
-            LineJoin = lineJoin;
-            MiterLimit = miterLimit;
-            DashStyle = dashStyle;
-        }
-
-        /// <summary>
-        /// Gets or sets the brush used to draw the stroke.
-        /// </summary>
-        public IBrush? Brush
-        {
-            get => GetValue(BrushProperty);
-            set => SetValue(BrushProperty, value);
-        }
-
-        private static readonly WeakEvent<IAffectsRender, EventArgs> InvalidatedWeakEvent =
-            WeakEvent.Register<IAffectsRender>(
-                (s, h) => s.Invalidated += h,
-                (s, h) => s.Invalidated -= h);
-
-        /// <summary>
-        /// Gets or sets the stroke thickness.
-        /// </summary>
-        public double Thickness
-        {
-            get => GetValue(ThicknessProperty);
-            set => SetValue(ThicknessProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the style of dashed lines drawn with a <see cref="Pen"/> object.
-        /// </summary>
-        public IDashStyle? DashStyle
-        {
-            get => GetValue(DashStyleProperty);
-            set => SetValue(DashStyleProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the type of shape to use on both ends of a line.
-        /// </summary>
-        public PenLineCap LineCap
-        {
-            get => GetValue(LineCapProperty);
-            set => SetValue(LineCapProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the join style for the ends of two consecutive lines drawn with this
-        /// <see cref="Pen"/>.
-        /// </summary>
-        public PenLineJoin LineJoin
-        {
-            get => GetValue(LineJoinProperty);
-            set => SetValue(LineJoinProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the limit of the thickness of the join on a mitered corner.
-        /// </summary>
-        public double MiterLimit
-        {
-            get => GetValue(MiterLimitProperty);
-            set => SetValue(MiterLimitProperty, value);
-        }
-
-        /// <summary>
-        /// Raised when the pen changes.
-        /// </summary>
-        public event EventHandler? Invalidated
-        {
-            add
-            {
-                _invalidated += value;
-                UpdateSubscriptions();
-            }
-            remove
-            {
-                _invalidated -= value; 
-                UpdateSubscriptions();
-            }
-        }
-
-        /// <summary>
-        /// Creates an immutable clone of the brush.
-        /// </summary>
-        /// <returns>The immutable clone.</returns>
-        public ImmutablePen ToImmutable()
-        {
-            return new ImmutablePen(
-                Brush?.ToImmutable(),
-                Thickness,
-                DashStyle?.ToImmutable(),
-                LineCap,
-                LineJoin,
-                MiterLimit);
-        }
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-        {
-            _invalidated?.Invoke(this, EventArgs.Empty);
-            if(change.Property == BrushProperty)
-                UpdateSubscription(ref _subscribedToBrush, Brush);
-            if(change.Property == DashStyleProperty)
-                UpdateSubscription(ref _subscribedToDashes, DashStyle);
-            base.OnPropertyChanged(change);
-        }
-
-        
-        void UpdateSubscription(ref IAffectsRender? field, object? value)
-        {
-            if ((_invalidated == null || field != value) && field != null)
-            {
-                InvalidatedWeakEvent.Unsubscribe(field, this);
-                field = null;
-            }
-
-            if (_invalidated != null && field != value && value is IAffectsRender affectsRender)
-            {
-                InvalidatedWeakEvent.Subscribe(affectsRender, this);
-                field = affectsRender;
-            }
-        }
-
-        void UpdateSubscriptions()
-        {
-            UpdateSubscription(ref _subscribedToBrush, Brush);
-            UpdateSubscription(ref _subscribedToDashes, DashStyle);
-        }
-        
-        void IWeakEventSubscriber<EventArgs>.OnEvent(object? sender, WeakEvent ev, EventArgs e)
-        {
-            if (ev == InvalidatedWeakEvent) 
-                _invalidated?.Invoke(this, EventArgs.Empty);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/PixelRect.cs b/src/Avalonia.Visuals/Media/PixelRect.cs
deleted file mode 100644
index 0059a4b483..0000000000
--- a/src/Avalonia.Visuals/Media/PixelRect.cs
+++ /dev/null
@@ -1,452 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Represents a rectangle in device pixels.
-    /// </summary>
-    public readonly struct PixelRect : IEquatable<PixelRect>
-    {
-        /// <summary>
-        /// An empty rectangle.
-        /// </summary>
-        public static readonly PixelRect Empty = default;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
-        /// </summary>
-        /// <param name="x">The X position.</param>
-        /// <param name="y">The Y position.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        public PixelRect(int x, int y, int width, int height)
-        {
-            X = x;
-            Y = y;
-            Width = width;
-            Height = height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
-        /// </summary>
-        /// <param name="size">The size of the rectangle.</param>
-        public PixelRect(PixelSize size)
-        {
-            X = 0;
-            Y = 0;
-            Width = size.Width;
-            Height = size.Height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
-        /// </summary>
-        /// <param name="position">The position of the rectangle.</param>
-        /// <param name="size">The size of the rectangle.</param>
-        public PixelRect(PixelPoint position, PixelSize size)
-        {
-            X = position.X;
-            Y = position.Y;
-            Width = size.Width;
-            Height = size.Height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelRect"/> structure.
-        /// </summary>
-        /// <param name="topLeft">The top left position of the rectangle.</param>
-        /// <param name="bottomRight">The bottom right position of the rectangle.</param>
-        public PixelRect(PixelPoint topLeft, PixelPoint bottomRight)
-        {
-            X = topLeft.X;
-            Y = topLeft.Y;
-            Width = bottomRight.X - topLeft.X;
-            Height = bottomRight.Y - topLeft.Y;
-        }
-
-        /// <summary>
-        /// Gets the X position.
-        /// </summary>
-        public int X { get; }
-
-        /// <summary>
-        /// Gets the Y position.
-        /// </summary>
-        public int Y { get; }
-
-        /// <summary>
-        /// Gets the width.
-        /// </summary>
-        public int Width { get; }
-
-        /// <summary>
-        /// Gets the height.
-        /// </summary>
-        public int Height { get; }
-
-        /// <summary>
-        /// Gets the position of the rectangle.
-        /// </summary>
-        public PixelPoint Position => new PixelPoint(X, Y);
-
-        /// <summary>
-        /// Gets the size of the rectangle.
-        /// </summary>
-        public PixelSize Size => new PixelSize(Width, Height);
-
-        /// <summary>
-        /// Gets the right position of the rectangle.
-        /// </summary>
-        public int Right => X + Width;
-
-        /// <summary>
-        /// Gets the bottom position of the rectangle.
-        /// </summary>
-        public int Bottom => Y + Height;
-
-        /// <summary>
-        /// Gets the top left point of the rectangle.
-        /// </summary>
-        public PixelPoint TopLeft => new PixelPoint(X, Y);
-
-        /// <summary>
-        /// Gets the top right point of the rectangle.
-        /// </summary>
-        public PixelPoint TopRight => new PixelPoint(Right, Y);
-
-        /// <summary>
-        /// Gets the bottom left point of the rectangle.
-        /// </summary>
-        public PixelPoint BottomLeft => new PixelPoint(X, Bottom);
-
-        /// <summary>
-        /// Gets the bottom right point of the rectangle.
-        /// </summary>
-        public PixelPoint BottomRight => new PixelPoint(Right, Bottom);
-
-        /// <summary>
-        /// Gets the center point of the rectangle.
-        /// </summary>
-        public PixelPoint Center => new PixelPoint(X + (Width / 2), Y + (Height / 2));
-
-        /// <summary>
-        /// Gets a value that indicates whether the rectangle is empty.
-        /// </summary>
-        public bool IsEmpty => Width == 0 && Height == 0;
-
-        /// <summary>
-        /// Checks for equality between two <see cref="PixelRect"/>s.
-        /// </summary>
-        /// <param name="left">The first rect.</param>
-        /// <param name="right">The second rect.</param>
-        /// <returns>True if the rects are equal; otherwise false.</returns>
-        public static bool operator ==(PixelRect left, PixelRect right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Checks for inequality between two <see cref="PixelRect"/>s.
-        /// </summary>
-        /// <param name="left">The first rect.</param>
-        /// <param name="right">The second rect.</param>
-        /// <returns>True if the rects are unequal; otherwise false.</returns>
-        public static bool operator !=(PixelRect left, PixelRect right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Determines whether a point in in the bounds of the rectangle.
-        /// </summary>
-        /// <param name="p">The point.</param>
-        /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>
-        public bool Contains(PixelPoint p)
-        {
-            return p.X >= X && p.X <= Right && p.Y >= Y && p.Y <= Bottom;
-        }
-
-        /// <summary>
-        /// Determines whether the rectangle fully contains another rectangle.
-        /// </summary>
-        /// <param name="r">The rectangle.</param>
-        /// <returns>true if the rectangle is fully contained; otherwise false.</returns>
-        public bool Contains(PixelRect r)
-        {
-            return Contains(r.TopLeft) && Contains(r.BottomRight);
-        }
-
-        /// <summary>
-        /// Centers another rectangle in this rectangle.
-        /// </summary>
-        /// <param name="rect">The rectangle to center.</param>
-        /// <returns>The centered rectangle.</returns>
-        public PixelRect CenterRect(PixelRect rect)
-        {
-            return new PixelRect(
-                X + ((Width - rect.Width) / 2),
-                Y + ((Height - rect.Height) / 2),
-                rect.Width,
-                rect.Height);
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the rect is equal to the other given rect.
-        /// </summary>
-        /// <param name="other">The other rect to test equality against.</param>
-        /// <returns>True if this rect is equal to other; False otherwise.</returns>
-        public bool Equals(PixelRect other)
-        {
-            return Position == other.Position && Size == other.Size;
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the given object is equal to this rectangle.
-        /// </summary>
-        /// <param name="obj">The object to compare against.</param>
-        /// <returns>True if the object is equal to this rectangle; false otherwise.</returns>
-        public override bool Equals(object? obj) => obj is PixelRect other && Equals(other);
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hash = 17;
-                hash = (hash * 23) + X.GetHashCode();
-                hash = (hash * 23) + Y.GetHashCode();
-                hash = (hash * 23) + Width.GetHashCode();
-                hash = (hash * 23) + Height.GetHashCode();
-                return hash;
-            }
-        }
-
-        /// <summary>
-        /// Gets the intersection of two rectangles.
-        /// </summary>
-        /// <param name="rect">The other rectangle.</param>
-        /// <returns>The intersection.</returns>
-        public PixelRect Intersect(PixelRect rect)
-        {
-            var newLeft = (rect.X > X) ? rect.X : X;
-            var newTop = (rect.Y > Y) ? rect.Y : Y;
-            var newRight = (rect.Right < Right) ? rect.Right : Right;
-            var newBottom = (rect.Bottom < Bottom) ? rect.Bottom : Bottom;
-
-            if ((newRight > newLeft) && (newBottom > newTop))
-            {
-                return new PixelRect(newLeft, newTop, newRight - newLeft, newBottom - newTop);
-            }
-            else
-            {
-                return Empty;
-            }
-        }
-
-        /// <summary>
-        /// Determines whether a rectangle intersects with this rectangle.
-        /// </summary>
-        /// <param name="rect">The other rectangle.</param>
-        /// <returns>
-        /// True if the specified rectangle intersects with this one; otherwise false.
-        /// </returns>
-        public bool Intersects(PixelRect rect)
-        {
-            return (rect.X < Right) && (X < rect.Right) && (rect.Y < Bottom) && (Y < rect.Bottom);
-        }
-        
-        /// <summary>
-        /// Translates the rectangle by an offset.
-        /// </summary>
-        /// <param name="offset">The offset.</param>
-        /// <returns>The translated rectangle.</returns>
-        public PixelRect Translate(PixelVector offset)
-        {
-            return new PixelRect(Position + offset, Size);
-        }
-
-        /// <summary>
-        /// Gets the union of two rectangles.
-        /// </summary>
-        /// <param name="rect">The other rectangle.</param>
-        /// <returns>The union.</returns>
-        public PixelRect Union(PixelRect rect)
-        {
-            if (IsEmpty)
-            {
-                return rect;
-            }
-            else if (rect.IsEmpty)
-            {
-                return this;
-            }
-            else
-            {
-                var x1 = Math.Min(X, rect.X);
-                var x2 = Math.Max(Right, rect.Right);
-                var y1 = Math.Min(Y, rect.Y);
-                var y2 = Math.Max(Bottom, rect.Bottom);
-
-                return new PixelRect(new PixelPoint(x1, y1), new PixelPoint(x2, y2));
-            }
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="PixelRect"/> with the specified X position.
-        /// </summary>
-        /// <param name="x">The x position.</param>
-        /// <returns>The new <see cref="PixelRect"/>.</returns>
-        public PixelRect WithX(int x)
-        {
-            return new PixelRect(x, Y, Width, Height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="PixelRect"/> with the specified Y position.
-        /// </summary>
-        /// <param name="y">The y position.</param>
-        /// <returns>The new <see cref="PixelRect"/>.</returns>
-        public PixelRect WithY(int y)
-        {
-            return new PixelRect(X, y, Width, Height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="PixelRect"/> with the specified width.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <returns>The new <see cref="PixelRect"/>.</returns>
-        public PixelRect WithWidth(int width)
-        {
-            return new PixelRect(X, Y, width, Height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="PixelRect"/> with the specified height.
-        /// </summary>
-        /// <param name="height">The height.</param>
-        /// <returns>The new <see cref="PixelRect"/>.</returns>
-        public PixelRect WithHeight(int height)
-        {
-            return new PixelRect(X, Y, Width, Height);
-        }
-
-        /// <summary>
-        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
-        /// specified scaling factor.
-        /// </summary>
-        /// <param name="scale">The scaling factor.</param>
-        /// <returns>The device-independent rect.</returns>
-        public Rect ToRect(double scale) => new Rect(Position.ToPoint(scale), Size.ToSize(scale));
-
-        /// <summary>
-        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
-        /// specified scaling factor.
-        /// </summary>
-        /// <param name="scale">The scaling factor.</param>
-        /// <returns>The device-independent rect.</returns>
-        public Rect ToRect(Vector scale) => new Rect(Position.ToPoint(scale), Size.ToSize(scale));
-
-        /// <summary>
-        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
-        /// specified dots per inch (DPI).
-        /// </summary>
-        /// <param name="dpi">The dots per inch of the device.</param>
-        /// <returns>The device-independent rect.</returns>
-        public Rect ToRectWithDpi(double dpi) => new Rect(Position.ToPointWithDpi(dpi), Size.ToSizeWithDpi(dpi));
-
-        /// <summary>
-        /// Converts the <see cref="PixelRect"/> to a device-independent <see cref="Rect"/> using the
-        /// specified dots per inch (DPI).
-        /// </summary>
-        /// <param name="dpi">The dots per inch of the device.</param>
-        /// <returns>The device-independent rect.</returns>
-        public Rect ToRectWithDpi(Vector dpi) => new Rect(Position.ToPointWithDpi(dpi), Size.ToSizeWithDpi(dpi));
-
-        /// <summary>
-        /// Converts a <see cref="Rect"/> to device pixels using the specified scaling factor.
-        /// </summary>
-        /// <param name="rect">The rect.</param>
-        /// <param name="scale">The scaling factor.</param>
-        /// <returns>The device-independent rect.</returns>
-        public static PixelRect FromRect(Rect rect, double scale) => new PixelRect(
-            PixelPoint.FromPoint(rect.Position, scale),
-            FromPointCeiling(rect.BottomRight, new Vector(scale, scale)));
-
-        /// <summary>
-        /// Converts a <see cref="Rect"/> to device pixels using the specified scaling factor.
-        /// </summary>
-        /// <param name="rect">The rect.</param>
-        /// <param name="scale">The scaling factor.</param>
-        /// <returns>The device-independent point.</returns>
-        public static PixelRect FromRect(Rect rect, Vector scale) => new PixelRect(
-            PixelPoint.FromPoint(rect.Position, scale),
-            FromPointCeiling(rect.BottomRight, scale));
-
-        /// <summary>
-        /// Converts a <see cref="Rect"/> to device pixels using the specified dots per inch (DPI).
-        /// </summary>
-        /// <param name="rect">The rect.</param>
-        /// <param name="dpi">The dots per inch of the device.</param>
-        /// <returns>The device-independent point.</returns>
-        public static PixelRect FromRectWithDpi(Rect rect, double dpi) => new PixelRect(
-            PixelPoint.FromPointWithDpi(rect.Position, dpi),
-            FromPointCeiling(rect.BottomRight, new Vector(dpi / 96, dpi / 96)));
-
-        /// <summary>
-        /// Converts a <see cref="Rect"/> to device pixels using the specified dots per inch (DPI).
-        /// </summary>
-        /// <param name="rect">The rect.</param>
-        /// <param name="dpi">The dots per inch of the device.</param>
-        /// <returns>The device-independent point.</returns>
-        public static PixelRect FromRectWithDpi(Rect rect, Vector dpi) => new PixelRect(
-            PixelPoint.FromPointWithDpi(rect.Position, dpi),
-            FromPointCeiling(rect.BottomRight, dpi / 96));
-
-        /// <summary>
-        /// Returns the string representation of the rectangle.
-        /// </summary>
-        /// <returns>The string representation of the rectangle.</returns>
-        public override string ToString()
-        {
-            return string.Format(
-                CultureInfo.InvariantCulture,
-                "{0}, {1}, {2}, {3}",
-                X,
-                Y,
-                Width,
-                Height);
-        }
-
-        /// <summary>
-        /// Parses a <see cref="PixelRect"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The parsed <see cref="PixelRect"/>.</returns>
-        public static PixelRect Parse(string s)
-        {
-            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid PixelRect."))
-            {
-                return new PixelRect(
-                    tokenizer.ReadInt32(),
-                    tokenizer.ReadInt32(),
-                    tokenizer.ReadInt32(),
-                    tokenizer.ReadInt32()
-                );
-            }
-        }
-
-        private static PixelPoint FromPointCeiling(Point point, Vector scale)
-        {
-            return new PixelPoint(
-                (int)Math.Ceiling(point.X * scale.X),
-                (int)Math.Ceiling(point.Y * scale.Y));
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/RenderOptions.cs b/src/Avalonia.Visuals/Media/RenderOptions.cs
deleted file mode 100644
index 7abbc8a656..0000000000
--- a/src/Avalonia.Visuals/Media/RenderOptions.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media
-{ 
-    public class RenderOptions
-    {
-        /// <summary>
-        /// Defines the <see cref="BitmapInterpolationMode"/> property.
-        /// </summary>
-        public static readonly StyledProperty<BitmapInterpolationMode> BitmapInterpolationModeProperty =
-            AvaloniaProperty.RegisterAttached<RenderOptions, AvaloniaObject, BitmapInterpolationMode>(
-                "BitmapInterpolationMode", 
-                BitmapInterpolationMode.MediumQuality,
-                inherits: true);
-
-        /// <summary>
-        /// Gets the value of the BitmapInterpolationMode attached property for a control.
-        /// </summary>
-        /// <param name="element">The control.</param>
-        /// <returns>The control's left coordinate.</returns>
-        public static BitmapInterpolationMode GetBitmapInterpolationMode(AvaloniaObject element)
-        {
-            return element.GetValue(BitmapInterpolationModeProperty);
-        }
-
-        /// <summary>
-        /// Sets the value of the BitmapInterpolationMode attached property for a control.
-        /// </summary>
-        /// <param name="element">The control.</param>
-        /// <param name="value">The left value.</param>
-        public static void SetBitmapInterpolationMode(AvaloniaObject element, BitmapInterpolationMode value)
-        {
-            element.SetValue(BitmapInterpolationModeProperty, value);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/StreamGeometryContext.cs b/src/Avalonia.Visuals/Media/StreamGeometryContext.cs
deleted file mode 100644
index 88aba8365e..0000000000
--- a/src/Avalonia.Visuals/Media/StreamGeometryContext.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using Avalonia.Platform;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes a geometry using drawing commands.
-    /// </summary>
-    /// <remarks>
-    /// This class is used to define the geometry of a <see cref="StreamGeometry"/>. An instance
-    /// of <see cref="StreamGeometryContext"/> is obtained by calling
-    /// <see cref="StreamGeometry.Open"/>.
-    /// </remarks>
-    /// TODO: This class is just a wrapper around IStreamGeometryContextImpl: is it needed?
-    public class StreamGeometryContext : IGeometryContext
-    {
-        private readonly IStreamGeometryContextImpl _impl;
-
-        private Point _currentPoint;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StreamGeometryContext"/> class.
-        /// </summary>
-        /// <param name="impl">The platform-specific implementation.</param>
-        public StreamGeometryContext(IStreamGeometryContextImpl impl)
-        {
-            _impl = impl;
-        }
-
-        /// <summary>
-        /// Sets path's winding rule (default is EvenOdd). You should call this method before any calls to BeginFigure. If you wonder why, ask Direct2D guys about their design decisions.
-        /// </summary>
-        /// <param name="fillRule"></param>
-
-        public void SetFillRule(FillRule fillRule)
-        {
-            _impl.SetFillRule(fillRule);
-        }
-
-        /// <summary>
-        /// Draws an arc to the specified point.
-        /// </summary>
-        /// <param name="point">The destination point.</param>
-        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
-        /// <param name="rotationAngle">The rotation angle of the oval that specifies the curve.</param>
-        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
-        /// <param name="sweepDirection">
-        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
-        /// </param>
-        public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
-        {
-            _impl.ArcTo(point, size, rotationAngle, isLargeArc, sweepDirection);
-            _currentPoint = point;
-        }
-
-
-        /// <summary>
-        /// Draws an arc to the specified point using polylines, quadratic or cubic Bezier curves
-        /// Significantly more precise when drawing elliptic arcs with extreme width:height ratios.        
-        /// </summary>         
-        /// <param name="point">The destination point.</param>
-        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
-        /// <param name="rotationAngle">The rotation angle of the oval that specifies the curve.</param>
-        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
-        /// <param name="sweepDirection">
-        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
-        /// </param>
-        public void PreciseArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
-        {
-            PreciseEllipticArcHelper.ArcTo(this, _currentPoint, point, size, rotationAngle, isLargeArc, sweepDirection);
-        }
-
-        /// <summary>
-        /// Begins a new figure.
-        /// </summary>
-        /// <param name="startPoint">The starting point for the figure.</param>
-        /// <param name="isFilled">Whether the figure is filled.</param>
-        public void BeginFigure(Point startPoint, bool isFilled)
-        {
-            _impl.BeginFigure(startPoint, isFilled);
-            _currentPoint = startPoint;
-        }
-
-        /// <summary>
-        /// Draws a Bezier curve to the specified point.
-        /// </summary>
-        /// <param name="point1">The first control point used to specify the shape of the curve.</param>
-        /// <param name="point2">The second control point used to specify the shape of the curve.</param>
-        /// <param name="point3">The destination point for the end of the curve.</param>
-        public void CubicBezierTo(Point point1, Point point2, Point point3)
-        {
-            _impl.CubicBezierTo(point1, point2, point3);
-            _currentPoint = point3;
-        }
-
-        /// <summary>
-        /// Draws a quadratic Bezier curve to the specified point
-        /// </summary>
-        /// <param name="control">The control point used to specify the shape of the curve.</param>
-        /// <param name="endPoint">The destination point for the end of the curve.</param>
-        public void QuadraticBezierTo(Point control, Point endPoint)
-        {
-            _impl.QuadraticBezierTo(control, endPoint);
-            _currentPoint = endPoint;
-        }
-
-        /// <summary>
-        /// Draws a line to the specified point.
-        /// </summary>
-        /// <param name="point">The destination point.</param>
-        public void LineTo(Point point)
-        {
-            _impl.LineTo(point);
-            _currentPoint = point;
-        }
-
-        /// <summary>
-        /// Ends the figure started by <see cref="BeginFigure(Point, bool)"/>.
-        /// </summary>
-        /// <param name="isClosed">Whether the figure is closed.</param>
-        public void EndFigure(bool isClosed)
-        {
-            _impl.EndFigure(isClosed);
-        }
-
-        /// <summary>
-        /// Finishes the drawing session.
-        /// </summary>
-        public void Dispose()
-        {
-            _impl.Dispose();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextDecorationCollection.cs b/src/Avalonia.Visuals/Media/TextDecorationCollection.cs
deleted file mode 100644
index 2dced2252e..0000000000
--- a/src/Avalonia.Visuals/Media/TextDecorationCollection.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Collections;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// A collection that holds <see cref="TextDecoration"/> objects.
-    /// </summary>
-    public class TextDecorationCollection : AvaloniaList<TextDecoration>
-    {
-        /// <summary>
-        /// Parses a <see cref="TextDecorationCollection"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The <see cref="TextDecorationCollection"/>.</returns>
-        public static TextDecorationCollection Parse(string s)
-        {
-            var locations = new List<TextDecorationLocation>();
-
-            using (var tokenizer = new StringTokenizer(s, ',', "Invalid text decoration."))
-            {
-                while (tokenizer.TryReadString(out var name))
-                {
-                    var location = GetTextDecorationLocation(name);
-
-                    if (locations.Contains(location))
-                    {
-                        throw new ArgumentException("Text decoration already specified.", nameof(s));
-                    }
-
-                    locations.Add(location);
-                }
-            }
-
-            var textDecorations = new TextDecorationCollection();
-
-            foreach (var textDecorationLocation in locations)
-            {
-                textDecorations.Add(new TextDecoration { Location = textDecorationLocation });
-            }
-
-            return textDecorations;
-        }
-
-        /// <summary>
-        /// Parses a <see cref="TextDecorationLocation"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The <see cref="TextDecorationLocation"/>.</returns>
-        private static TextDecorationLocation GetTextDecorationLocation(string s)
-        {
-            if (Enum.TryParse<TextDecorationLocation>(s,true, out var location))
-            {
-                return location;
-            }
-
-            throw new ArgumentException("Could not parse text decoration.", nameof(s));
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/DrawableTextRun.cs b/src/Avalonia.Visuals/Media/TextFormatting/DrawableTextRun.cs
deleted file mode 100644
index 3757a4506a..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/DrawableTextRun.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// A text run that supports drawing content.
-    /// </summary>
-    public abstract class DrawableTextRun : TextRun
-    {
-        /// <summary>
-        /// Gets the size.
-        /// </summary>
-        public abstract Size Size { get; }
-
-        /// <summary>
-        /// Draws the <see cref="DrawableTextRun"/> at the given origin.
-        /// </summary>
-        /// <param name="drawingContext">The drawing context.</param>
-        /// <param name="origin">The origin.</param>
-        public abstract void Draw(DrawingContext drawingContext, Point origin);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/FormattedTextSource.cs b/src/Avalonia.Visuals/Media/TextFormatting/FormattedTextSource.cs
deleted file mode 100644
index 1b0feaa718..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/FormattedTextSource.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    internal readonly struct FormattedTextSource : ITextSource
-    {
-        private readonly ReadOnlySlice<char> _text;
-        private readonly TextRunProperties _defaultProperties;
-        private readonly IReadOnlyList<ValueSpan<TextRunProperties>>? _textModifier;
-
-        public FormattedTextSource(ReadOnlySlice<char> text, TextRunProperties defaultProperties,
-            IReadOnlyList<ValueSpan<TextRunProperties>>? textModifier)
-        {
-            _text = text;
-            _defaultProperties = defaultProperties;
-            _textModifier = textModifier;
-        }
-
-        public TextRun? GetTextRun(int textSourceIndex)
-        {
-            if (textSourceIndex > _text.Length)
-            {
-                return null;
-            }
-
-            var runText = _text.Skip(textSourceIndex);
-
-            if (runText.IsEmpty)
-            {
-                return new TextEndOfParagraph();
-            }
-
-            var textStyleRun = CreateTextStyleRun(runText, _defaultProperties, _textModifier);
-
-            return new TextCharacters(runText.Take(textStyleRun.Length), textStyleRun.Value);
-        }
-
-        /// <summary>
-        /// Creates a span of text run properties that has modifier applied.
-        /// </summary>
-        /// <param name="text">The text to create the properties for.</param>
-        /// <param name="defaultProperties">The default text properties.</param>
-        /// <param name="textModifier">The text properties modifier.</param>
-        /// <returns>
-        /// The created text style run.
-        /// </returns>
-        private static ValueSpan<TextRunProperties> CreateTextStyleRun(ReadOnlySlice<char> text,
-            TextRunProperties defaultProperties, IReadOnlyList<ValueSpan<TextRunProperties>>? textModifier)
-        {
-            if (textModifier == null || textModifier.Count == 0)
-            {
-                return new ValueSpan<TextRunProperties>(text.Start, text.Length, defaultProperties);
-            }
-
-            var currentProperties = defaultProperties;
-
-            var hasOverride = false;
-
-            var i = 0;
-
-            var length = 0;
-
-            for (; i < textModifier.Count; i++)
-            {
-                var propertiesOverride = textModifier[i];
-
-                var textRange = new TextRange(propertiesOverride.Start, propertiesOverride.Length);
-
-                if (textRange.Start + textRange.Length <= text.Start)
-                {
-                    continue;
-                }
-
-                if (textRange.Start > text.End)
-                {
-                    length = text.Length;
-                    break;
-                }
-
-                if (textRange.Start > text.Start)
-                {
-                    if (propertiesOverride.Value != currentProperties)
-                    {
-                        length = Math.Min(Math.Abs(textRange.Start - text.Start), text.Length);
-
-                        break;
-                    }
-                }
-
-                length += Math.Max(0, textRange.Start + textRange.Length - text.Start);
-
-                if (hasOverride)
-                {
-                    continue;
-                }
-
-                hasOverride = true;
-
-                currentProperties = propertiesOverride.Value;
-            }
-
-            if (length < text.Length && i == textModifier.Count)
-            {
-                if (currentProperties == defaultProperties)
-                {
-                    length = text.Length;
-                }
-            }
-
-            if (length == 0 && currentProperties != defaultProperties)
-            {
-                currentProperties = defaultProperties;
-                length = text.Length;
-            }
-
-            if (length != text.Length)
-            {
-                text = text.Take(length);
-            }
-
-            return new ValueSpan<TextRunProperties>(text.Start, length, currentProperties);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ITextSource.cs b/src/Avalonia.Visuals/Media/TextFormatting/ITextSource.cs
deleted file mode 100644
index 32012ab8e9..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/ITextSource.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Produces <see cref="TextRun"/> objects that are used by the <see cref="TextFormatter"/>.
-    /// </summary>
-    public interface ITextSource
-    {
-        /// <summary>
-        /// Gets a <see cref="TextRun"/> for specified text source index.
-        /// </summary>
-        /// <param name="textSourceIndex">The text source index.</param>
-        /// <returns>The text run.</returns>
-        TextRun? GetTextRun(int textSourceIndex);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
deleted file mode 100644
index 88ca596d2d..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-using System;
-using System.Diagnostics;
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// A text run that holds shaped characters.
-    /// </summary>
-    public sealed class ShapedTextCharacters : DrawableTextRun
-    {
-        private GlyphRun? _glyphRun;
-
-        public ShapedTextCharacters(ShapedBuffer shapedBuffer, TextRunProperties properties)
-        {
-            ShapedBuffer = shapedBuffer;
-            Text = shapedBuffer.Text;
-            Properties = properties;
-            TextSourceLength = Text.Length;
-            FontMetrics = new FontMetrics(properties.Typeface, properties.FontRenderingEmSize);
-        }
-
-        public bool IsReversed { get; private set; }
-
-        public sbyte BidiLevel => ShapedBuffer.BidiLevel;
-
-        public ShapedBuffer ShapedBuffer { get; }
-
-        /// <inheritdoc/>
-        public override ReadOnlySlice<char> Text { get; }
-
-        /// <inheritdoc/>
-        public override TextRunProperties Properties { get; }
-
-        /// <inheritdoc/>
-        public override int TextSourceLength { get; }
-
-        public FontMetrics FontMetrics { get; }
-
-        public override Size Size => GlyphRun.Size;
-
-        public GlyphRun GlyphRun
-        {
-            get
-            {
-                if(_glyphRun is null)
-                {
-                    _glyphRun = CreateGlyphRun();
-                }
-
-                return _glyphRun;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void Draw(DrawingContext drawingContext, Point origin)
-        {
-            using (drawingContext.PushPreTransform(Matrix.CreateTranslation(origin)))
-            {
-                if (GlyphRun.GlyphIndices.Count == 0)
-                {
-                    return;
-                }
-
-                if (Properties.Typeface == default)
-                {
-                    return;
-                }
-
-                if (Properties.ForegroundBrush == null)
-                {
-                    return;
-                }
-
-                if (Properties.BackgroundBrush != null)
-                {
-                    drawingContext.DrawRectangle(Properties.BackgroundBrush, null, new Rect(Size));
-                }
-
-                drawingContext.DrawGlyphRun(Properties.ForegroundBrush, GlyphRun);
-
-                if (Properties.TextDecorations == null)
-                {
-                    return;
-                }
-
-                foreach (var textDecoration in Properties.TextDecorations)
-                {
-                    textDecoration.Draw(drawingContext, GlyphRun, FontMetrics, Properties.ForegroundBrush);
-                }
-            }
-        }
-
-        internal void Reverse()
-        {
-            _glyphRun = null;
-
-            ShapedBuffer.GlyphInfos.Span.Reverse();
-
-            IsReversed = !IsReversed;
-        }
-
-        /// <summary>
-        /// Measures the number of characters that fit into available width.
-        /// </summary>
-        /// <param name="availableWidth">The available width.</param>
-        /// <param name="length">The count of fitting characters.</param>
-        /// <returns>
-        /// <c>true</c> if characters fit into the available width; otherwise, <c>false</c>.
-        /// </returns>
-        internal bool TryMeasureCharacters(double availableWidth, out int length)
-        {
-            length = 0;
-            var currentWidth = 0.0;
-
-            for (var i = 0; i < ShapedBuffer.Length; i++)
-            {
-                var advance = ShapedBuffer.GlyphAdvances[i];
-
-                if (currentWidth + advance > availableWidth)
-                {
-                    break;
-                }
-
-                Codepoint.ReadAt(GlyphRun.Characters, length, out var count);
-
-                length += count;
-                currentWidth += advance;
-            }
-
-            return length > 0;
-        }
-
-        internal SplitResult<ShapedTextCharacters> Split(int length)
-        {
-            if (IsReversed)
-            {
-                Reverse();
-            }
-
-#if DEBUG
-            if(length == 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(length), "length must be greater than zero.");
-            }
-#endif
-            
-            var splitBuffer = ShapedBuffer.Split(length);
-
-            var first = new ShapedTextCharacters(splitBuffer.First, Properties);
-
-            #if DEBUG
-
-            if (first.Text.Length != length)
-            {
-                throw new InvalidOperationException("Split length mismatch.");
-            }
-            
-            #endif
-
-            var second = new ShapedTextCharacters(splitBuffer.Second!, Properties);
-
-            return new SplitResult<ShapedTextCharacters>(first, second);
-        }
-
-        internal GlyphRun CreateGlyphRun()
-        {
-            return new GlyphRun(
-                ShapedBuffer.GlyphTypeface,
-                ShapedBuffer.FontRenderingEmSize,
-                Text,
-                ShapedBuffer.GlyphIndices,
-                ShapedBuffer.GlyphAdvances,
-                ShapedBuffer.GlyphOffsets,
-                ShapedBuffer.GlyphClusters,
-                BidiLevel);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs
deleted file mode 100644
index c4b2dfb3a5..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// A text run that holds text characters.
-    /// </summary>
-    public class TextCharacters : TextRun
-    {
-        public TextCharacters(ReadOnlySlice<char> text, TextRunProperties properties)
-        {
-            TextSourceLength = text.Length;
-            Text = text;
-            Properties = properties;
-        }
-
-        public TextCharacters(ReadOnlySlice<char> text, int offsetToFirstCharacter, int length,
-            TextRunProperties properties)
-        {
-            Text = text.Skip(offsetToFirstCharacter).Take(length);
-            TextSourceLength = length;
-            Properties = properties;
-        }
-
-        /// <inheritdoc />
-        public override int TextSourceLength { get; }
-
-        /// <inheritdoc />
-        public override ReadOnlySlice<char> Text { get; }
-
-        /// <inheritdoc />
-        public override TextRunProperties Properties { get; }
-
-        /// <summary>
-        /// Gets a list of <see cref="ShapeableTextCharacters"/>.
-        /// </summary>
-        /// <returns>The shapeable text characters.</returns>
-        internal IList<ShapeableTextCharacters> GetShapeableCharacters(ReadOnlySlice<char> runText, sbyte biDiLevel, 
-            ref TextRunProperties? previousProperties)
-        {
-            var shapeableCharacters = new List<ShapeableTextCharacters>(2);
-
-            while (!runText.IsEmpty)
-            {
-                var shapeableRun = CreateShapeableRun(runText, Properties, biDiLevel, ref previousProperties);
-
-                shapeableCharacters.Add(shapeableRun);
-
-                runText = runText.Skip(shapeableRun.Text.Length);
-
-                previousProperties = shapeableRun.Properties;
-            }
-
-            return shapeableCharacters;
-        }
-
-        /// <summary>
-        /// Creates a shapeable text run with unique properties.
-        /// </summary>
-        /// <param name="text">The text to create text runs from.</param>
-        /// <param name="defaultProperties">The default text run properties.</param>
-        /// <param name="biDiLevel">The bidi level of the run.</param>
-        /// <param name="previousProperties"></param>
-        /// <returns>A list of shapeable text runs.</returns>
-        private static ShapeableTextCharacters CreateShapeableRun(ReadOnlySlice<char> text, 
-            TextRunProperties defaultProperties, sbyte biDiLevel, ref TextRunProperties? previousProperties)
-        {
-            var defaultTypeface = defaultProperties.Typeface;
-            var currentTypeface = defaultTypeface;
-            var previousTypeface = previousProperties?.Typeface;
-
-            if (TryGetShapeableLength(text, currentTypeface, out var count, out var script))
-            {
-                if (script == Script.Common && previousTypeface is not null)
-                {
-                    if(TryGetShapeableLength(text, previousTypeface.Value, out var fallbackCount, out _))
-                    {
-                        return new ShapeableTextCharacters(text.Take(fallbackCount),
-                            defaultProperties.WithTypeface(previousTypeface.Value), biDiLevel);
-                    }
-                }
-
-                return new ShapeableTextCharacters(text.Take(count), defaultProperties.WithTypeface(currentTypeface),
-                    biDiLevel);
-            }
-            
-            if (previousTypeface is not null)
-            {
-                if(TryGetShapeableLength(text, previousTypeface.Value, out count, out _))
-                {
-                    return new ShapeableTextCharacters(text.Take(count),
-                        defaultProperties.WithTypeface(previousTypeface.Value), biDiLevel);
-                }
-            }
-
-            var codepoint = Codepoint.ReplacementCodepoint;
-
-            var codepointEnumerator = new CodepointEnumerator(text.Skip(count));
-
-            while (codepointEnumerator.MoveNext())
-            {
-                if (codepointEnumerator.Current.IsWhiteSpace)
-                {
-                    continue;
-                }
-                
-                codepoint = codepointEnumerator.Current;
-                    
-                break;
-            }
-            
-            //ToDo: Fix FontFamily fallback
-            var matchFound =
-                FontManager.Current.TryMatchCharacter(codepoint, defaultTypeface.Style, defaultTypeface.Weight,
-                    defaultTypeface.Stretch, defaultTypeface.FontFamily, defaultProperties.CultureInfo,
-                    out currentTypeface);
-
-            if (matchFound && TryGetShapeableLength(text, currentTypeface, out count, out _))
-            {
-                //Fallback found
-                return new ShapeableTextCharacters(text.Take(count), defaultProperties.WithTypeface(currentTypeface),
-                    biDiLevel);
-            }
-
-            // no fallback found
-            currentTypeface = defaultTypeface;
-
-            var glyphTypeface = currentTypeface.GlyphTypeface;
-
-            var enumerator = new GraphemeEnumerator(text);
-
-            while (enumerator.MoveNext())
-            {
-                var grapheme = enumerator.Current;
-
-                if (!grapheme.FirstCodepoint.IsWhiteSpace && glyphTypeface.TryGetGlyph(grapheme.FirstCodepoint, out _))
-                {
-                    break;
-                }
-
-                count += grapheme.Text.Length;
-            }
-
-            return new ShapeableTextCharacters(text.Take(count), defaultProperties, biDiLevel);
-        }
-
-        /// <summary>
-        /// Tries to get a shapeable length that is supported by the specified typeface.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        /// <param name="typeface">The typeface that is used to find matching characters.</param>
-        /// <param name="length">The shapeable length.</param>
-        /// <param name="script"></param>
-        /// <returns></returns>
-        protected static bool TryGetShapeableLength(ReadOnlySlice<char> text, Typeface typeface, out int length,
-            out Script script)
-        {
-            length = 0;
-            script = Script.Unknown;
-
-            if (text.Length == 0)
-            {
-                return false;
-            }
-
-            var font = typeface.GlyphTypeface;
-
-            var enumerator = new GraphemeEnumerator(text);
-
-            while (enumerator.MoveNext())
-            {
-                var currentGrapheme = enumerator.Current;
-
-                var currentScript = currentGrapheme.FirstCodepoint.Script;
-
-                //Stop at the first missing glyph
-                if (!currentGrapheme.FirstCodepoint.IsBreakChar && !font.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
-                {
-                    break;
-                }
-                
-                if (currentScript != script)
-                {
-                    if (script is Script.Unknown || currentScript != Script.Common &&
-                        script is Script.Common or Script.Inherited)
-                    {
-                        script = currentScript;
-                    }
-                    else
-                    {
-                        if (currentScript != Script.Inherited && currentScript != Script.Common)
-                        {
-                            break;
-                        }
-                    }
-                }
-
-                length += currentGrapheme.Text.Length;
-            }
-
-            return length > 0;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingProperties.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingProperties.cs
deleted file mode 100644
index ffd65423a3..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingProperties.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Properties of text collapsing
-    /// </summary>
-    public abstract class TextCollapsingProperties
-    {
-        /// <summary>
-        /// Gets the width in which the collapsible range is constrained to
-        /// </summary>
-        public abstract double Width { get; }
-
-        /// <summary>
-        /// Gets the text run that is used as collapsing symbol
-        /// </summary>
-        public abstract TextRun Symbol { get; }
-
-        /// <summary>
-        /// Gets the style of collapsing
-        /// </summary>
-        public abstract TextCollapsingStyle Style { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingStyle.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingStyle.cs
deleted file mode 100644
index 1523cc4d9a..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingStyle.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Text collapsing style
-    /// </summary>
-    public enum TextCollapsingStyle
-    {
-        /// <summary>
-        /// Collapse trailing characters
-        /// </summary>
-        TrailingCharacter,
-
-        /// <summary>
-        /// Collapse trailing words
-        /// </summary>
-        TrailingWord,
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatter.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatter.cs
deleted file mode 100644
index d521077a43..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatter.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using Avalonia.Media.TextFormatting.Unicode;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Represents a base class for text formatting.
-    /// </summary>
-    public abstract class TextFormatter
-    {
-        /// <summary>
-        /// Gets the current <see cref="TextFormatter"/> that is used for non complex text formatting.
-        /// </summary>
-        public static TextFormatter Current
-        {
-            get
-            {
-                var current = AvaloniaLocator.Current.GetService<TextFormatter>();
-
-                if (current != null)
-                {
-                    return current;
-                }
-
-                current = new TextFormatterImpl();
-
-                AvaloniaLocator.CurrentMutable.Bind<TextFormatter>().ToConstant(current);
-
-                return current;
-            }
-        }
-
-        /// <summary>
-        /// Formats a text line.
-        /// </summary>
-        /// <param name="textSource">The text source.</param>
-        /// <param name="firstTextSourceIndex">The first character index to start the text line from.</param>
-        /// <param name="paragraphWidth">A <see cref="double"/> value that specifies the width of the paragraph that the line fills.</param>
-        /// <param name="paragraphProperties">A <see cref="TextParagraphProperties"/> value that represents paragraph properties,
-        /// such as TextWrapping, TextAlignment, or TextStyle.</param>
-        /// <param name="previousLineBreak">A <see cref="TextLineBreak"/> value that specifies the text formatter state,
-        /// in terms of where the previous line in the paragraph was broken by the text formatting process.</param>
-        /// <returns>The formatted line.</returns>
-        public abstract TextLine FormatLine(ITextSource textSource, int firstTextSourceIndex, double paragraphWidth,
-            TextParagraphProperties paragraphProperties, TextLineBreak? previousLineBreak = null);
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
deleted file mode 100644
index 13ed850715..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
+++ /dev/null
@@ -1,652 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.InteropServices;
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    internal class TextFormatterImpl : TextFormatter
-    {
-        /// <inheritdoc cref="TextFormatter.FormatLine"/>
-        public override TextLine FormatLine(ITextSource textSource, int firstTextSourceIndex, double paragraphWidth,
-            TextParagraphProperties paragraphProperties, TextLineBreak? previousLineBreak = null)
-        {
-            var textWrapping = paragraphProperties.TextWrapping;
-            FlowDirection flowDirection;
-            TextLineBreak? nextLineBreak = null;
-            List<ShapedTextCharacters> shapedRuns;
-
-            var textRuns = FetchTextRuns(textSource, firstTextSourceIndex,
-                out var textEndOfLine, out var textRange);
-
-            if (previousLineBreak?.RemainingCharacters != null)
-            {
-                flowDirection = previousLineBreak.FlowDirection;
-                shapedRuns = previousLineBreak.RemainingCharacters.ToList();
-                nextLineBreak = previousLineBreak;
-            }
-            else
-            {
-                shapedRuns = ShapeTextRuns(textRuns, paragraphProperties.FlowDirection,out flowDirection);
-
-                if(nextLineBreak == null && textEndOfLine != null)
-                {
-                    nextLineBreak = new TextLineBreak(textEndOfLine, flowDirection);
-                }
-            }
-
-            TextLineImpl textLine;
-
-            switch (textWrapping)
-            {
-                case TextWrapping.NoWrap:
-                    {
-                        TextLineImpl.SortRuns(shapedRuns);
-
-                        textLine = new TextLineImpl(shapedRuns, textRange, paragraphWidth, paragraphProperties,
-                        flowDirection, nextLineBreak);
-
-                        textLine.FinalizeLine();
-
-                        break;
-                    }
-                case TextWrapping.WrapWithOverflow:
-                case TextWrapping.Wrap:
-                    {
-                        textLine = PerformTextWrapping(shapedRuns, textRange, paragraphWidth, paragraphProperties,
-                            flowDirection, nextLineBreak);
-                        break;
-                    }
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(textWrapping));
-            }
-
-            return textLine;
-        }
-
-        /// <summary>
-        /// Split a sequence of runs into two segments at specified length.
-        /// </summary>
-        /// <param name="textRuns">The text run's.</param>
-        /// <param name="length">The length to split at.</param>
-        /// <returns>The split text runs.</returns>
-        internal static SplitResult<List<ShapedTextCharacters>> SplitShapedRuns(List<ShapedTextCharacters> textRuns, int length)
-        {
-            var currentLength = 0;
-
-            for (var i = 0; i < textRuns.Count; i++)
-            {
-                var currentRun = textRuns[i];
-
-                if (currentLength + currentRun.Text.Length < length)
-                {
-                    currentLength += currentRun.Text.Length;
-                    continue;
-                }
-
-                var firstCount = currentRun.Text.Length >= 1 ? i + 1 : i;
-
-                var first = new List<ShapedTextCharacters>(firstCount);
-
-                if (firstCount > 1)
-                {
-                    for (var j = 0; j < i; j++)
-                    {
-                        first.Add(textRuns[j]);
-                    }
-                }
-
-                var secondCount = textRuns.Count - firstCount;
-
-                if (currentLength + currentRun.Text.Length == length)
-                {
-                    var second = secondCount > 0 ? new List<ShapedTextCharacters>(secondCount) : null;
-
-                    if (second != null)
-                    {
-                        var offset = currentRun.Text.Length >= 1 ? 1 : 0;
-
-                        for (var j = 0; j < secondCount; j++)
-                        {
-                            second.Add(textRuns[i + j + offset]);
-                        }
-                    }
-
-                    first.Add(currentRun);
-
-                    return new SplitResult<List<ShapedTextCharacters>>(first, second);
-                }
-                else
-                {
-                    secondCount++;
-
-                    var second = new List<ShapedTextCharacters>(secondCount);
-
-                    var split = currentRun.Split(length - currentLength);
-
-                    first.Add(split.First);
-
-                    second.Add(split.Second!);
-
-                    for (var j = 1; j < secondCount; j++)
-                    {
-                        second.Add(textRuns[i + j]);
-                    }
-
-                    return new SplitResult<List<ShapedTextCharacters>>(first, second);
-                }
-            }
-
-            return new SplitResult<List<ShapedTextCharacters>>(textRuns, null);
-        }
-
-        /// <summary>
-        /// Shape specified text runs with specified paragraph embedding.
-        /// </summary>
-        /// <param name="textRuns">The text runs to shape.</param>
-        /// <param name="flowDirection">The paragraph embedding level.</param>
-        /// <param name="resolvedFlowDirection">The resolved flow direction.</param>
-        /// <returns>
-        /// A list of shaped text characters.
-        /// </returns>
-        private static List<ShapedTextCharacters> ShapeTextRuns(List<TextCharacters> textRuns,
-            FlowDirection flowDirection, out FlowDirection resolvedFlowDirection)
-        {
-            var shapedTextCharacters = new List<ShapedTextCharacters>();
-
-            var biDiData = new BidiData((sbyte)flowDirection);
-
-            foreach (var textRun in textRuns)
-            {
-                biDiData.Append(textRun.Text);
-            }
-
-            var biDi = BidiAlgorithm.Instance.Value!;
-
-            biDi.Process(biDiData);
-
-            var resolvedEmbeddingLevel = biDi.ResolveEmbeddingLevel(biDiData.Classes);
-
-            resolvedFlowDirection =
-                (resolvedEmbeddingLevel & 1) == 0 ? FlowDirection.LeftToRight : FlowDirection.RightToLeft;
-
-            var shapeableRuns = new List<ShapeableTextCharacters>(textRuns.Count);
-
-            foreach (var coalescedRuns in CoalesceLevels(textRuns, biDi.ResolvedLevels))
-            {
-                shapeableRuns.AddRange(coalescedRuns);
-            }
-
-            for (var index = 0; index < shapeableRuns.Count; index++)
-            {
-                var currentRun = shapeableRuns[index];
-                var groupedRuns = new List<ShapeableTextCharacters>(2) { currentRun };
-                var text = currentRun.Text;
-                var start = currentRun.Text.Start;
-                var length = currentRun.Text.Length;
-                var bufferOffset = currentRun.Text.BufferOffset;
-
-                while (index + 1 < shapeableRuns.Count)
-                {
-                    var nextRun = shapeableRuns[index + 1];
-
-                    if (currentRun.CanShapeTogether(nextRun))
-                    {
-                        groupedRuns.Add(nextRun);
-
-                        length += nextRun.Text.Length;
-                        
-                        if (start > nextRun.Text.Start)
-                        {
-                            start = nextRun.Text.Start;
-                        }
-
-                        if (bufferOffset > nextRun.Text.BufferOffset)
-                        {
-                            bufferOffset = nextRun.Text.BufferOffset;
-                        }
-
-                        text = new ReadOnlySlice<char>(text.Buffer, start, length, bufferOffset);
-                        
-                        index++;
-
-                        currentRun = nextRun;
-
-                        continue;
-                    }
-
-                    break;
-                }
-
-                shapedTextCharacters.AddRange(ShapeTogether(groupedRuns, text));
-            }
-
-            return shapedTextCharacters;
-        }
-
-        private static IReadOnlyList<ShapedTextCharacters> ShapeTogether(
-            IReadOnlyList<ShapeableTextCharacters> textRuns, ReadOnlySlice<char> text)
-        {
-            var shapedRuns = new List<ShapedTextCharacters>(textRuns.Count);
-            var firstRun = textRuns[0];
-
-            var shapedBuffer = TextShaper.Current.ShapeText(text, firstRun.Properties.Typeface.GlyphTypeface,
-                firstRun.Properties.FontRenderingEmSize, firstRun.Properties.CultureInfo, firstRun.BidiLevel);
-
-            for (var i = 0; i < textRuns.Count; i++)
-            {
-                var currentRun = textRuns[i];
-
-                var splitResult = shapedBuffer.Split(currentRun.Text.Length);
-
-                shapedRuns.Add(new ShapedTextCharacters(splitResult.First, currentRun.Properties));
-
-                shapedBuffer = splitResult.Second!;
-            }
-
-            return shapedRuns;
-        }
-
-        /// <summary>
-        /// Coalesces ranges of the same bidi level to form <see cref="ShapeableTextCharacters"/>
-        /// </summary>
-        /// <param name="textCharacters">The text characters to form <see cref="ShapeableTextCharacters"/> from.</param>
-        /// <param name="levels">The bidi levels.</param>
-        /// <returns></returns>
-        private static IEnumerable<IList<ShapeableTextCharacters>> CoalesceLevels(
-            IReadOnlyList<TextCharacters> textCharacters,
-            ReadOnlySlice<sbyte> levels)
-        {
-            if (levels.Length == 0)
-            {
-                yield break;
-            }
-
-            var levelIndex = 0;
-            var runLevel = levels[0];
-
-            TextRunProperties? previousProperties = null;
-            TextCharacters? currentRun = null;
-            var runText = ReadOnlySlice<char>.Empty;
-
-            for (var i = 0; i < textCharacters.Count; i++)
-            {
-                var j = 0;
-                currentRun = textCharacters[i];
-                runText = currentRun.Text;
-
-                for (; j < runText.Length;)
-                {
-                    Codepoint.ReadAt(runText, j, out var count);
-
-                    if (levelIndex + 1 == levels.Length)
-                    {
-                        break;
-                    }
-
-                    levelIndex++;
-                    j += count;
-
-                    if (j == runText.Length)
-                    {
-                        yield return currentRun.GetShapeableCharacters(runText.Take(j), runLevel, ref previousProperties);
-
-                        runLevel = levels[levelIndex];
-
-                        continue;
-                    }
-
-                    if (levels[levelIndex] == runLevel)
-                    {
-                        continue;
-                    }
-
-                    // End of this run
-                    yield return currentRun.GetShapeableCharacters(runText.Take(j), runLevel, ref previousProperties);
-
-                    runText = runText.Skip(j);
-
-                    j = 0;
-
-                    // Move to next run
-                    runLevel = levels[levelIndex];
-                }
-            }
-
-            if (currentRun is null || runText.IsEmpty)
-            {
-                yield break;
-            }
-
-            yield return currentRun.GetShapeableCharacters(runText, runLevel, ref previousProperties);
-        }
-
-        /// <summary>
-        /// Fetches text runs.
-        /// </summary>
-        /// <param name="textSource">The text source.</param>
-        /// <param name="firstTextSourceIndex">The first text source index.</param>
-        /// <param name="endOfLine"></param>
-        /// <param name="textRange"></param>
-        /// <returns>
-        /// The formatted text runs.
-        /// </returns>
-        private static List<TextCharacters> FetchTextRuns(ITextSource textSource, int firstTextSourceIndex,
-            out TextEndOfLine? endOfLine, out TextRange textRange)
-        {
-            var length = 0;
-
-            endOfLine = null;
-
-            var textRuns = new List<TextCharacters>();
-
-            var textRunEnumerator = new TextRunEnumerator(textSource, firstTextSourceIndex);
-
-            while (textRunEnumerator.MoveNext())
-            {
-                var textRun = textRunEnumerator.Current;
-
-                if(textRun == null)
-                {
-                    break;
-                }
-
-                switch (textRun)
-                {
-                    case TextCharacters textCharacters:
-                        {
-                            if (TryGetLineBreak(textCharacters, out var runLineBreak))
-                            {
-                                var splitResult = new TextCharacters(textCharacters.Text.Take(runLineBreak.PositionWrap),
-                                    textCharacters.Properties);
-
-                                textRuns.Add(splitResult);
-
-                                length += runLineBreak.PositionWrap;
-
-                                textRange = new TextRange(firstTextSourceIndex, length);
-
-                                return textRuns;
-                            }
-
-                            textRuns.Add(textCharacters);
-
-                            break;
-                        }
-                    case TextEndOfLine textEndOfLine:
-                        endOfLine = textEndOfLine;
-                        break;
-                }
-
-                length += textRun.Text.Length;
-            }
-
-            textRange = new TextRange(firstTextSourceIndex, length);
-
-            return textRuns;
-        }
-
-        private static bool TryGetLineBreak(TextRun textRun, out LineBreak lineBreak)
-        {
-            lineBreak = default;
-
-            if (textRun.Text.IsEmpty)
-            {
-                return false;
-            }
-
-            var lineBreakEnumerator = new LineBreakEnumerator(textRun.Text);
-
-            while (lineBreakEnumerator.MoveNext())
-            {
-                if (!lineBreakEnumerator.Current.Required)
-                {
-                    continue;
-                }
-
-                lineBreak = lineBreakEnumerator.Current;
-
-                return lineBreak.PositionWrap >= textRun.Text.Length || true;
-            }
-
-            return false;
-        }
-
-        private static int MeasureLength(IReadOnlyList<ShapedTextCharacters> textRuns, TextRange textRange,
-            double paragraphWidth)
-        {
-            var currentWidth = 0.0;
-            var lastCluster = textRange.Start;
-
-            foreach (var currentRun in textRuns)
-            {
-                for (var i = 0; i < currentRun.ShapedBuffer.Length; i++)
-                {
-                    var glyphInfo = currentRun.ShapedBuffer[i];
-
-                    if (currentWidth + glyphInfo.GlyphAdvance > paragraphWidth)
-                    {
-                        var measuredLength = lastCluster - textRange.Start;
-
-                        return measuredLength == 0 ? 1 : measuredLength;
-                    }
-
-                    lastCluster = glyphInfo.GlyphCluster;
-                    currentWidth += glyphInfo.GlyphAdvance;
-                }
-            }
-
-            return textRange.Length;
-        }
-
-        /// <summary>
-        /// Performs text wrapping returns a list of text lines.
-        /// </summary>
-        /// <param name="textRuns"></param>
-        /// <param name="textRange">The text range that is covered by the text runs.</param>
-        /// <param name="paragraphWidth">The paragraph width.</param>
-        /// <param name="paragraphProperties">The text paragraph properties.</param>
-        /// <param name="flowDirection"></param>
-        /// <param name="currentLineBreak">The current line break if the line was explicitly broken.</param>
-        /// <returns>The wrapped text line.</returns>
-        private static TextLineImpl PerformTextWrapping(List<ShapedTextCharacters> textRuns, TextRange textRange,
-            double paragraphWidth, TextParagraphProperties paragraphProperties, FlowDirection flowDirection,
-            TextLineBreak? currentLineBreak)
-        {
-            var measuredLength = MeasureLength(textRuns, textRange, paragraphWidth);
-
-            var currentLength = 0;
-
-            var lastWrapPosition = 0;
-
-            var currentPosition = 0;
-
-            for (var index = 0; index < textRuns.Count; index++)
-            {
-                var currentRun = textRuns[index];
-
-                var lineBreaker = new LineBreakEnumerator(currentRun.Text);
-
-                var breakFound = false;
-
-                while (lineBreaker.MoveNext())
-                {
-                    if (lineBreaker.Current.Required &&
-                        currentLength + lineBreaker.Current.PositionMeasure <= measuredLength)
-                    {
-                        //Explicit break found
-                        breakFound = true;
-
-                        currentPosition = currentLength + lineBreaker.Current.PositionWrap;
-
-                        break;
-                    }
-
-                    if (currentLength + lineBreaker.Current.PositionMeasure > measuredLength)
-                    {
-                        if (paragraphProperties.TextWrapping == TextWrapping.WrapWithOverflow)
-                        {
-                            if (lastWrapPosition > 0)
-                            {
-                                currentPosition = lastWrapPosition;
-
-                                breakFound = true;
-
-                                break;
-                            }
-
-                            //Find next possible wrap position (overflow)
-                            if (index < textRuns.Count - 1)
-                            {
-                                if (lineBreaker.Current.PositionWrap != currentRun.Text.Length)
-                                {
-                                    //We already found the next possible wrap position.
-                                    breakFound = true;
-
-                                    currentPosition = currentLength + lineBreaker.Current.PositionWrap;
-
-                                    break;
-                                }
-
-                                while (lineBreaker.MoveNext() && index < textRuns.Count)
-                                {
-                                    currentPosition += lineBreaker.Current.PositionWrap;
-
-                                    if (lineBreaker.Current.PositionWrap != currentRun.Text.Length)
-                                    {
-                                        break;
-                                    }
-
-                                    index++;
-
-                                    if (index >= textRuns.Count)
-                                    {
-                                        break;
-                                    }
-
-                                    currentRun = textRuns[index];
-
-                                    lineBreaker = new LineBreakEnumerator(currentRun.Text);
-                                }
-                            }
-                            else
-                            {
-                                currentPosition = currentLength + lineBreaker.Current.PositionWrap;
-                            }
-
-                            breakFound = true;
-
-                            break;
-                        }
-
-                        //We overflowed so we use the last available wrap position.
-                        currentPosition = lastWrapPosition == 0 ? measuredLength : lastWrapPosition;
-
-                        breakFound = true;
-
-                        break;
-                    }
-
-                    if (lineBreaker.Current.PositionMeasure != lineBreaker.Current.PositionWrap)
-                    {
-                        lastWrapPosition = currentLength + lineBreaker.Current.PositionWrap;
-                    }
-                }
-
-                if (!breakFound)
-                {
-                    currentLength += currentRun.Text.Length;
-
-                    continue;
-                }
-
-                measuredLength = currentPosition;
-
-                break;
-            }
-
-            var splitResult = SplitShapedRuns(textRuns, measuredLength);
-
-            textRange = new TextRange(textRange.Start, measuredLength);
-
-            var remainingCharacters = splitResult.Second;
-
-            var lineBreak = remainingCharacters?.Count > 0 ?
-                new TextLineBreak(currentLineBreak?.TextEndOfLine, flowDirection, remainingCharacters) :
-                null;
-
-            if (lineBreak is null && currentLineBreak?.TextEndOfLine != null)
-            {
-                lineBreak = new TextLineBreak(currentLineBreak.TextEndOfLine, flowDirection);
-            }
-
-            TextLineImpl.SortRuns(splitResult.First);
-
-            var textLine = new TextLineImpl(splitResult.First, textRange, paragraphWidth, paragraphProperties, flowDirection,
-                lineBreak);
-
-            return textLine.FinalizeLine();
-        }
-
-        private struct TextRunEnumerator
-        {
-            private readonly ITextSource _textSource;
-            private int _pos;
-
-            public TextRunEnumerator(ITextSource textSource, int firstTextSourceIndex)
-            {
-                _textSource = textSource;
-                _pos = firstTextSourceIndex;
-                Current = null;
-            }
-
-            // ReSharper disable once MemberHidesStaticFromOuterClass
-            public TextRun? Current { get; private set; }
-
-            public bool MoveNext()
-            {
-                Current = _textSource.GetTextRun(_pos);
-
-                if (Current is null)
-                {
-                    return false;
-                }
-
-                if (Current.TextSourceLength == 0)
-                {
-                    return false;
-                }
-
-                _pos += Current.TextSourceLength;
-
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// Creates a shaped symbol.
-        /// </summary>
-        /// <param name="textRun">The symbol run to shape.</param>
-        /// <param name="flowDirection">The flow direction.</param>
-        /// <returns>
-        /// The shaped symbol.
-        /// </returns>
-        internal static ShapedTextCharacters CreateSymbol(TextRun textRun, FlowDirection flowDirection)
-        {
-            var textShaper = TextShaper.Current;
-
-            var glyphTypeface = textRun.Properties!.Typeface.GlyphTypeface;
-
-            var fontRenderingEmSize = textRun.Properties.FontRenderingEmSize;
-
-            var cultureInfo = textRun.Properties.CultureInfo;
-
-            var shapedBuffer = textShaper.ShapeText(textRun.Text, glyphTypeface, fontRenderingEmSize, cultureInfo, (sbyte)flowDirection);
-
-            return new ShapedTextCharacters(shapedBuffer, textRun.Properties);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
deleted file mode 100644
index 4512890f08..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
+++ /dev/null
@@ -1,654 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Represents a multi line text layout.
-    /// </summary>
-    public class TextLayout
-    {
-        private static readonly char[] s_empty = { ' ' };
-
-        private readonly ReadOnlySlice<char> _text;
-        private readonly TextParagraphProperties _paragraphProperties;
-        private readonly IReadOnlyList<ValueSpan<TextRunProperties>>? _textStyleOverrides;
-        private readonly TextTrimming _textTrimming;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TextLayout" /> class.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        /// <param name="typeface">The typeface.</param>
-        /// <param name="fontSize">Size of the font.</param>
-        /// <param name="foreground">The foreground.</param>
-        /// <param name="textAlignment">The text alignment.</param>
-        /// <param name="textWrapping">The text wrapping.</param>
-        /// <param name="textTrimming">The text trimming.</param>
-        /// <param name="textDecorations">The text decorations.</param>
-        /// <param name="flowDirection">The text flow direction.</param>
-        /// <param name="maxWidth">The maximum width.</param>
-        /// <param name="maxHeight">The maximum height.</param>
-        /// <param name="lineHeight">The height of each line of text.</param>
-        /// <param name="maxLines">The maximum number of text lines.</param>
-        /// <param name="textStyleOverrides">The text style overrides.</param>
-        public TextLayout(
-            string? text,
-            Typeface typeface,
-            double fontSize,
-            IBrush? foreground,
-            TextAlignment textAlignment = TextAlignment.Left,
-            TextWrapping textWrapping = TextWrapping.NoWrap,
-            TextTrimming textTrimming = TextTrimming.None,
-            TextDecorationCollection? textDecorations = null,
-            FlowDirection flowDirection = FlowDirection.LeftToRight,
-            double maxWidth = double.PositiveInfinity,
-            double maxHeight = double.PositiveInfinity,
-            double lineHeight = double.NaN,
-            int maxLines = 0,
-            IReadOnlyList<ValueSpan<TextRunProperties>>? textStyleOverrides = null)
-        {
-            _text = string.IsNullOrEmpty(text) ?
-                new ReadOnlySlice<char>() :
-                new ReadOnlySlice<char>(text.AsMemory());
-
-            _paragraphProperties =
-                CreateTextParagraphProperties(typeface, fontSize, foreground, textAlignment, textWrapping,
-                    textDecorations, flowDirection, lineHeight);
-
-            _textTrimming = textTrimming;
-
-            _textStyleOverrides = textStyleOverrides;
-
-            LineHeight = lineHeight;
-
-            MaxWidth = maxWidth;
-
-            MaxHeight = maxHeight;
-
-            MaxLines = maxLines;
-
-            TextLines = CreateTextLines();
-        }
-
-        /// <summary>
-        /// Gets or sets the height of each line of text.
-        /// </summary>
-        /// <remarks>
-        /// A value of NaN (equivalent to an attribute value of "Auto") indicates that the line height
-        /// is determined automatically from the current font characteristics. The default is NaN.
-        /// </remarks>
-        public double LineHeight { get; }
-
-        /// <summary>
-        /// Gets the maximum width.
-        /// </summary>
-        public double MaxWidth { get; }
-
-        /// <summary>
-        /// Gets the maximum height.
-        /// </summary>
-        public double MaxHeight { get; }
-
-        /// <summary>
-        /// Gets the maximum number of text lines.
-        /// </summary>
-        public int MaxLines { get; }
-
-        /// <summary>
-        /// Gets the text lines.
-        /// </summary>
-        /// <value>
-        /// The text lines.
-        /// </value>
-        public IReadOnlyList<TextLine> TextLines { get; private set; }
-
-        /// <summary>
-        /// Gets the bounds of the layout.
-        /// </summary>
-        /// <value>
-        /// The bounds.
-        /// </value>
-        public Rect Bounds { get; private set; }
-
-        /// <summary>
-        /// Draws the text layout.
-        /// </summary>
-        /// <param name="context">The drawing context.</param>
-        /// <param name="origin">The origin.</param>
-        public void Draw(DrawingContext context, Point origin)
-        {
-            if (!TextLines.Any())
-            {
-                return;
-            }
-
-            var (currentX, currentY) = origin;
-
-            foreach (var textLine in TextLines)
-            {
-                textLine.Draw(context, new Point(currentX + textLine.Start, currentY));
-
-                currentY += textLine.Height;
-            }
-        }
-
-        /// <summary>
-        /// Get the pixel location relative to the top-left of the layout box given the text position.
-        /// </summary>
-        /// <param name="textPosition">The text position.</param>
-        /// <returns></returns>
-        public Rect HitTestTextPosition(int textPosition)
-        {
-            if (TextLines.Count == 0)
-            {
-                return new Rect();
-            }
-
-            if (textPosition < 0 || textPosition >= _text.Length)
-            {
-                var lastLine = TextLines[TextLines.Count - 1];
-
-                var lineX = lastLine.Width;
-
-                var lineY = Bounds.Bottom - lastLine.Height;
-
-                return new Rect(lineX, lineY, 0, lastLine.Height);
-            }
-
-            var currentY = 0.0;
-
-            foreach (var textLine in TextLines)
-            {
-                if (textLine.TextRange.End < textPosition)
-                {
-                    currentY += textLine.Height;
-
-                    continue;
-                }
-
-                var characterHit = new CharacterHit(textPosition);
-
-                var startX = textLine.GetDistanceFromCharacterHit(characterHit);
-
-                var nextCharacterHit = textLine.GetNextCaretCharacterHit(characterHit);
-
-                var endX = textLine.GetDistanceFromCharacterHit(nextCharacterHit);
-
-                return new Rect(startX, currentY, endX - startX, textLine.Height);
-            }
-
-            return new Rect();
-        }
-
-        public IEnumerable<Rect> HitTestTextRange(int start, int length)
-        {
-            if (start + length <= 0)
-            {
-                return Array.Empty<Rect>();
-            }
-
-            var result = new List<Rect>(TextLines.Count);
-            
-            var currentY = 0d;
-            var currentPosition = 0;
-            var currentRect = Rect.Empty;
-
-            foreach (var textLine in TextLines)
-            {
-                //Current line isn't covered.
-                if (currentPosition + textLine.TextRange.Length <= start)
-                {
-                    currentY += textLine.Height;
-                    currentPosition += textLine.TextRange.Length;
-
-                    continue;
-                }
-
-                //The whole line is covered.
-                if (currentPosition >= start && start + length > currentPosition + textLine.TextRange.Length)
-                {
-                    currentRect = new Rect(textLine.Start, currentY, textLine.WidthIncludingTrailingWhitespace,
-                        textLine.Height);
-                    
-                    result.Add(currentRect);
-                    
-                    currentY += textLine.Height;
-                    currentPosition += textLine.TextRange.Length;
-                    
-                    continue;
-                }
-                
-                var startX = textLine.Start;
-                
-                //A portion of the line is covered.
-                for (var index = 0; index < textLine.TextRuns.Count; index++)
-                {
-                    var currentRun = (ShapedTextCharacters)textLine.TextRuns[index];
-                    ShapedTextCharacters? nextRun = null;
-
-                    if (index + 1 < textLine.TextRuns.Count)
-                    {
-                        nextRun = (ShapedTextCharacters)textLine.TextRuns[index + 1];
-                    }
-
-                    if (nextRun != null)
-                    {
-                        if (nextRun.Text.Start < currentRun.Text.Start && start + length < currentRun.Text.End)
-                        {
-                            goto skip;
-                        }
-
-                        if (currentRun.Text.Start >= start + length)
-                        {
-                            goto skip;
-                        }
-
-                        if (currentRun.Text.Start > nextRun.Text.Start && currentRun.Text.Start < start)
-                        {
-                            goto skip;
-                        }
-
-                        if (currentRun.Text.End < start)
-                        {
-                            goto skip;
-                        }
-                        
-                        goto noop;
-                        
-                        skip:
-                        {
-                            startX += currentRun.Size.Width;
-
-                            currentPosition = currentRun.Text.Start;
-                        }
-                        
-                        continue;
-                        
-                        noop:{ }
-                    }
-
-                    var endOffset = currentRun.GlyphRun.GetDistanceFromCharacterHit(
-                        currentRun.ShapedBuffer.IsLeftToRight ?
-                            new CharacterHit(start + length) :
-                            new CharacterHit(start));
-
-                    var endX = startX + endOffset;
-                    
-                    var startOffset = currentRun.GlyphRun.GetDistanceFromCharacterHit(
-                        currentRun.ShapedBuffer.IsLeftToRight ?
-                            new CharacterHit(start) :
-                            new CharacterHit(start + length));
-
-                    startX += startOffset;
-
-                    var characterHit = currentRun.GlyphRun.IsLeftToRight ?
-                        currentRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _) :
-                        currentRun.GlyphRun.GetCharacterHitFromDistance(startOffset, out _);
-                    
-                    currentPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-
-                    if(nextRun != null)
-                    {
-                        if (currentRun.ShapedBuffer.IsLeftToRight == nextRun.ShapedBuffer.IsLeftToRight)
-                        {
-                            endOffset = nextRun.GlyphRun.GetDistanceFromCharacterHit(
-                                nextRun.ShapedBuffer.IsLeftToRight ?
-                                    new CharacterHit(start + length) :
-                                    new CharacterHit(start));
-                            
-                            index++;
-
-                            endX += endOffset;
-
-                            currentRun = nextRun;
-
-                            if (currentRun.ShapedBuffer.IsLeftToRight)
-                            {
-                                characterHit = nextRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _);
-
-                                currentPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-                            }
-                        }
-                    }
-
-                    if (endX < startX)
-                    {
-                        (endX, startX) = (startX, endX);
-                    }
-
-                    var width = endX - startX;
-
-                    if (result.Count > 0 && MathUtilities.AreClose(currentRect.Top, currentY) &&
-                        MathUtilities.AreClose(currentRect.Right, startX))
-                    {
-                        result[result.Count - 1] = currentRect.WithWidth(currentRect.Width + width);
-                    }
-                    else
-                    {
-                        currentRect = new Rect(startX, currentY, width, textLine.Height);
-                        
-                        result.Add(currentRect);
-                    }
-                    
-                    if (currentRun.ShapedBuffer.IsLeftToRight)
-                    {
-                        if (nextRun != null)
-                        {
-                            if (nextRun.Text.Start > currentRun.Text.Start && nextRun.Text.Start >= start + length)
-                            {
-                                break;
-                            }
-                          
-                            currentPosition = nextRun.Text.End;
-                        }
-                        else
-                        {
-                            if (currentPosition >= start + length)
-                            {
-                                break;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if (currentPosition <= start)
-                        {
-                            break;
-                        }
-                    }
-
-                    if (!currentRun.ShapedBuffer.IsLeftToRight && currentPosition != currentRun.Text.Start)
-                    {
-                        endX += currentRun.GlyphRun.Size.Width - endOffset;
-                    }
-
-                    startX = endX;
-                }
-
-                if (currentPosition == start || currentPosition == start + length)
-                {
-                    break;
-                }
-                
-                if (textLine.TextRange.Start + textLine.TextRange.Length >= start + length)
-                {
-                    break;
-                }
-
-                currentY += textLine.Height;
-            }
-
-            return result;
-        }
-
-        public TextHitTestResult HitTestPoint(in Point point)
-        {
-            var currentY = 0d;
-
-            var lineIndex = 0;
-            TextLine? currentLine = null;
-            CharacterHit characterHit;
-
-            for (; lineIndex < TextLines.Count; lineIndex++)
-            {
-                currentLine = TextLines[lineIndex];
-
-                if (currentY + currentLine.Height > point.Y)
-                {
-                    characterHit = currentLine.GetCharacterHitFromDistance(point.X);
-
-                    return GetHitTestResult(currentLine, characterHit, point);
-                }
-
-                currentY += currentLine.Height;
-            }
-
-            if (currentLine is null)
-            {
-                return new TextHitTestResult();
-            }
-
-            characterHit = currentLine.GetCharacterHitFromDistance(point.X);
-
-            return GetHitTestResult(currentLine, characterHit, point);
-        }
-
-        
-        public int GetLineIndexFromCharacterIndex(int charIndex, bool trailingEdge)
-        {
-            if (charIndex < 0)
-            {
-                return 0;
-            }
-
-            if (charIndex > _text.Length)
-            {
-                return TextLines.Count - 1;
-            }
-
-            for (var index = 0; index < TextLines.Count; index++)
-            {
-                var textLine = TextLines[index];
-
-                if (textLine.TextRange.Start + textLine.TextRange.Length < charIndex)
-                {
-                    continue;
-                }
-
-                if (charIndex >= textLine.TextRange.Start && charIndex <= textLine.TextRange.End + (trailingEdge ? 1 : 0))
-                {
-                    return index;
-                }
-            }
-
-            return TextLines.Count - 1;
-        }
-
-        private TextHitTestResult GetHitTestResult(TextLine textLine, CharacterHit characterHit, Point point)
-        {
-            var (x, y) = point;
-
-            var lastTrailingIndex = textLine.TextRange.Start + textLine.TextRange.Length;
-
-            var isInside = x >= 0 && x <= textLine.Width && y >= 0 && y <= textLine.Height;
-
-            if (x >= textLine.Width && textLine.TextRange.Length > 0 && textLine.NewLineLength > 0)
-            {
-                lastTrailingIndex -= textLine.NewLineLength;
-            }
-
-            var textPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-
-            var isTrailing = lastTrailingIndex == textPosition && characterHit.TrailingLength > 0 ||
-                             y > Bounds.Bottom;
-
-            if (textPosition == textLine.TextRange.Start + textLine.TextRange.Length)
-            {
-                textPosition -= textLine.NewLineLength;
-            }
-
-            if (textLine.NewLineLength > 0 && textPosition + textLine.NewLineLength ==
-                characterHit.FirstCharacterIndex + characterHit.TrailingLength)
-            {
-                characterHit = new CharacterHit(characterHit.FirstCharacterIndex);
-            }
-
-            return new TextHitTestResult(characterHit, textPosition, isInside, isTrailing);
-        }
-
-        /// <summary>
-        /// Creates the default <see cref="TextParagraphProperties"/> that are used by the <see cref="TextFormatter"/>.
-        /// </summary>
-        /// <param name="typeface">The typeface.</param>
-        /// <param name="fontSize">The font size.</param>
-        /// <param name="foreground">The foreground.</param>
-        /// <param name="textAlignment">The text alignment.</param>
-        /// <param name="textWrapping">The text wrapping.</param>
-        /// <param name="textDecorations">The text decorations.</param>
-        /// <param name="flowDirection">The text flow direction.</param>
-        /// <param name="lineHeight">The height of each line of text.</param>
-        /// <returns></returns>
-        private static TextParagraphProperties CreateTextParagraphProperties(Typeface typeface, double fontSize,
-            IBrush? foreground, TextAlignment textAlignment, TextWrapping textWrapping,
-            TextDecorationCollection? textDecorations, FlowDirection flowDirection, double lineHeight)
-        {
-            var textRunStyle = new GenericTextRunProperties(typeface, fontSize, textDecorations, foreground);
-
-            return new GenericTextParagraphProperties(flowDirection, textAlignment, true, false,
-                textRunStyle, textWrapping, lineHeight, 0);
-        }
-
-        /// <summary>
-        /// Updates the current bounds.
-        /// </summary>
-        /// <param name="textLine">The text line.</param>
-        /// <param name="left">The current left.</param>
-        /// <param name="width">The current width.</param>
-        /// <param name="height">The current height.</param>
-        private static void UpdateBounds(TextLine textLine,ref double left,  ref double width, ref double height)
-        {
-            var lineWidth = textLine.WidthIncludingTrailingWhitespace;
-
-            if (width < lineWidth)
-            {
-                width = lineWidth;
-            }
-
-            if (left > textLine.Start)
-            {
-                left = textLine.Start;
-            }
-
-            height += textLine.Height;
-        }
-
-        /// <summary>
-        /// Creates an empty text line.
-        /// </summary>
-        /// <returns>The empty text line.</returns>
-        private TextLine CreateEmptyTextLine(int startingIndex)
-        {
-            var flowDirection = _paragraphProperties.FlowDirection;
-            var properties = _paragraphProperties.DefaultTextRunProperties;
-            var glyphTypeface = properties.Typeface.GlyphTypeface;
-            var text = new ReadOnlySlice<char>(s_empty, startingIndex, 1);
-            var glyph = glyphTypeface.GetGlyph(s_empty[0]);
-            var glyphInfos = new[] { new GlyphInfo(glyph, startingIndex) };
-
-            var shapedBuffer = new ShapedBuffer(text, glyphInfos, glyphTypeface, properties.FontRenderingEmSize,
-                (sbyte)flowDirection);
-
-            var textRuns = new List<ShapedTextCharacters> { new ShapedTextCharacters(shapedBuffer, properties) };
-
-            var textRange = new TextRange(startingIndex, 1);
-
-            return new TextLineImpl(textRuns, textRange, MaxWidth, _paragraphProperties, flowDirection).FinalizeLine();
-        }
-
-        private IReadOnlyList<TextLine> CreateTextLines()
-        {
-            if (_text.IsEmpty || MathUtilities.IsZero(MaxWidth) || MathUtilities.IsZero(MaxHeight))
-            {
-                var textLine = CreateEmptyTextLine(0);
-
-                Bounds = new Rect(0,0,0, textLine.Height);
-
-                return new List<TextLine> { textLine };
-            }
-
-            var textLines = new List<TextLine>();
-
-            double left = double.PositiveInfinity, width = 0.0, height = 0.0;
-
-            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);
-
-#if DEBUG
-                if (textLine.TextRange.Length == 0)
-                {
-                    throw new InvalidOperationException($"{nameof(textLine)} should not be empty.");
-                }
-#endif
-
-                currentPosition += textLine.TextRange.Length;
-                
-                //Fulfill max height constraint
-                if (textLines.Count > 0 && !double.IsPositiveInfinity(MaxHeight) && height + textLine.Height > MaxHeight)
-                {
-                    if (previousLine?.TextLineBreak != null && _textTrimming != TextTrimming.None)
-                    {
-                        var collapsedLine =
-                            previousLine.Collapse(GetCollapsingProperties(MaxWidth));
-
-                        textLines[textLines.Count - 1] = collapsedLine;
-                    }
-
-                    break;
-                }
-
-                var hasOverflowed = textLine.HasOverflowed;
-
-                if (hasOverflowed && _textTrimming != TextTrimming.None)
-                {
-                    textLine = textLine.Collapse(GetCollapsingProperties(MaxWidth));
-                }
-
-                textLines.Add(textLine);
-
-                UpdateBounds(textLine, ref left, ref width, ref height);
-
-                previousLine = textLine;
-
-                //Fulfill max lines constraint
-                if (MaxLines > 0 && textLines.Count >= MaxLines)
-                {
-                    break;
-                }
-                
-                if (currentPosition != _text.Length || textLine.NewLineLength <= 0)
-                {
-                    continue;
-                }
-
-                var emptyTextLine = CreateEmptyTextLine(currentPosition);
-
-                textLines.Add(emptyTextLine);
-
-                UpdateBounds(emptyTextLine,ref left, ref width, ref height);
-            }
-
-            Bounds = new Rect(left, 0, width, height);
-
-            return textLines;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="TextCollapsingProperties"/> for current text trimming mode.
-        /// </summary>
-        /// <param name="width">The collapsing width.</param>
-        /// <returns>The <see cref="TextCollapsingProperties"/>.</returns>
-        private TextCollapsingProperties GetCollapsingProperties(double width)
-        {
-            return _textTrimming switch
-            {
-                TextTrimming.CharacterEllipsis => new TextTrailingCharacterEllipsis(width,
-                    _paragraphProperties.DefaultTextRunProperties),
-                TextTrimming.WordEllipsis => new TextTrailingWordEllipsis(width,
-                    _paragraphProperties.DefaultTextRunProperties),
-                _ => throw new ArgumentOutOfRangeException(),
-            };
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLine.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLine.cs
deleted file mode 100644
index 130d0e9c39..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextLine.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Represents a line of text that is used for text rendering.
-    /// </summary>
-    public abstract class TextLine
-    {
-        /// <summary>
-        /// Gets the text runs that are contained within a line.
-        /// </summary>
-        /// <value>
-        /// The contained text runs.
-        /// </value>
-        public abstract IReadOnlyList<TextRun> TextRuns { get; }
-        
-        /// <summary>
-        /// Gets the text range that is covered by the line.
-        /// </summary>
-        /// <value>
-        /// The text range that is covered by the line.
-        /// </value>
-        public abstract TextRange TextRange { get; }
-
-        /// <summary>
-        /// Gets the state of the line when broken by line breaking process.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="TextLineBreak"/> value that represents the line break.
-        /// </returns>
-        public abstract TextLineBreak? TextLineBreak { get; }
-
-        /// <summary>
-        /// Gets the distance from the top to the baseline of the current TextLine object.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="double"/> that represents the baseline distance.
-        /// </returns>
-        public abstract double Baseline { get; }
-
-        /// <summary>
-        /// Gets the distance from the top-most to bottom-most black pixel in a line.
-        /// </summary>
-        /// <returns>
-        /// A value that represents the extent distance.
-        /// </returns>
-        public abstract double Extent { get; }
-
-        /// <summary>
-        /// Gets a value that indicates whether the line is collapsed.
-        /// </summary>
-        /// <returns>
-        /// <c>true</c>, if the line is collapsed; otherwise, <c>false</c>.
-        /// </returns>
-        public abstract bool HasCollapsed { get; }
-
-        /// <summary>
-        /// Gets a value that indicates whether content of the line overflows the specified paragraph width.
-        /// </summary>
-        /// <returns>
-        /// <c>true</c>, it the line overflows the specified paragraph width; otherwise, <c>false</c>.
-        /// </returns>
-        public abstract bool HasOverflowed { get; }
-
-        /// <summary>
-        /// Gets the height of a line of text.
-        /// </summary>
-        /// <returns>
-        /// The text line height.
-        /// </returns>
-        public abstract double Height { get; }
-
-        /// <summary>
-        /// Gets the number of newline characters at the end of a line.
-        /// </summary>
-        /// <returns>
-        /// The number of newline characters.
-        /// </returns>
-        public abstract int NewLineLength { get; }
-        
-        /// <summary>
-        /// Gets the distance that black pixels extend beyond the bottom alignment edge of a line.
-        /// </summary>
-        /// <returns>
-        /// The overhang after distance.
-        /// </returns>
-        public abstract double OverhangAfter { get; }
-
-        /// <summary>
-        /// Gets the distance that black pixels extend prior to the left leading alignment edge of the line.
-        /// </summary>
-        /// <returns>
-        /// The overhang leading distance.
-        /// </returns>
-        public abstract double OverhangLeading { get; }
-
-        /// <summary>
-        /// Gets the distance that black pixels extend following the right trailing alignment edge of the line.
-        /// </summary>
-        /// <returns>
-        /// The overhang trailing distance.
-        /// </returns>
-        public abstract double OverhangTrailing { get; }
-
-        /// <summary>
-        /// Gets the distance from the start of a paragraph to the starting point of a line.
-        /// </summary>
-        /// <returns>
-        /// The distance from the start of a paragraph to the starting point of a line.
-        /// </returns>
-        public abstract double Start { get; }
-
-        /// <summary>
-        /// Gets the number of whitespace code points beyond the last non-blank character in a line.
-        /// </summary>
-        /// <returns>
-        /// The number of whitespace code points beyond the last non-blank character in a line.
-        /// </returns>
-        public abstract int TrailingWhitespaceLength { get; }
-
-        /// <summary>
-        /// Gets the width of a line of text, excluding trailing whitespace characters.
-        /// </summary>
-        /// <returns>
-        /// The text line width, excluding trailing whitespace characters.
-        /// </returns>
-        public abstract double Width { get; }
-
-        /// <summary>
-        /// Gets the width of a line of text, including trailing whitespace characters.
-        /// </summary>
-        /// <returns>
-        /// The text line width, including trailing whitespace characters.
-        /// </returns>
-        public abstract double WidthIncludingTrailingWhitespace { get; }
-
-        /// <summary>
-        /// Draws the <see cref="TextLine"/> at the given origin.
-        /// </summary>
-        /// <param name="drawingContext">The drawing context.</param>
-        /// <param name="lineOrigin"></param>
-        public abstract void Draw(DrawingContext drawingContext, Point lineOrigin);
-
-        /// <summary>
-        /// Create a collapsed line based on collapsed text properties.
-        /// </summary>
-        /// <param name="collapsingPropertiesList">A list of <see cref="TextCollapsingProperties"/>
-        /// objects that represent the collapsed text properties.</param>
-        /// <returns>
-        /// A <see cref="TextLine"/> value that represents a collapsed line that can be displayed.
-        /// </returns>
-        public abstract TextLine Collapse(params TextCollapsingProperties[] collapsingPropertiesList);
-
-        /// <summary>
-        /// Gets the character hit corresponding to the specified distance from the beginning of the line.
-        /// </summary>
-        /// <param name="distance">A <see cref="double"/> value that represents the distance from the beginning of the line.</param>
-        /// <returns>The <see cref="CharacterHit"/> object at the specified distance from the beginning of the line.</returns>
-        public abstract CharacterHit GetCharacterHitFromDistance(double distance);
-
-        /// <summary>
-        /// Gets the distance from the beginning of the line to the specified character hit.
-        /// <see cref="CharacterHit"/>.
-        /// </summary>
-        /// <param name="characterHit">The <see cref="CharacterHit"/> object whose distance you want to query.</param>
-        /// <returns>A <see cref="double"/> that represents the distance from the beginning of the line.</returns>
-        public abstract double GetDistanceFromCharacterHit(CharacterHit characterHit);
-
-        /// <summary>
-        /// Gets the next character hit for caret navigation.
-        /// </summary>
-        /// <param name="characterHit">The current <see cref="CharacterHit"/>.</param>
-        /// <returns>The next <see cref="CharacterHit"/>.</returns>
-        public abstract CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit);
-
-        /// <summary>
-        /// Gets the previous character hit for caret navigation.
-        /// </summary>
-        /// <param name="characterHit">The current <see cref="CharacterHit"/>.</param>
-        /// <returns>The previous <see cref="CharacterHit"/>.</returns>
-        public abstract CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit);
-
-        /// <summary>
-        /// Gets the previous character hit after backspacing.
-        /// </summary>
-        /// <param name="characterHit">The current <see cref="CharacterHit"/>.</param>
-        /// <returns>The <see cref="CharacterHit"/> after backspacing.</returns>
-        public abstract CharacterHit GetBackspaceCaretCharacterHit(CharacterHit characterHit);
-
-        /// <summary>
-        /// Gets the text line offset x.
-        /// </summary>
-        /// <param name="width">The line width.</param>
-        /// <param name="widthIncludingTrailingWhitespace">The paragraph width including whitespace.</param>
-        /// <param name="paragraphWidth">The paragraph width.</param>
-        /// <param name="textAlignment">The text alignment.</param>
-        /// <param name="flowDirection">The flow direction of the line.</param>
-        /// <returns>The paragraph offset.</returns>
-        internal static double GetParagraphOffsetX(double width, double widthIncludingTrailingWhitespace,
-            double paragraphWidth, TextAlignment textAlignment, FlowDirection flowDirection)
-        {
-            if (double.IsPositiveInfinity(paragraphWidth))
-            {
-                return 0;
-            }
-
-            if (flowDirection == FlowDirection.LeftToRight)
-            {
-                switch (textAlignment)
-                {
-                    case TextAlignment.Center:
-                        return Math.Max(0, (paragraphWidth - width) / 2);
-
-                    case TextAlignment.Right:
-                        return Math.Max(0, paragraphWidth - widthIncludingTrailingWhitespace);
-
-                    default:
-                        return 0;
-                }
-            }
-
-            switch (textAlignment)
-            {
-                case TextAlignment.Center:
-                    return Math.Max(0, (paragraphWidth - width) / 2);
-
-                case TextAlignment.Right:
-                    return 0;
-
-                default:
-                    return Math.Max(0, paragraphWidth - widthIncludingTrailingWhitespace);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLineBreak.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLineBreak.cs
deleted file mode 100644
index be9661c2bf..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextLineBreak.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.TextFormatting
-{
-    public class TextLineBreak
-    {
-        public TextLineBreak(TextEndOfLine? textEndOfLine = null, FlowDirection flowDirection = FlowDirection.LeftToRight, 
-            IReadOnlyList<ShapedTextCharacters>? remainingCharacters = null)
-        {
-            TextEndOfLine = textEndOfLine;
-            FlowDirection = flowDirection;
-            RemainingCharacters = remainingCharacters;
-        }
-
-        /// <summary>
-        /// Get the end of line run.
-        /// </summary>
-        public TextEndOfLine? TextEndOfLine { get; }
-
-        /// <summary>
-        /// Get the flow direction for remaining characters.
-        /// </summary>
-        public FlowDirection FlowDirection { get; }
-        
-        /// <summary>
-        /// Get the remaining shaped characters that were split up by the <see cref="TextFormatter"/> during the formatting process.
-        /// </summary>
-        public IReadOnlyList<ShapedTextCharacters>? RemainingCharacters { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs
deleted file mode 100644
index e776655284..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs
+++ /dev/null
@@ -1,845 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media.TextFormatting.Unicode;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    internal class TextLineImpl : TextLine
-    {
-        private static readonly Comparer<int> s_compareStart = Comparer<int>.Default;
-
-        private static readonly Comparison<ShapedTextCharacters> s_compareLogicalOrder =
-            (a, b) => s_compareStart.Compare(a.Text.Start, b.Text.Start);
-
-        private readonly List<ShapedTextCharacters> _textRuns;
-        private readonly double _paragraphWidth;
-        private readonly TextParagraphProperties _paragraphProperties;
-        private TextLineMetrics _textLineMetrics;
-        private readonly FlowDirection _flowDirection;
-
-        public TextLineImpl(List<ShapedTextCharacters> textRuns, TextRange textRange, double paragraphWidth,
-            TextParagraphProperties paragraphProperties, FlowDirection flowDirection = FlowDirection.LeftToRight, 
-            TextLineBreak? lineBreak = null, bool hasCollapsed = false)
-        {
-            TextRange = textRange;
-            TextLineBreak = lineBreak;
-            HasCollapsed = hasCollapsed;
-
-            _textRuns =  textRuns;
-            _paragraphWidth = paragraphWidth;
-            _paragraphProperties = paragraphProperties;
-
-            _flowDirection = flowDirection;
-        }
-
-        /// <inheritdoc/>
-        public override IReadOnlyList<TextRun> TextRuns => _textRuns;
-
-        /// <inheritdoc/>
-        public override TextRange TextRange { get; }
-
-        /// <inheritdoc/>
-        public override TextLineBreak? TextLineBreak { get; }
-
-        /// <inheritdoc/>
-        public override bool HasCollapsed { get; }
-
-        /// <inheritdoc/>
-        public override bool HasOverflowed => _textLineMetrics.HasOverflowed;
-
-        /// <inheritdoc/>
-        public override double Baseline => _textLineMetrics.TextBaseline;
-
-        /// <inheritdoc/>
-        public override double Extent => _textLineMetrics.Height;
-
-        /// <inheritdoc/>
-        public override double Height => _textLineMetrics.Height;
-
-        /// <inheritdoc/>
-        public override int NewLineLength => _textLineMetrics.NewLineLength;
-
-        /// <inheritdoc/>
-        public override double OverhangAfter => 0;
-
-        /// <inheritdoc/>
-        public override double OverhangLeading => 0;
-
-        /// <inheritdoc/>
-        public override double OverhangTrailing => 0;
-
-        /// <inheritdoc/>
-        public override int TrailingWhitespaceLength => _textLineMetrics.TrailingWhitespaceLength;
-
-        /// <inheritdoc/>
-        public override double Start => _textLineMetrics.Start;
-
-        /// <inheritdoc/>
-        public override double Width => _textLineMetrics.Width;
-
-        /// <inheritdoc/>
-        public override double WidthIncludingTrailingWhitespace => _textLineMetrics.WidthIncludingTrailingWhitespace;
-
-        /// <inheritdoc/>
-        public override void Draw(DrawingContext drawingContext, Point lineOrigin)
-        {
-            var (currentX, currentY) = lineOrigin;
-
-            foreach (var textRun in _textRuns)
-            {
-                var offsetY = Baseline - textRun.GlyphRun.BaselineOrigin.Y;
-
-                textRun.Draw(drawingContext, new Point(currentX, currentY + offsetY));
-
-                currentX += textRun.Size.Width;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override TextLine Collapse(params TextCollapsingProperties[] collapsingPropertiesList)
-        {
-            if (collapsingPropertiesList.Length == 0)
-            {
-                return this;
-            }
-
-            var collapsingProperties = collapsingPropertiesList[0];
-
-            var runIndex = 0;
-            var currentWidth = 0.0;
-            var textRange = TextRange;
-            var collapsedLength = 0;
-
-            var shapedSymbol = TextFormatterImpl.CreateSymbol(collapsingProperties.Symbol, _paragraphProperties.FlowDirection);
-            
-            if (collapsingProperties.Width < shapedSymbol.GlyphRun.Size.Width)
-            {
-                return new TextLineImpl(new List<ShapedTextCharacters>(0), textRange, _paragraphWidth, _paragraphProperties,
-                    _flowDirection, TextLineBreak, true);
-            }
-            
-            var availableWidth = collapsingProperties.Width - shapedSymbol.GlyphRun.Size.Width;
-
-            while (runIndex < _textRuns.Count)
-            {
-                var currentRun = _textRuns[runIndex];
-
-                currentWidth += currentRun.Size.Width;
-
-                if (currentWidth > availableWidth)
-                {
-                    if (currentRun.TryMeasureCharacters(availableWidth, out var measuredLength))
-                    {
-                        if (collapsingProperties.Style == TextCollapsingStyle.TrailingWord &&
-                            measuredLength < textRange.End)
-                        {
-                            var currentBreakPosition = 0;
-
-                            var lineBreaker = new LineBreakEnumerator(currentRun.Text);
-
-                            while (currentBreakPosition < measuredLength && lineBreaker.MoveNext())
-                            {
-                                var nextBreakPosition = lineBreaker.Current.PositionMeasure;
-
-                                if (nextBreakPosition == 0)
-                                {
-                                    break;
-                                }
-
-                                if (nextBreakPosition >= measuredLength)
-                                {
-                                    break;
-                                }
-
-                                currentBreakPosition = nextBreakPosition;
-                            }
-
-                            measuredLength = currentBreakPosition;
-                        }
-                    }
-
-                    collapsedLength += measuredLength;
-
-                    var shapedTextCharacters = new List<ShapedTextCharacters>(_textRuns.Count);
-                    
-                    if (collapsedLength > 0)
-                    {
-                        var splitResult = TextFormatterImpl.SplitShapedRuns(_textRuns, collapsedLength);
-                    
-                        shapedTextCharacters.AddRange(splitResult.First);
-
-                        SortRuns(shapedTextCharacters);
-                    }
-
-                    shapedTextCharacters.Add(shapedSymbol);
-
-                    var textLine = new TextLineImpl(shapedTextCharacters, textRange, _paragraphWidth, _paragraphProperties,
-                        _flowDirection, TextLineBreak, true);
-
-                    return textLine.FinalizeLine();
-                }
-
-                availableWidth -= currentRun.Size.Width;
-
-                collapsedLength += currentRun.GlyphRun.Characters.Length;
-
-                runIndex++;
-            }
-
-            return this;
-        }
-
-        /// <inheritdoc/>
-        public override CharacterHit GetCharacterHitFromDistance(double distance)
-        {
-            distance -= Start;
-            
-            if (distance <= 0)
-            {
-                // hit happens before the line, return the first position
-                var firstRun = _textRuns[0];
-
-                return firstRun.GlyphRun.GetCharacterHitFromDistance(distance, out _);
-            }
-
-            // process hit that happens within the line
-            var characterHit = new CharacterHit();
-
-            foreach (var run in _textRuns)
-            {
-                characterHit = run.GlyphRun.GetCharacterHitFromDistance(distance, out _);
-
-                if (distance <= run.Size.Width)
-                {
-                    break;
-                }
-
-                distance -= run.Size.Width;
-            }
-
-            return characterHit;
-        }
-
-        /// <inheritdoc/>
-        public override double GetDistanceFromCharacterHit(CharacterHit characterHit)
-        {
-            var characterIndex = characterHit.FirstCharacterIndex + (characterHit.TrailingLength != 0 ? 1 : 0);
-
-            var currentDistance = Start;
-
-            GlyphRun? lastRun = null;
-
-            for (var index = 0; index < _textRuns.Count; index++)
-            {
-                var textRun = _textRuns[index];
-                var currentRun = textRun.GlyphRun;
-
-                if (lastRun != null)
-                {
-                    if (!lastRun.IsLeftToRight && currentRun.IsLeftToRight &&
-                        currentRun.Characters.Start == characterHit.FirstCharacterIndex &&
-                        characterHit.TrailingLength == 0)
-                    {
-                        return currentDistance;
-                    }
-                }
-
-                //Look for a hit in within the current run
-                if (characterIndex >= textRun.Text.Start && characterIndex <= textRun.Text.End)
-                {
-                    var distance = currentRun.GetDistanceFromCharacterHit(characterHit);
-
-                    return currentDistance + distance;
-                }
-
-                //Look at the left and right edge of the current run
-                if (currentRun.IsLeftToRight)
-                {
-                    if (lastRun == null || lastRun.IsLeftToRight)
-                    {
-                        if (characterIndex <= textRun.Text.Start)
-                        {
-                            return currentDistance;
-                        }
-                    }
-                    else
-                    {
-                        if (characterIndex == textRun.Text.Start)
-                        {
-                            return currentDistance;
-                        }
-                    }
-
-                    if (characterIndex == textRun.Text.Start + textRun.Text.Length && characterHit.TrailingLength > 0)
-                    {
-                        return currentDistance + currentRun.Size.Width;
-                    }
-                }
-                else
-                {
-                    if (characterIndex == textRun.Text.Start)
-                    {
-                        return currentDistance + currentRun.Size.Width;
-                    }
-
-                    var nextRun = index + 1 < _textRuns.Count ? _textRuns[index + 1] : null;
-
-                    if (nextRun != null)
-                    {
-                        if (characterHit.FirstCharacterIndex == textRun.Text.End && nextRun.ShapedBuffer.IsLeftToRight)
-                        {
-                            return currentDistance;
-                        }
-
-                        if (characterIndex > textRun.Text.End && nextRun.Text.End < textRun.Text.End)
-                        {
-                            return currentDistance;
-                        }
-                    }
-                    else
-                    {
-                        if (characterIndex > textRun.Text.End)
-                        {
-                            return currentDistance;
-                        }
-                    }
-                }
-
-                //No hit hit found so we add the full width
-                currentDistance += currentRun.Size.Width;
-
-                lastRun = currentRun;
-            }
-
-            return currentDistance;
-        }
-
-        /// <inheritdoc/>
-        public override CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit)
-        {
-            if (TryFindNextCharacterHit(characterHit, out var nextCharacterHit))
-            {
-                return nextCharacterHit;
-            }
-
-            // Can't move, we're after the last character
-            var runIndex = GetRunIndexAtCharacterIndex(TextRange.End, LogicalDirection.Forward);
-
-            var textRun = _textRuns[runIndex];
-
-            characterHit = textRun.GlyphRun.GetNextCaretCharacterHit(characterHit);
-
-            return characterHit; 
-        }
-
-        /// <inheritdoc/>
-        public override CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit)
-        {
-            if (TryFindPreviousCharacterHit(characterHit, out var previousCharacterHit))
-            {
-                return previousCharacterHit;
-            }
-
-            if (characterHit.FirstCharacterIndex <= TextRange.Start)
-            {
-                characterHit = new CharacterHit(TextRange.Start);
-            }
-
-            return characterHit; // Can't move, we're before the first character
-        }
-
-        /// <inheritdoc/>
-        public override CharacterHit GetBackspaceCaretCharacterHit(CharacterHit characterHit)
-        {
-            // same operation as move-to-previous
-            return GetPreviousCaretCharacterHit(characterHit);
-        }
-
-        public static void SortRuns(List<ShapedTextCharacters> textRuns)
-        {
-            textRuns.Sort(s_compareLogicalOrder);
-        }
-
-        public TextLineImpl FinalizeLine()
-        {
-            BidiReorder();
-
-            _textLineMetrics = CreateLineMetrics();
-
-            return this;
-        }
-
-        private void BidiReorder()
-        {
-            // Build up the collection of ordered runs.
-            var run = _textRuns[0];
-            OrderedBidiRun orderedRun = new(run);
-            var current = orderedRun;
-
-            for (var i = 1; i < _textRuns.Count; i++)
-            {
-                run = _textRuns[i];
-
-                current.Next = new OrderedBidiRun(run);
-
-                current = current.Next;
-            }
-
-            // Reorder them into visual order.
-            orderedRun = LinearReOrder(orderedRun);
-
-            // Now perform a recursive reversal of each run.
-            // From the highest level found in the text to the lowest odd level on each line, including intermediate levels
-            // not actually present in the text, reverse any contiguous sequence of characters that are at that level or higher.
-            // https://unicode.org/reports/tr9/#L2
-            sbyte max = 0;
-            var min = sbyte.MaxValue;
-
-            for (var i = 0; i < _textRuns.Count; i++)
-            {
-                var level = _textRuns[i].BidiLevel;
-
-                if (level > max)
-                {
-                    max = level;
-                }
-
-                if ((level & 1) != 0 && level < min)
-                {
-                    min = level;
-                }
-            }
-
-            if (min > max)
-            {
-                min = max;
-            }
-
-            if (max == 0 || (min == max && (max & 1) == 0))
-            {
-                // Nothing to reverse.
-                return;
-            }
-
-            // Now apply the reversal and replace the original contents.
-            var minLevelToReverse = max;
-
-            while (minLevelToReverse >= min)
-            {
-                current = orderedRun;
-
-                while (current != null)
-                {
-                    if (current.Level >= minLevelToReverse && current.Level % 2 != 0)
-                    {
-                        if (!current.Run.IsReversed)
-                        {
-                            current.Run.Reverse();
-                        }
-                    }
-
-                    current = current.Next;
-                }
-
-                minLevelToReverse--;
-            }
-
-            _textRuns.Clear();
-
-            current = orderedRun;
-
-            while (current != null)
-            {
-                _textRuns.Add(current.Run);
-
-                current = current.Next;
-            }
-        }
-
-        /// <summary>
-        /// Reorders a series of runs from logical to visual order, returning the left most run.
-        /// <see href="https://github.com/fribidi/linear-reorder/blob/f2f872257d4d8b8e137fcf831f254d6d4db79d3c/linear-reorder.c"/>
-        /// </summary>
-        /// <param name="run">The ordered bidi run.</param>
-        /// <returns>The <see cref="OrderedBidiRun"/>.</returns>
-        private static OrderedBidiRun LinearReOrder(OrderedBidiRun? run)
-        {
-            BidiRange? range = null;
-
-            while (run != null)
-            {
-                var next = run.Next;
-
-                while (range != null && range.Level > run.Level
-                    && range.Previous != null && range.Previous.Level >= run.Level)
-                {
-                    range = BidiRange.MergeWithPrevious(range);
-                }
-
-                if (range != null && range.Level >= run.Level)
-                {
-                    // Attach run to the range.
-                    if ((run.Level & 1) != 0)
-                    {
-                        // Odd, range goes to the right of run.
-                        run.Next = range.Left;
-                        range.Left = run;
-                    }
-                    else
-                    {
-                        // Even, range goes to the left of run.
-                        range.Right!.Next = run;
-                        range.Right = run;
-                    }
-
-                    range.Level = run.Level;
-                }
-                else
-                {
-                    var r = new BidiRange();
-
-                    r.Left = r.Right = run;
-                    r.Level = run.Level;
-                    r.Previous = range;
-
-                    range = r;
-                }
-
-                run = next;
-            }
-
-            while (range?.Previous != null)
-            {
-                range = BidiRange.MergeWithPrevious(range);
-            }
-
-            // Terminate.
-            range!.Right!.Next = null;
-
-            return range.Left!;
-        }
-
-        /// <summary>
-        /// Tries to find the next character hit.
-        /// </summary>
-        /// <param name="characterHit">The current character hit.</param>
-        /// <param name="nextCharacterHit">The next character hit.</param>
-        /// <returns></returns>
-        private bool TryFindNextCharacterHit(CharacterHit characterHit, out CharacterHit nextCharacterHit)
-        {
-            nextCharacterHit = characterHit;
-
-            var codepointIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-
-            if (codepointIndex >= TextRange.End)
-            {
-                return false; // Cannot go forward anymore
-            }
-
-            if (codepointIndex < TextRange.Start)
-            {
-                codepointIndex = TextRange.Start;
-            }
-
-            var runIndex = GetRunIndexAtCharacterIndex(codepointIndex, LogicalDirection.Forward);
-
-            while (runIndex < _textRuns.Count)
-            {
-                var run = _textRuns[runIndex];
-
-                var foundCharacterHit =
-                    run.GlyphRun.FindNearestCharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength,
-                        out _);
-
-                var isAtEnd = foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength ==
-                              TextRange.Start + TextRange.Length;
-
-                if (isAtEnd && !run.GlyphRun.IsLeftToRight)
-                {
-                    nextCharacterHit = foundCharacterHit;
-
-                    return true;
-                }
-
-                var characterIndex = codepointIndex - run.Text.Start;
-
-                if (characterIndex < 0 && run.ShapedBuffer.IsLeftToRight)
-                {
-                    foundCharacterHit = new CharacterHit(foundCharacterHit.FirstCharacterIndex);
-                }
-
-                nextCharacterHit = isAtEnd || characterHit.TrailingLength != 0 ?
-                    foundCharacterHit :
-                    new CharacterHit(foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength);
-
-                if (isAtEnd || nextCharacterHit.FirstCharacterIndex > characterHit.FirstCharacterIndex)
-                {
-                    return true;
-                }
-
-                runIndex++;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Tries to find the previous character hit.
-        /// </summary>
-        /// <param name="characterHit">The current character hit.</param>
-        /// <param name="previousCharacterHit">The previous character hit.</param>
-        /// <returns></returns>
-        private bool TryFindPreviousCharacterHit(CharacterHit characterHit, out CharacterHit previousCharacterHit)
-        {
-            var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-
-            if (characterIndex == TextRange.Start)
-            {
-                previousCharacterHit = new CharacterHit(TextRange.Start);
-
-                return true;
-            }
-
-            previousCharacterHit = characterHit;
-
-            if (characterIndex < TextRange.Start)
-            {
-                return false; // Cannot go backward anymore.
-            }
-
-            var runIndex = GetRunIndexAtCharacterIndex(characterIndex, LogicalDirection.Backward);
-
-            while (runIndex >= 0)
-            {
-                var run = _textRuns[runIndex];
-
-                var foundCharacterHit =
-                    run.GlyphRun.FindNearestCharacterHit(characterHit.FirstCharacterIndex - 1, out _);
-
-                if (foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength < characterIndex)
-                {
-                    previousCharacterHit = foundCharacterHit;
-                    
-                    return true;
-                }
-                
-                previousCharacterHit = characterHit.TrailingLength != 0 ?
-                    foundCharacterHit :
-                    new CharacterHit(foundCharacterHit.FirstCharacterIndex);
-
-                if (previousCharacterHit != characterHit)
-                {
-                    return true;
-                }
-
-                runIndex--;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Gets the run index of the specified codepoint index.
-        /// </summary>
-        /// <param name="codepointIndex">The codepoint index.</param>
-        /// <param name="direction">The logical direction.</param>
-        /// <returns>The text run index.</returns>
-        private int GetRunIndexAtCharacterIndex(int codepointIndex, LogicalDirection direction)
-        {
-            var runIndex = 0;
-            ShapedTextCharacters? previousRun = null;
-
-            while (runIndex < _textRuns.Count)
-            {
-                var currentRun = _textRuns[runIndex];
-
-                if (previousRun != null && !previousRun.ShapedBuffer.IsLeftToRight)
-                {
-                    if (currentRun.ShapedBuffer.IsLeftToRight)
-                    {
-                        if (currentRun.Text.Start >= codepointIndex)
-                        {
-                            return --runIndex;
-                        }
-                    }
-                    else
-                    {
-                        if (codepointIndex > currentRun.Text.Start + currentRun.Text.Length)
-                        {
-                            return --runIndex; 
-                        }
-                    }
-                }
-
-                if (direction == LogicalDirection.Forward)
-                {
-                    if (codepointIndex >= currentRun.Text.Start && codepointIndex <= currentRun.Text.End)
-                    {
-                        return runIndex;
-                    }
-                }
-                else
-                {
-                    if (codepointIndex > currentRun.Text.Start &&
-                        codepointIndex <= currentRun.Text.Start + currentRun.Text.Length)
-                    {
-                        return runIndex;
-                    }
-                }
-
-                if (runIndex + 1 < _textRuns.Count)
-                {
-                    runIndex++;
-                    previousRun = currentRun;
-                }
-                else
-                {
-                    break;
-                }
-            }
-
-            return runIndex;
-        }
-
-        private TextLineMetrics CreateLineMetrics()
-        {
-            var width = 0d;
-            var widthIncludingWhitespace = 0d;
-            var trailingWhitespaceLength = 0;
-            var newLineLength = 0;
-            var ascent = 0d;
-            var descent = 0d;
-            var lineGap = 0d;
-            var fontRenderingEmSize = 0d;
-
-            for (var index = 0; index < _textRuns.Count; index++)
-            {
-                var textRun = _textRuns[index];
-
-                var fontMetrics =
-                    new FontMetrics(textRun.Properties.Typeface, textRun.Properties.FontRenderingEmSize);
-
-                if (fontRenderingEmSize < textRun.Properties.FontRenderingEmSize)
-                {
-                    fontRenderingEmSize = textRun.Properties.FontRenderingEmSize;
-                    
-                    if (ascent > fontMetrics.Ascent)
-                    {
-                        ascent = fontMetrics.Ascent;
-                    }
-
-                    if (descent < fontMetrics.Descent)
-                    {
-                        descent = fontMetrics.Descent;
-                    }
-
-                    if (lineGap < fontMetrics.LineGap)
-                    {
-                        lineGap = fontMetrics.LineGap;
-                    }
-                }
-
-                switch (_paragraphProperties.FlowDirection)
-                {
-                    case FlowDirection.LeftToRight:
-                        {
-                            if (index == _textRuns.Count - 1)
-                            {
-                                width = widthIncludingWhitespace + textRun.GlyphRun.Metrics.Width;
-                                trailingWhitespaceLength = textRun.GlyphRun.Metrics.TrailingWhitespaceLength;
-                                newLineLength = textRun.GlyphRun.Metrics.NewlineLength;
-                            }
-
-                            break;
-                        }
-
-                    case FlowDirection.RightToLeft:
-                        {
-                            if (index == _textRuns.Count - 1)
-                            {
-                                var firstRun = _textRuns[0];
-
-                                var offset = firstRun.GlyphRun.Metrics.WidthIncludingTrailingWhitespace -
-                                             firstRun.GlyphRun.Metrics.Width;
-
-                                width = widthIncludingWhitespace +
-                                    textRun.GlyphRun.Metrics.WidthIncludingTrailingWhitespace - offset;
-
-                                trailingWhitespaceLength = firstRun.GlyphRun.Metrics.TrailingWhitespaceLength;
-                                newLineLength = firstRun.GlyphRun.Metrics.NewlineLength;
-                            }
-
-                            break;
-                        }
-                }
-
-                widthIncludingWhitespace += textRun.GlyphRun.Metrics.WidthIncludingTrailingWhitespace;
-            }
-
-            var start = GetParagraphOffsetX(width, widthIncludingWhitespace, _paragraphWidth, 
-                _paragraphProperties.TextAlignment, _paragraphProperties.FlowDirection);
-
-            var lineHeight = _paragraphProperties.LineHeight;
-
-            var height = double.IsNaN(lineHeight) || MathUtilities.IsZero(lineHeight) ?
-                descent - ascent + lineGap :
-                lineHeight;
-
-            return new TextLineMetrics(widthIncludingWhitespace > _paragraphWidth, height, newLineLength, start,
-                -ascent, trailingWhitespaceLength, width, widthIncludingWhitespace);
-        }
-
-        private sealed class OrderedBidiRun
-        {
-            public OrderedBidiRun(ShapedTextCharacters run) => Run = run;
-
-            public sbyte Level => Run.BidiLevel;
-
-            public ShapedTextCharacters Run { get; }
-
-            public OrderedBidiRun? Next { get; set; }
-
-            public void Reverse() => Run.ShapedBuffer.GlyphInfos.Span.Reverse();
-        }
-
-        private sealed class BidiRange
-        {
-            public int Level { get; set; }
-
-            public OrderedBidiRun? Left { get; set; }
-
-            public OrderedBidiRun? Right { get; set; }
-
-            public BidiRange? Previous { get; set; }
-
-            public static BidiRange MergeWithPrevious(BidiRange range)
-            {
-                var previous = range.Previous;
-
-                BidiRange left;
-                BidiRange right;
-
-                if ((previous!.Level & 1) != 0)
-                {
-                    // Odd, previous goes to the right of range.
-                    left = range;
-                    right = previous;
-                }
-                else
-                {
-                    // Even, previous goes to the left of range.
-                    left = previous;
-                    right = range;
-                }
-
-                // Stitch them
-                left.Right!.Next = right.Left;
-                previous.Left = left.Left;
-                previous.Right = right.Right;
-
-                return previous;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextParagraphProperties.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextParagraphProperties.cs
deleted file mode 100644
index b799567a60..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextParagraphProperties.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Provides a set of properties that are used during the paragraph layout.
-    /// </summary>
-    public abstract class TextParagraphProperties
-    {
-        /// <summary>
-        /// This property specifies whether the primary text advance 
-        /// direction shall be left-to-right, right-to-left.
-        /// </summary>
-        public abstract FlowDirection FlowDirection { get; }
-
-        /// <summary>
-        /// Gets the text alignment.
-        /// </summary>
-        public abstract TextAlignment TextAlignment { get; }
-
-        /// <summary>
-        /// Paragraph's line height
-        /// </summary>
-        public abstract double LineHeight { get; }
-
-        /// <summary>
-        /// Indicates the first line of the paragraph.
-        /// </summary>
-        public abstract bool FirstLineInParagraph { get; }
-
-        /// <summary>
-        /// If true, the formatted line may always be collapsed. If false (the default),
-        /// only lines that overflow the paragraph width are collapsed.
-        /// </summary>
-        public virtual bool AlwaysCollapsible
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Gets the default text style.
-        /// </summary>
-        public abstract TextRunProperties DefaultTextRunProperties { get; }
-
-        /// <summary>
-        /// If not null, text decorations to apply to all runs in the line. This is in addition
-        /// to any text decorations specified by the TextRunProperties for individual text runs.
-        /// </summary>
-        public virtual TextDecorationCollection? TextDecorations => null;
-
-        /// <summary>
-        /// Gets the text wrapping.
-        /// </summary>
-        public abstract TextWrapping TextWrapping { get; }
-
-        /// <summary>
-        /// Line indentation
-        /// </summary>
-        public abstract double Indent { get; }
-
-        /// <summary>
-        /// Paragraph indentation
-        /// </summary>
-        public virtual double ParagraphIndent
-        {
-            get { return 0; }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextRunProperties.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextRunProperties.cs
deleted file mode 100644
index 99fcbd805f..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextRunProperties.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Globalization;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// Provides a set of properties, such as typeface or foreground brush, that can be applied to a TextRun object. This is an abstract class.
-    /// </summary>
-    /// <remarks>
-    /// The text layout client provides a concrete implementation of this abstract class.
-    /// This enables the client to implement text run properties in a way that corresponds with the associated formatting store.
-    /// </remarks>
-    public abstract class TextRunProperties : IEquatable<TextRunProperties>
-    {
-        /// <summary>
-        /// Run typeface
-        /// </summary>
-        public abstract Typeface Typeface { get; }
-
-        /// <summary>
-        /// Em size of font used to format and display text
-        /// </summary>
-        public abstract double FontRenderingEmSize { get; }
-
-        ///<summary>
-        /// Run TextDecorations. 
-        ///</summary>
-        public abstract TextDecorationCollection? TextDecorations { get; }
-
-        /// <summary>
-        /// Brush used to fill text.
-        /// </summary>
-        public abstract IBrush? ForegroundBrush { get; }
-
-        /// <summary>
-        /// Brush used to paint background of run.
-        /// </summary>
-        public abstract IBrush? BackgroundBrush { get; }
-
-        /// <summary>
-        /// Run text culture.
-        /// </summary>
-        public abstract CultureInfo? CultureInfo { get; }
-
-        /// <summary>
-        /// Run vertical box alignment
-        /// </summary>
-        public abstract BaselineAlignment BaselineAlignment { get; }
-
-        public bool Equals(TextRunProperties? other)
-        {
-            if (ReferenceEquals(null, other))
-                return false;
-            if (ReferenceEquals(this, other))
-                return true;
-
-            return Typeface.Equals(other.Typeface) &&
-                   FontRenderingEmSize.Equals(other.FontRenderingEmSize)
-                   && Equals(TextDecorations, other.TextDecorations) &&
-                   Equals(ForegroundBrush, other.ForegroundBrush) &&
-                   Equals(BackgroundBrush, other.BackgroundBrush) &&
-                   Equals(CultureInfo, other.CultureInfo);
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return ReferenceEquals(this, obj) || obj is TextRunProperties other && Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = Typeface.GetHashCode();
-                hashCode = (hashCode * 397) ^ FontRenderingEmSize.GetHashCode();
-                hashCode = (hashCode * 397) ^ (TextDecorations != null ? TextDecorations.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (ForegroundBrush != null ? ForegroundBrush.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (BackgroundBrush != null ? BackgroundBrush.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (CultureInfo != null ? CultureInfo.GetHashCode() : 0);
-                return hashCode;
-            }
-        }
-
-        public static bool operator ==(TextRunProperties left, TextRunProperties right)
-        {
-            return Equals(left, right);
-        }
-
-        public static bool operator !=(TextRunProperties left, TextRunProperties right)
-        {
-            return !Equals(left, right);
-        }
-        
-        internal TextRunProperties WithTypeface(Typeface typeface)
-        {
-            return new GenericTextRunProperties(typeface, FontRenderingEmSize,
-                TextDecorations, ForegroundBrush, BackgroundBrush, BaselineAlignment);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextShaper.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextShaper.cs
deleted file mode 100644
index c982a435c3..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextShaper.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// A class that is responsible for text shaping.
-    /// </summary>
-    public class TextShaper
-    {
-        private readonly ITextShaperImpl _platformImpl;
-
-        public TextShaper(ITextShaperImpl platformImpl)
-        {
-            _platformImpl = platformImpl;
-        }
-
-        /// <summary>
-        /// Gets the current text shaper.
-        /// </summary>
-        public static TextShaper Current
-        {
-            get
-            {
-                var current = AvaloniaLocator.Current.GetService<TextShaper>();
-
-                if (current != null)
-                {
-                    return current;
-                }
-
-                var textShaperImpl = AvaloniaLocator.Current.GetService<ITextShaperImpl>();
-
-                if (textShaperImpl == null)
-                    throw new InvalidOperationException("No text shaper implementation was registered.");
-
-                current = new TextShaper(textShaperImpl);
-
-                AvaloniaLocator.CurrentMutable.Bind<TextShaper>().ToConstant(current);
-
-                return current;
-            }
-        }
-
-        /// <inheritdoc cref="ITextShaperImpl.ShapeText"/>
-        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize,
-            CultureInfo? culture, sbyte bidiLevel)
-        {
-            return _platformImpl.ShapeText(text, typeface, fontRenderingEmSize, culture, bidiLevel);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingCharacterEllipsis.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
deleted file mode 100644
index 4bd46e8c75..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// a collapsing properties to collapse whole line toward the end
-    /// at character granularity and with ellipsis being the collapsing symbol
-    /// </summary>
-    public class TextTrailingCharacterEllipsis : TextCollapsingProperties
-    {
-        private static readonly ReadOnlySlice<char> s_ellipsis = new ReadOnlySlice<char>(new[] { '\u2026' });
-
-        /// <summary>
-        /// Construct a text trailing character ellipsis collapsing properties
-        /// </summary>
-        /// <param name="width">width in which collapsing is constrained to</param>
-        /// <param name="textRunProperties">text run properties of ellispis symbol</param>
-        public TextTrailingCharacterEllipsis(double width, TextRunProperties textRunProperties)
-        {
-            Width = width;
-            Symbol = new TextCharacters(s_ellipsis, textRunProperties);
-        }
-
-        /// <inheritdoc/>
-        public sealed override double Width { get; }
-
-        /// <inheritdoc/>
-        public sealed override TextRun Symbol { get; }
-
-        /// <inheritdoc/>
-        public sealed override TextCollapsingStyle Style { get; } = TextCollapsingStyle.TrailingCharacter;
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingWordEllipsis.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingWordEllipsis.cs
deleted file mode 100644
index 9dffddd207..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingWordEllipsis.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
-{
-    /// <summary>
-    /// a collapsing properties to collapse whole line toward the end
-    /// at word granularity and with ellipsis being the collapsing symbol
-    /// </summary>
-    public class TextTrailingWordEllipsis : TextCollapsingProperties
-    {
-        private static readonly ReadOnlySlice<char> s_ellipsis = new ReadOnlySlice<char>(new[] { '\u2026' });
-
-        /// <summary>
-        /// Construct a text trailing word ellipsis collapsing properties
-        /// </summary>
-        /// <param name="width">width in which collapsing is constrained to</param>
-        /// <param name="textRunProperties">text run properties of ellispis symbol</param>
-        public TextTrailingWordEllipsis(
-            double width,
-            TextRunProperties textRunProperties
-        )
-        {
-            Width = width;
-            Symbol = new TextCharacters(s_ellipsis, textRunProperties);
-        }
-
-
-        /// <inheritdoc/>
-        public sealed override double Width { get; }
-
-        /// <inheritdoc/>
-        public sealed override TextRun Symbol { get; }
-
-        /// <inheritdoc/>
-        public sealed override TextCollapsingStyle Style { get; } = TextCollapsingStyle.TrailingWord;
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiAlgorithm.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiAlgorithm.cs
deleted file mode 100644
index 404956d1e1..0000000000
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiAlgorithm.cs
+++ /dev/null
@@ -1,1717 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
-// Ported from: https://github.com/SixLabors/Fonts/
-
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting.Unicode
-{
-    /// <summary>
-    /// Implementation of Unicode bidirectional algorithm (UAX #9)
-    /// https://unicode.org/reports/tr9/
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// The Bidi algorithm uses a number of memory arrays for resolved
-    /// types, level information, bracket types, x9 removal maps and
-    /// more...
-    /// </para>
-    /// <para>
-    /// This implementation of the BiDi algorithm has been designed
-    /// to reduce memory pressure on the GC by re-using the same
-    /// work buffers, so instances of this class should be re-used
-    /// as much as possible.
-    /// </para>
-    /// </remarks>
-    internal sealed class BidiAlgorithm
-    {
-        /// <summary>
-        /// The original BiDiClass classes as provided by the caller
-        /// </summary>
-        private ArraySlice<BidiClass> _originalClasses;
-
-        /// <summary>
-        /// Paired bracket types as provided by caller
-        /// </summary>
-        private ArraySlice<BidiPairedBracketType> _pairedBracketTypes;
-
-        /// <summary>
-        /// Paired bracket values as provided by caller
-        /// </summary>
-        private ArraySlice<int> _pairedBracketValues;
-
-        /// <summary>
-        /// Try if the incoming data is known to contain brackets
-        /// </summary>
-        private bool _hasBrackets;
-
-        /// <summary>
-        /// True if the incoming data is known to contain embedding runs
-        /// </summary>
-        private bool _hasEmbeddings;
-
-        /// <summary>
-        /// True if the incoming data is known to contain isolating runs
-        /// </summary>
-        private bool _hasIsolates;
-
-        /// <summary>
-        /// Two directional mapping of isolate start/end pairs
-        /// </summary>
-        /// <remarks>
-        /// The forward mapping maps the start index to the end index.
-        /// The reverse mapping maps the end index to the start index.
-        /// </remarks>
-        private readonly Dictionary<int, int> _isolatePairs = new Dictionary<int, int>();
-
-        /// <summary>
-        /// The working BiDi classes
-        /// </summary>
-        private ArraySlice<BidiClass> _workingClasses;
-
-        /// <summary>
-        /// The working classes buffer
-        /// </summary>
-        private ArrayBuilder<BidiClass> _workingClassesBuffer;
-
-        /// <summary>
-        /// A slice of the resolved levels
-        /// </summary>
-        private ArraySlice<sbyte> _resolvedLevels;
-
-        /// <summary>
-        /// The buffer underlying resolvedLevels
-        /// </summary>
-        private ArrayBuilder<sbyte> _resolvedLevelsBuffer;
-
-        /// <summary>
-        /// The resolve paragraph embedding level
-        /// </summary>
-        private sbyte _paragraphEmbeddingLevel;
-
-        /// <summary>
-        /// The status stack used during resolution of explicit
-        /// embedding and isolating runs
-        /// </summary>
-        private readonly Stack<Status> _statusStack = new Stack<Status>();
-
-        /// <summary>
-        /// Mapping used to virtually remove characters for rule X9
-        /// </summary>
-        private ArrayBuilder<int> _x9Map;
-
-        /// <summary>
-        /// Re-usable list of level runs
-        /// </summary>
-        private readonly List<LevelRun> _levelRuns = new List<LevelRun>();
-
-        /// <summary>
-        /// Mapping for the current isolating sequence, built
-        /// by joining level runs from the x9 map.
-        /// </summary>
-        private ArrayBuilder<int> _isolatedRunMapping;
-
-        /// <summary>
-        /// A stack of pending isolate openings used by FindIsolatePairs()
-        /// </summary>
-        private readonly Stack<int> _pendingIsolateOpenings = new Stack<int>();
-
-        /// <summary>
-        /// The level of the isolating run currently being processed
-        /// </summary>
-        private int _runLevel;
-
-        /// <summary>
-        /// The direction of the isolating run currently being processed
-        /// </summary>
-        private BidiClass _runDirection;
-
-        /// <summary>
-        /// The length of the isolating run currently being processed
-        /// </summary>
-        private int _runLength;
-
-        /// <summary>
-        /// A mapped slice of the resolved types for the isolating run currently
-        /// being processed
-        /// </summary>
-        private MappedArraySlice<BidiClass> _runResolvedClasses;
-
-        /// <summary>
-        /// A mapped slice of the original types for the isolating run currently
-        /// being processed
-        /// </summary>
-        private MappedArraySlice<BidiClass> _runOriginalClasses;
-
-        /// <summary>
-        /// A mapped slice of the run levels for the isolating run currently
-        /// being processed
-        /// </summary>
-        private MappedArraySlice<sbyte> _runLevels;
-
-        /// <summary>
-        /// A mapped slice of the paired bracket types of the isolating
-        /// run currently being processed
-        /// </summary>
-        private MappedArraySlice<BidiPairedBracketType> _runBiDiPairedBracketTypes;
-
-        /// <summary>
-        /// A mapped slice of the paired bracket values of the isolating
-        /// run currently being processed
-        /// </summary>
-        private MappedArraySlice<int> _runPairedBracketValues;
-
-        /// <summary>
-        /// Maximum pairing depth for paired brackets
-        /// </summary>
-        private const int MaxPairedBracketDepth = 63;
-
-        /// <summary>
-        /// Reusable list of pending opening brackets used by the
-        /// LocatePairedBrackets method
-        /// </summary>
-        private readonly List<int> _pendingOpeningBrackets = new List<int>();
-
-        /// <summary>
-        /// Resolved list of paired brackets
-        /// </summary>
-        private readonly List<BracketPair> _pairedBrackets = new List<BracketPair>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BidiAlgorithm"/> class.
-        /// </summary>
-        internal BidiAlgorithm()
-        {
-        }
-
-        /// <summary>
-        /// Gets a per-thread instance that can be re-used as often
-        /// as necessary.
-        /// </summary>
-        public static ThreadLocal<BidiAlgorithm> Instance { get; } = new ThreadLocal<BidiAlgorithm>(() => new BidiAlgorithm());
-
-        /// <summary>
-        /// Gets the resolved levels.
-        /// </summary>
-        public ArraySlice<sbyte> ResolvedLevels => _resolvedLevels;
-
-        /// <summary>
-        /// Gets the resolved paragraph embedding level
-        /// </summary>
-        public int ResolvedParagraphEmbeddingLevel => _paragraphEmbeddingLevel;
-
-        /// <summary>
-        /// Process data from a BiDiData instance
-        /// </summary>
-        /// <param name="data">The BiDi Unicode data.</param>
-        public void Process(BidiData data)
-            => Process(
-                data.Classes,
-                data.PairedBracketTypes,
-                data.PairedBracketValues,
-                data.ParagraphEmbeddingLevel,
-                data.HasBrackets,
-                data.HasEmbeddings,
-                data.HasIsolates,
-                null);
-
-        /// <summary>
-        /// Processes Bidi Data
-        /// </summary>
-        public void Process(
-            ArraySlice<BidiClass> types,
-            ArraySlice<BidiPairedBracketType> pairedBracketTypes,
-            ArraySlice<int> pairedBracketValues,
-            sbyte paragraphEmbeddingLevel,
-            bool? hasBrackets,
-            bool? hasEmbeddings,
-            bool? hasIsolates,
-            ArraySlice<sbyte>? outLevels)
-        {
-            // Reset state
-            _isolatePairs.Clear();
-            _workingClassesBuffer.Clear();
-            _levelRuns.Clear();
-            _resolvedLevelsBuffer.Clear();
-
-            // Setup original types and working types
-            _originalClasses = types;
-            _workingClasses = _workingClassesBuffer.Add(types);
-
-            // Capture paired bracket values and types
-            _pairedBracketTypes = pairedBracketTypes;
-            _pairedBracketValues = pairedBracketValues;
-
-            // Store things we know
-            _hasBrackets = hasBrackets ?? _pairedBracketTypes.Length == _originalClasses.Length;
-            _hasEmbeddings = hasEmbeddings ?? true;
-            _hasIsolates = hasIsolates ?? true;
-
-            // Find all isolate pairs
-            FindIsolatePairs();
-
-            // Resolve the paragraph embedding level
-            if (paragraphEmbeddingLevel == 2)
-            {
-                _paragraphEmbeddingLevel = ResolveEmbeddingLevel(_originalClasses);
-            }
-            else
-            {
-                _paragraphEmbeddingLevel = paragraphEmbeddingLevel;
-            }
-
-            // Create resolved levels buffer
-            if (outLevels.HasValue)
-            {
-                if (outLevels.Value.Length != _originalClasses.Length)
-                {
-                    throw new ArgumentException("Out levels must be the same length as the input data");
-                }
-
-                _resolvedLevels = outLevels.Value;
-            }
-            else
-            {
-                _resolvedLevels = _resolvedLevelsBuffer.Add(_originalClasses.Length);
-                _resolvedLevels.Fill(_paragraphEmbeddingLevel);
-            }
-
-            // Resolve explicit embedding levels (Rules X1-X8)
-            ResolveExplicitEmbeddingLevels();
-
-            // Build the rule X9 map
-            BuildX9RemovalMap();
-
-            // Process all isolated run sequences
-            ProcessIsolatedRunSequences();
-
-            // Reset whitespace levels
-            ResetWhitespaceLevels();
-
-            // Clean up
-            AssignLevelsToCodePointsRemovedByX9();
-        }
-
-        /// <summary>
-        /// Resolve the paragraph embedding level if not explicitly passed
-        /// by the caller. Also used by rule X5c for FSI isolating sequences.
-        /// </summary>
-        /// <param name="data">The data to be evaluated</param>
-        /// <returns>The resolved embedding level</returns>
-        public sbyte ResolveEmbeddingLevel(ReadOnlySlice<BidiClass> data)
-        {
-            // P2
-            for (var i = 0; i < data.Length; ++i)
-            {
-                switch (data[i])
-                {
-                    case BidiClass.LeftToRight:
-                        // P3
-                        return 0;
-
-                    case BidiClass.ArabicLetter:
-                    case BidiClass.RightToLeft:
-                        // P3
-                        return 1;
-
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.RightToLeftIsolate:
-                        // Skip isolate pairs
-                        // (Because we're working with a slice, we need to adjust the indices
-                        //  we're using for the isolatePairs map)
-                        if (_isolatePairs.TryGetValue(data.Start + i, out i))
-                        {
-                            i -= data.Start;
-                        }
-                        else
-                        {
-                            i = data.Length;
-                        }
-
-                        break;
-                }
-            }
-
-            // P3
-            return 0;
-        }
-
-        /// <summary>
-        /// Build a list of matching isolates for a directionality slice
-        /// Implements BD9
-        /// </summary>
-        private void FindIsolatePairs()
-        {
-            // Redundant?
-            if (!_hasIsolates)
-            {
-                return;
-            }
-
-            // Lets double check this as we go and clear the flag
-            // if there actually aren't any isolate pairs as this might
-            // mean we can skip some later steps
-            _hasIsolates = false;
-
-            // BD9...
-            _pendingIsolateOpenings.Clear();
-            
-            for (var i = 0; i < _originalClasses.Length; i++)
-            {
-                var t = _originalClasses[i];
-
-                switch (t)
-                {
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    {
-                        _pendingIsolateOpenings.Push(i);
-                        _hasIsolates = true;
-                        break;
-                    }
-                    case BidiClass.PopDirectionalIsolate:
-                    {
-                        if (_pendingIsolateOpenings.Count > 0)
-                        {
-                            _isolatePairs.Add(_pendingIsolateOpenings.Pop(), i);
-                        }
-
-                        _hasIsolates = true;
-                        
-                        break;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Resolve the explicit embedding levels from the original
-        /// data.  Implements rules X1 to X8.
-        /// </summary>
-        private void ResolveExplicitEmbeddingLevels()
-        {
-            // Redundant?
-            if (!_hasIsolates && !_hasEmbeddings)
-            {
-                return;
-            }
-
-            // Work variables
-            _statusStack.Clear();
-            var overflowIsolateCount = 0;
-            var overflowEmbeddingCount = 0;
-            var validIsolateCount = 0;
-
-            // Constants
-            const int maxStackDepth = 125;
-
-            // Rule X1 - setup initial state
-            _statusStack.Clear();
-
-            // Neutral
-            _statusStack.Push(new Status(_paragraphEmbeddingLevel, BidiClass.OtherNeutral, false));
-
-            // Process all characters
-            for (var i = 0; i < _originalClasses.Length; i++)
-            {
-                switch (_originalClasses[i])
-                {
-                    case BidiClass.RightToLeftEmbedding:
-                    {
-                        // Rule X2
-                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 1) | 1);
-                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
-                        {
-                            _statusStack.Push(new Status(newLevel, BidiClass.OtherNeutral, false));
-                            _resolvedLevels[i] = newLevel;
-                        }
-                        else if (overflowIsolateCount == 0)
-                        {
-                            overflowEmbeddingCount++;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.LeftToRightEmbedding:
-                    {
-                        // Rule X3
-                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 2) & ~1);
-                        if (newLevel < maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
-                        {
-                            _statusStack.Push(new Status(newLevel, BidiClass.OtherNeutral, false));
-                            _resolvedLevels[i] = newLevel;
-                        }
-                        else if (overflowIsolateCount == 0)
-                        {
-                            overflowEmbeddingCount++;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.RightToLeftOverride:
-                    {
-                        // Rule X4
-                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 1) | 1);
-                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
-                        {
-                            _statusStack.Push(new Status(newLevel, BidiClass.RightToLeft, false));
-                            _resolvedLevels[i] = newLevel;
-                        }
-                        else if (overflowIsolateCount == 0)
-                        {
-                            overflowEmbeddingCount++;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.LeftToRightOverride:
-                    {
-                        // Rule X5
-                        var newLevel = (sbyte)((_statusStack.Peek().EmbeddingLevel + 2) & ~1);
-                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
-                        {
-                            _statusStack.Push(new Status(newLevel, BidiClass.LeftToRight, false));
-                            _resolvedLevels[i] = newLevel;
-                        }
-                        else if (overflowIsolateCount == 0)
-                        {
-                            overflowEmbeddingCount++;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    {
-                        // Rule X5a, X5b and X5c
-                        var resolvedIsolate = _originalClasses[i];
-
-                        if (resolvedIsolate == BidiClass.FirstStrongIsolate)
-                        {
-                            if (!_isolatePairs.TryGetValue(i, out var endOfIsolate))
-                            {
-                                endOfIsolate = _originalClasses.Length;
-                            }
-
-                            // Rule X5c
-                            if (ResolveEmbeddingLevel(_originalClasses.Slice(i + 1,endOfIsolate - (i + 1))) == 1)
-                            {
-                                resolvedIsolate = BidiClass.RightToLeftIsolate;
-                            }
-                            else
-                            {
-                                resolvedIsolate = BidiClass.LeftToRightIsolate;
-                            }
-                        }
-
-                        // Replace RLI's level with current embedding level
-                        var tos = _statusStack.Peek();
-                        _resolvedLevels[i] = tos.EmbeddingLevel;
-
-                        // Apply override
-                        if (tos.OverrideStatus != BidiClass.OtherNeutral)
-                        {
-                            _workingClasses[i] = tos.OverrideStatus;
-                        }
-
-                        // Work out new level
-                        sbyte newLevel;
-                        if (resolvedIsolate == BidiClass.RightToLeftIsolate)
-                        {
-                            newLevel = (sbyte)((tos.EmbeddingLevel + 1) | 1);
-                        }
-                        else
-                        {
-                            newLevel = (sbyte)((tos.EmbeddingLevel + 2) & ~1);
-                        }
-
-                        // Valid?
-                        if (newLevel <= maxStackDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0)
-                        {
-                            validIsolateCount++;
-                            _statusStack.Push(new Status(newLevel, BidiClass.OtherNeutral, true));
-                        }
-                        else
-                        {
-                            overflowIsolateCount++;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.BoundaryNeutral:
-                    {
-                        // Mentioned in rule X6 - "for all types besides ..., BN, ..."
-                        // no-op
-                        break;
-                    }
-
-                    default:
-                    {
-                        // Rule X6
-                        var tos = _statusStack.Peek();
-                        _resolvedLevels[i] = tos.EmbeddingLevel;
-                        if (tos.OverrideStatus != BidiClass.OtherNeutral)
-                        {
-                            _workingClasses[i] = tos.OverrideStatus;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.PopDirectionalIsolate:
-                    {
-                        // Rule X6a
-                        if (overflowIsolateCount > 0)
-                        {
-                            overflowIsolateCount--;
-                        }
-                        else if (validIsolateCount != 0)
-                        {
-                            overflowEmbeddingCount = 0;
-                            while (!_statusStack.Peek().IsolateStatus)
-                            {
-                                _statusStack.Pop();
-                            }
-
-                            _statusStack.Pop();
-                            validIsolateCount--;
-                        }
-
-                        var tos = _statusStack.Peek();
-                        _resolvedLevels[i] = tos.EmbeddingLevel;
-                        if (tos.OverrideStatus != BidiClass.OtherNeutral)
-                        {
-                            _workingClasses[i] = tos.OverrideStatus;
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.PopDirectionalFormat:
-                    {
-                        // Rule X7
-                        if (overflowIsolateCount == 0)
-                        {
-                            if (overflowEmbeddingCount > 0)
-                            {
-                                overflowEmbeddingCount--;
-                            }
-                            else if (!_statusStack.Peek().IsolateStatus && _statusStack.Count >= 2)
-                            {
-                                _statusStack.Pop();
-                            }
-                        }
-
-                        break;
-                    }
-
-                    case BidiClass.ParagraphSeparator:
-                    {
-                        // Rule X8
-                        _resolvedLevels[i] = _paragraphEmbeddingLevel;
-                        break;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Build a map to the original data positions that excludes all
-        /// the types defined by rule X9
-        /// </summary>
-        private void BuildX9RemovalMap()
-        {
-            // Reserve room for the x9 map
-            _x9Map.Length = _originalClasses.Length;
-
-            if (_hasEmbeddings || _hasIsolates)
-            {
-                // Build a map the removes all x9 characters
-                var j = 0;
-                for (var i = 0; i < _originalClasses.Length; i++)
-                {
-                    if (!IsRemovedByX9(_originalClasses[i]))
-                    {
-                        _x9Map[j++] = i;
-                    }
-                }
-
-                // Set the final length
-                _x9Map.Length = j;
-            }
-            else
-            {
-                for (int i = 0, count = _originalClasses.Length; i < count; i++)
-                {
-                    _x9Map[i] = i;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Find the original character index for an entry in the X9 map
-        /// </summary>
-        /// <param name="index">Index in the x9 removal map</param>
-        /// <returns>Index to the original data</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private int MapX9(int index) => _x9Map[index];
-
-        /// <summary>
-        /// Add a new level run
-        /// </summary>
-        /// <remarks>
-        /// This method resolves the sos and eos values for the run
-        /// and adds the run to the list
-        /// /// </remarks>
-        /// <param name="start">The index of the start of the run (in x9 removed units)</param>
-        /// <param name="length">The length of the run (in x9 removed units)</param>
-        /// <param name="level">The level of the run</param>
-        private void AddLevelRun(int start, int length, int level)
-        {
-            // Get original indices to first and last character in this run
-            var firstCharIndex = MapX9(start);
-            var lastCharIndex = MapX9(start + length - 1);
-
-            // Work out sos
-            var i = firstCharIndex - 1;
-            
-            while (i >= 0 && IsRemovedByX9(_originalClasses[i]))
-            {
-                i--;
-            }
-
-            var prevLevel = i < 0 ? _paragraphEmbeddingLevel : _resolvedLevels[i];
-            var sos = DirectionFromLevel(Math.Max(prevLevel, level));
-
-            // Work out eos
-            var lastType = _workingClasses[lastCharIndex];
-            int nextLevel;
-
-            switch (lastType)
-            {
-                case BidiClass.LeftToRightIsolate:
-                case BidiClass.RightToLeftIsolate:
-                case BidiClass.FirstStrongIsolate:
-                {
-                    nextLevel = _paragraphEmbeddingLevel;
-                    
-                    break;
-                }
-                default:
-                {
-                    i = lastCharIndex + 1;
-                    while (i < _originalClasses.Length && IsRemovedByX9(_originalClasses[i]))
-                    {
-                        i++;
-                    }
-
-                    nextLevel = i >= _originalClasses.Length ? _paragraphEmbeddingLevel : _resolvedLevels[i];
-                    
-                    break;
-                }
-            }
-
-            var eos = DirectionFromLevel(Math.Max(nextLevel, level));
-
-            // Add the run
-            _levelRuns.Add(new LevelRun(start, length, level, sos, eos));
-        }
-
-        /// <summary>
-        /// Find all runs of the same level, populating the _levelRuns
-        /// collection
-        /// </summary>
-        private void FindLevelRuns()
-        {
-            var currentLevel = -1;
-            var runStart = 0;
-            
-            for (var i = 0; i < _x9Map.Length; ++i)
-            {
-                int level = _resolvedLevels[MapX9(i)];
-
-                if (level == currentLevel)
-                {
-                    continue;
-                }
-
-                if (currentLevel != -1)
-                {
-                    AddLevelRun(runStart, i - runStart, currentLevel);
-                }
-
-                currentLevel = level;
-                runStart = i;
-            }
-
-            // Don't forget the final level run
-            if (currentLevel != -1)
-            {
-                AddLevelRun(runStart, _x9Map.Length - runStart, currentLevel);
-            }
-        }
-
-        /// <summary>
-        /// Given a character index, find the level run that starts at that position
-        /// </summary>
-        /// <param name="index">The index into the original (unmapped) data</param>
-        /// <returns>The index of the run that starts at that index</returns>
-        private int FindRunForIndex(int index)
-        {
-            for (var i = 0; i < _levelRuns.Count; i++)
-            {
-                // Passed index is for the original non-x9 filtered data, however
-                // the level run ranges are for the x9 filtered data.  Convert before
-                // comparing
-                if (MapX9(_levelRuns[i].Start) == index)
-                {
-                    return i;
-                }
-            }
-
-            throw new InvalidOperationException("Internal error");
-        }
-
-        /// <summary>
-        /// Determine and the process all isolated run sequences
-        /// </summary>
-        private void ProcessIsolatedRunSequences()
-        {
-            // Find all runs with the same level
-            FindLevelRuns();
-
-            // Process them one at a time by first building
-            // a mapping using slices from the x9 map for each
-            // run section that needs to be joined together to
-            // form an complete run.  That full run mapping
-            // will be placed in _isolatedRunMapping and then
-            // processed by ProcessIsolatedRunSequence().
-            while (_levelRuns.Count > 0)
-            {
-                // Clear the mapping
-                _isolatedRunMapping.Clear();
-
-                // Combine mappings from this run and all runs that continue on from it
-                var runIndex = 0;
-                BidiClass eos;
-                var sos = _levelRuns[0].Sos;
-                var level = _levelRuns[0].Level;
-                
-                while (true)
-                {
-                    // Get the run
-                    var r = _levelRuns[runIndex];
-
-                    // The eos of the isolating run is the eos of the
-                    // last level run that comprises it.
-                    eos = r.Eos;
-
-                    // Remove this run as we've now processed it
-                    _levelRuns.RemoveAt(runIndex);
-
-                    // Add the x9 map indices for the run range to the mapping
-                    // for this isolated run
-                    _isolatedRunMapping.Add(_x9Map.AsSlice(r.Start, r.Length));
-
-                    // Get the last character and see if it's an isolating run with a matching
-                    // PDI and concatenate that run to this one
-                    var lastCharacterIndex = _isolatedRunMapping[_isolatedRunMapping.Length - 1];
-                    var lastType = _originalClasses[lastCharacterIndex];
-                    if ((lastType == BidiClass.LeftToRightIsolate || lastType == BidiClass.RightToLeftIsolate || lastType == BidiClass.FirstStrongIsolate) &&
-                            _isolatePairs.TryGetValue(lastCharacterIndex, out var nextRunIndex))
-                    {
-                        // Find the continuing run index
-                        runIndex = FindRunForIndex(nextRunIndex);
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-
-                // Process this isolated run
-                ProcessIsolatedRunSequence(sos, eos, level);
-            }
-        }
-
-        /// <summary>
-        /// Process a single isolated run sequence, where the character sequence
-        /// mapping is currently held in _isolatedRunMapping.
-        /// </summary>
-        private void ProcessIsolatedRunSequence(BidiClass sos, BidiClass eos, int runLevel)
-        {
-            // Create mappings onto the underlying data
-            _runResolvedClasses = new MappedArraySlice<BidiClass>(_workingClasses, _isolatedRunMapping.AsSlice());
-            _runOriginalClasses = new MappedArraySlice<BidiClass>(_originalClasses, _isolatedRunMapping.AsSlice());
-            _runLevels = new MappedArraySlice<sbyte>(_resolvedLevels, _isolatedRunMapping.AsSlice());
-            if (_hasBrackets)
-            {
-                _runBiDiPairedBracketTypes = new MappedArraySlice<BidiPairedBracketType>(_pairedBracketTypes, _isolatedRunMapping.AsSlice());
-                _runPairedBracketValues = new MappedArraySlice<int>(_pairedBracketValues, _isolatedRunMapping.AsSlice());
-            }
-
-            _runLevel = runLevel;
-            _runDirection = DirectionFromLevel(runLevel);
-            _runLength = _runResolvedClasses.Length;
-
-            // By tracking the types of characters known to be in the current run, we can
-            // skip some of the rules that we know won't apply.  The flags will be
-            // initialized while we're processing rule W1 below.
-            var hasEN = false;
-            var hasAL = false;
-            var hasES = false;
-            var hasCS = false;
-            var hasAN = false;
-            var hasET = false;
-
-            // Rule W1
-            // Also, set hasXX flags
-            int i;
-            var previousClass = sos;
-            
-            for (i = 0; i < _runLength; i++)
-            {
-                var resolvedClass = _runResolvedClasses[i];
-                
-                switch (resolvedClass)
-                {
-                    case BidiClass.NonspacingMark:
-                        _runResolvedClasses[i] = previousClass;
-                        break;
-
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.PopDirectionalIsolate:
-                        previousClass = BidiClass.OtherNeutral;
-                        break;
-
-                    case BidiClass.EuropeanNumber:
-                        hasEN = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.ArabicLetter:
-                        hasAL = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.EuropeanSeparator:
-                        hasES = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.CommonSeparator:
-                        hasCS = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.ArabicNumber:
-                        hasAN = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.EuropeanTerminator:
-                        hasET = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    default:
-                        previousClass = resolvedClass;
-                        break;
-                }
-            }
-
-            // Rule W2
-            if (hasEN)
-            {
-                for (i = 0; i < _runLength; i++)
-                {
-                    if (_runResolvedClasses[i] != BidiClass.EuropeanNumber)
-                    {
-                        continue;
-                    }
-
-                    for (var j = i - 1; j >= 0; j--)
-                    {
-                        var resolvedClass = _runResolvedClasses[j];
-
-                        switch (resolvedClass)
-                        {
-                            case BidiClass.LeftToRight:
-                            case BidiClass.RightToLeft:
-                            case BidiClass.ArabicLetter:
-                            {
-                                if (resolvedClass == BidiClass.ArabicLetter)
-                                {
-                                    _runResolvedClasses[i] = BidiClass.ArabicNumber;
-                                    hasAN = true;
-                                }
-
-                                j = -1;
-                                    
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            // Rule W3
-            if (hasAL)
-            {
-                for (i = 0; i < _runLength; i++)
-                {
-                    if (_runResolvedClasses[i] == BidiClass.ArabicLetter)
-                    {
-                        _runResolvedClasses[i] = BidiClass.RightToLeft;
-                    }
-                }
-            }
-
-            // Rule W4
-            if ((hasES || hasCS) && (hasEN || hasAN))
-            {
-                for (i = 1; i < _runLength - 1; ++i)
-                {
-                    ref var resolvedClass = ref _runResolvedClasses[i];
-                    
-                    if (resolvedClass == BidiClass.EuropeanSeparator)
-                    {
-                        var previousSeparatorClass = _runResolvedClasses[i - 1];
-                        var nextSeparatorClass = _runResolvedClasses[i + 1];
-
-                        if (previousSeparatorClass == BidiClass.EuropeanNumber && nextSeparatorClass == BidiClass.EuropeanNumber)
-                        {
-                            // ES between EN and EN
-                            resolvedClass = BidiClass.EuropeanNumber;
-                        }
-                    }
-                    else if (resolvedClass == BidiClass.CommonSeparator)
-                    {
-                        var previousSeparatorClass = _runResolvedClasses[i - 1];
-                        var nextSeparatorClass = _runResolvedClasses[i + 1];
-
-                        if ((previousSeparatorClass == BidiClass.ArabicNumber && nextSeparatorClass == BidiClass.ArabicNumber) ||
-                             (previousSeparatorClass == BidiClass.EuropeanNumber && nextSeparatorClass == BidiClass.EuropeanNumber))
-                        {
-                            // CS between (AN and AN) or (EN and EN)
-                            resolvedClass = previousSeparatorClass;
-                        }
-                    }
-                }
-            }
-
-            // Rule W5
-            if (hasET && hasEN)
-            {
-                for (i = 0; i < _runLength; ++i)
-                {
-                    if (_runResolvedClasses[i] != BidiClass.EuropeanTerminator)
-                    {
-                        continue;
-                    }
-                    
-                    // Locate end of sequence
-                    var sequenceStart = i;
-                    var sequenceEnd = i;
-                    
-                    while (sequenceEnd < _runLength && _runResolvedClasses[sequenceEnd] == BidiClass.EuropeanTerminator)
-                    {
-                        sequenceEnd++;
-                    }
-
-                    // Preceded by, or followed by EN?
-                    if ((sequenceStart == 0 ? sos : _runResolvedClasses[sequenceStart - 1]) == BidiClass.EuropeanNumber
-                        || (sequenceEnd == _runLength ? eos : _runResolvedClasses[sequenceEnd]) == BidiClass.EuropeanNumber)
-                    {
-                        // Change the entire range
-                        for (var j = sequenceStart; i < sequenceEnd; ++i)
-                        {
-                            _runResolvedClasses[i] = BidiClass.EuropeanNumber;
-                        }
-                    }
-
-                    // continue at end of sequence
-                    i = sequenceEnd;
-                }
-            }
-
-            // Rule W6
-            if (hasES || hasET || hasCS)
-            {
-                for (i = 0; i < _runLength; ++i)
-                {
-                    ref var resolvedClass = ref _runResolvedClasses[i];
-
-                    switch (resolvedClass)
-                    {
-                        case BidiClass.EuropeanSeparator:
-                        case BidiClass.EuropeanTerminator:
-                        case BidiClass.CommonSeparator:
-                        {
-                            resolvedClass = BidiClass.OtherNeutral;
-                            
-                            break;
-                        }
-                    }
-                }
-            }
-
-            // Rule W7.
-            if (hasEN)
-            {
-                var previousStrongClass = sos;
-                
-                for (i = 0; i < _runLength; ++i)
-                {
-                    ref var resolvedClass = ref _runResolvedClasses[i];
-
-                    switch (resolvedClass)
-                    {
-                        case BidiClass.EuropeanNumber:
-                        {
-                            // If prev strong type was an L change this to L too
-                            if (previousStrongClass == BidiClass.LeftToRight)
-                            {
-                                _runResolvedClasses[i] = BidiClass.LeftToRight;
-                            }
-                            
-                            break;
-                        }
-                       
-                        case BidiClass.LeftToRight:
-                        case BidiClass.RightToLeft:
-                        {
-                            // Remember previous strong type (NB: AL should already be changed to R)
-                            previousStrongClass = resolvedClass;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            // Rule N0 - process bracket pairs
-            if (_hasBrackets)
-            {
-                int count;
-                var pairedBrackets = LocatePairedBrackets();
-                
-                for (i = 0, count = pairedBrackets.Count; i < count; i++)
-                {
-                    var pairedBracket = pairedBrackets[i];
-                    
-                    var strongDirection = InspectPairedBracket(pairedBracket);
-
-                    // Case "d" - no strong types in the brackets, ignore
-                    if (strongDirection == BidiClass.OtherNeutral)
-                    {
-                        continue;
-                    }
-
-                    // Case "b" - strong type found that matches the embedding direction
-                    if ((strongDirection == BidiClass.LeftToRight || strongDirection == BidiClass.RightToLeft) && strongDirection == _runDirection)
-                    {
-                        SetPairedBracketDirection(pairedBracket, strongDirection);
-                        continue;
-                    }
-
-                    // Case "c" - found opposite strong type found, look before to establish context
-                    strongDirection = InspectBeforePairedBracket(pairedBracket, sos);
-                    
-                    if (strongDirection == _runDirection || strongDirection == BidiClass.OtherNeutral)
-                    {
-                        strongDirection = _runDirection;
-                    }
-
-                    SetPairedBracketDirection(pairedBracket, strongDirection);
-                }
-            }
-
-            // Rules N1 and N2 - resolve neutral types
-            for (i = 0; i < _runLength; ++i)
-            {
-                var resolvedClass = _runResolvedClasses[i];
-                
-                if (IsNeutralClass(resolvedClass))
-                {
-                    // Locate end of sequence
-                    var seqStart = i;
-                    var seqEnd = i;
-                    
-                    while (seqEnd < _runLength && IsNeutralClass(_runResolvedClasses[seqEnd]))
-                    {
-                        seqEnd++;
-                    }
-
-                    // Work out the preceding class
-                    BidiClass classBefore;
-                    
-                    if (seqStart == 0)
-                    {
-                        classBefore = sos;
-                    }
-                    else
-                    {
-                        classBefore = _runResolvedClasses[seqStart - 1];
-                        
-                        switch (classBefore)
-                        {
-                            case BidiClass.ArabicNumber:
-                            case BidiClass.EuropeanNumber:
-                            {
-                                classBefore = BidiClass.RightToLeft;
-                                
-                                break;
-                            }
-                        }
-                    }
-
-                    // Work out the following class
-                    BidiClass classAfter;
-                    
-                    if (seqEnd == _runLength)
-                    {
-                        classAfter = eos;
-                    }
-                    else
-                    {
-                        classAfter = _runResolvedClasses[seqEnd];
-
-                        switch (classAfter)
-                        {
-                            case BidiClass.ArabicNumber:
-                            case BidiClass.EuropeanNumber:
-                            {
-                                classAfter = BidiClass.RightToLeft;
-                                
-                                break;
-                            }
-                        }
-                    }
-
-                    // Work out the final resolved type
-                    BidiClass finalResolveClass;
-                    
-                    if (classBefore == classAfter)
-                    {
-                        // Rule N1
-                        finalResolveClass = classBefore;
-                    }
-                    else
-                    {
-                        // Rule N2
-                        finalResolveClass = _runDirection;
-                    }
-
-                    // Apply changes
-                    for (var j = seqStart; j < seqEnd; j++)
-                    {
-                        _runResolvedClasses[j] = finalResolveClass;
-                    }
-
-                    // continue after this run
-                    i = seqEnd;
-                }
-            }
-
-            // Rules I1 and I2 - resolve implicit types
-            if ((_runLevel & 0x01) == 0)
-            {
-                // Rule I1 - even
-                for (i = 0; i < _runLength; i++)
-                {
-                    var resolvedClass = _runResolvedClasses[i];
-                    ref var currentRunLevel = ref _runLevels[i];
-
-                    switch (resolvedClass)
-                    {
-                        case BidiClass.RightToLeft:
-                        {
-                            currentRunLevel++;
-                            break;
-                        }
-                        case BidiClass.ArabicNumber:
-                        case BidiClass.EuropeanNumber:
-                        {
-                            currentRunLevel += 2;
-                            
-                            break;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                // Rule I2 - odd
-                for (i = 0; i < _runLength; i++)
-                {
-                    var resolvedClass = _runResolvedClasses[i];
-                    ref var currentRunLevel = ref _runLevels[i];
-                    
-                    if (resolvedClass != BidiClass.RightToLeft)
-                    {
-                        currentRunLevel++;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Locate all pair brackets in the current isolating run
-        /// </summary>
-        /// <returns>A sorted list of BracketPairs</returns>
-        private List<BracketPair> LocatePairedBrackets()
-        {
-            // Clear work collections
-            _pendingOpeningBrackets.Clear();
-            _pairedBrackets.Clear();
-
-            // Since List.Sort is expensive on memory if called often (it internally
-            // allocates an ArraySorted object) and since we will rarely have many
-            // items in this list (most paragraphs will only have a handful of bracket
-            // pairs - if that), we use a simple linear lookup and insert most of the
-            // time.  If there are more that `sortLimit` paired brackets we abort th
-            // linear searching/inserting and using List.Sort at the end.
-            const int sortLimit = 8;
-
-            // Process all characters in the run, looking for paired brackets
-            for (int i = 0, length = _runLength; i < length; i++)
-            {
-                // Ignore non-neutral characters
-                if (_runResolvedClasses[i] != BidiClass.OtherNeutral)
-                {
-                    continue;
-                }
-
-                switch (_runBiDiPairedBracketTypes[i])
-                {
-                    case BidiPairedBracketType.Open:
-                        if (_pendingOpeningBrackets.Count == MaxPairedBracketDepth)
-                        {
-                            goto exit;
-                        }
-
-                        _pendingOpeningBrackets.Insert(0, i);
-                        break;
-
-                    case BidiPairedBracketType.Close:
-                        // see if there is a match
-                        for (var j = 0; j < _pendingOpeningBrackets.Count; j++)
-                        {
-                            if (_runPairedBracketValues[i] != _runPairedBracketValues[_pendingOpeningBrackets[j]])
-                            {
-                                continue;
-                            }
-                            
-                            // Add this paired bracket set
-                            var opener = _pendingOpeningBrackets[j];
-                            
-                            if (_pairedBrackets.Count < sortLimit)
-                            {
-                                var ppi = 0;
-                                while (ppi < _pairedBrackets.Count && _pairedBrackets[ppi].OpeningIndex < opener)
-                                {
-                                    ppi++;
-                                }
-
-                                _pairedBrackets.Insert(ppi, new BracketPair(opener, i));
-                            }
-                            else
-                            {
-                                _pairedBrackets.Add(new BracketPair(opener, i));
-                            }
-
-                            // remove up to and including matched opener
-                            _pendingOpeningBrackets.RemoveRange(0, j + 1);
-                            break;
-                        }
-
-                        break;
-                }
-            }
-
-            exit:
-
-            // Is a sort pending?
-            if (_pairedBrackets.Count > sortLimit)
-            {
-                _pairedBrackets.Sort();
-            }
-
-            return _pairedBrackets;
-        }
-
-        /// <summary>
-        /// Inspect a paired bracket set and determine its strong direction
-        /// </summary>
-        /// <param name="bracketPair">The paired bracket to be inspected</param>
-        /// <returns>The direction of the bracket set content</returns>
-        private BidiClass InspectPairedBracket(in BracketPair bracketPair)
-        {
-            var directionFromLevel = DirectionFromLevel(_runLevel);
-            var directionOpposite = BidiClass.OtherNeutral;
-            
-            for (var i = bracketPair.OpeningIndex + 1; i < bracketPair.ClosingIndex; i++)
-            {
-                var dir = GetStrongClassN0(_runResolvedClasses[i]);
-                
-                if (dir == BidiClass.OtherNeutral)
-                {
-                    continue;
-                }
-
-                if (dir == directionFromLevel)
-                {
-                    return dir;
-                }
-
-                directionOpposite = dir;
-            }
-
-            return directionOpposite;
-        }
-
-        /// <summary>
-        /// Look for a strong type before a paired bracket
-        /// </summary>
-        /// <param name="bracketPair">The paired bracket set to be inspected</param>
-        /// <param name="sos">The sos in case nothing found before the bracket</param>
-        /// <returns>The strong direction before the brackets</returns>
-        private BidiClass InspectBeforePairedBracket(in BracketPair bracketPair, BidiClass sos)
-        {
-            for (var i = bracketPair.OpeningIndex - 1; i >= 0; --i)
-            {
-                var direction = GetStrongClassN0(_runResolvedClasses[i]);
-                
-                if (direction != BidiClass.OtherNeutral)
-                {
-                    return direction;
-                }
-            }
-
-            return sos;
-        }
-
-        /// <summary>
-        /// Sets the direction of a bracket pair, including setting the direction of
-        /// NSM's inside the brackets and following.
-        /// </summary>
-        /// <param name="bracketPair">The paired brackets</param>
-        /// <param name="direction">The resolved direction for the bracket pair</param>
-        private void SetPairedBracketDirection(in BracketPair bracketPair, BidiClass direction)
-        {
-            // Set the direction of the brackets
-            _runResolvedClasses[bracketPair.OpeningIndex] = direction;
-            _runResolvedClasses[bracketPair.ClosingIndex] = direction;
-
-            // Set the directionality of NSM's inside the brackets
-            for (var i = bracketPair.OpeningIndex + 1; i < bracketPair.ClosingIndex; i++)
-            {
-                if (_runOriginalClasses[i] == BidiClass.NonspacingMark)
-                {
-                    _runOriginalClasses[i] = direction;
-                }
-                else
-                {
-                    break;
-                }
-            }
-
-            // Set the directionality of NSM's following the brackets
-            for (var i = bracketPair.ClosingIndex + 1; i < _runLength; i++)
-            {
-                if (_runOriginalClasses[i] == BidiClass.NonspacingMark)
-                {
-                    _runResolvedClasses[i] = direction;
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Resets whitespace levels. Implements rule L1
-        /// </summary>
-        private void ResetWhitespaceLevels()
-        {
-            for (var i = 0; i < _resolvedLevels.Length; i++)
-            {
-                var originalClass = _originalClasses[i];
-
-                switch (originalClass)
-                {
-                    case BidiClass.ParagraphSeparator:
-                    case BidiClass.SegmentSeparator:
-                    {
-                        // Rule L1, clauses one and two.
-                        _resolvedLevels[i] = _paragraphEmbeddingLevel;
-
-                        // Rule L1, clause three.
-                        for (var j = i - 1; j >= 0; --j)
-                        {
-                            if (IsWhitespace(_originalClasses[j]))
-                            {
-                                // including format codes
-                                _resolvedLevels[j] = _paragraphEmbeddingLevel;
-                            }
-                            else
-                            {
-                                break;
-                            }
-                        }
-                        
-                        break;
-                    }
-                }
-            }
-
-            // Rule L1, clause four.
-            for (var j = _resolvedLevels.Length - 1; j >= 0; j--)
-            {
-                if (IsWhitespace(_originalClasses[j]))
-                { // including format codes
-                    _resolvedLevels[j] = _paragraphEmbeddingLevel;
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Assign levels to any characters that would be have been
-        /// removed by rule X9.  The idea is to keep level runs together
-        /// that would otherwise be broken by an interfering isolate/embedding
-        /// control character.
-        /// </summary>
-        private void AssignLevelsToCodePointsRemovedByX9()
-        {
-            // Redundant?
-            if (!_hasIsolates && !_hasEmbeddings)
-            {
-                return;
-            }
-
-            // No-op?
-            if (_workingClasses.Length == 0)
-            {
-                return;
-            }
-
-            // Fix up first character
-            if (_resolvedLevels[0] < 0)
-            {
-                _resolvedLevels[0] = _paragraphEmbeddingLevel;
-            }
-
-            if (IsRemovedByX9(_originalClasses[0]))
-            {
-                _workingClasses[0] = _originalClasses[0];
-            }
-
-            for (int i = 1, length = _workingClasses.Length; i < length; i++)
-            {
-                var originalClass = _originalClasses[i];
-                
-                if (IsRemovedByX9(originalClass))
-                {
-                    _workingClasses[i] = originalClass;
-                    _resolvedLevels[i] = _resolvedLevels[i - 1];
-                }
-            }
-        }
-
-        /// <summary>
-        /// Check if a directionality type represents whitespace
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool IsWhitespace(BidiClass biDiClass)
-        {
-            switch (biDiClass)
-            {
-                    case BidiClass.LeftToRightEmbedding:
-                    case BidiClass.RightToLeftEmbedding:
-                    case BidiClass.LeftToRightOverride:
-                    case BidiClass.RightToLeftOverride:
-                    case BidiClass.PopDirectionalFormat:
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.PopDirectionalIsolate:
-                    case BidiClass.BoundaryNeutral:
-                    case BidiClass.WhiteSpace:
-                        return true;
-                default:
-                    return false;
-            }
-        }
-
-        /// <summary>
-        /// Convert a level to a direction where odd is RTL and
-        /// even is LTR
-        /// </summary>
-        /// <param name="level">The level to convert</param>
-        /// <returns>A directionality</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static BidiClass DirectionFromLevel(int level)
-            => ((level & 0x1) == 0) ? BidiClass.LeftToRight : BidiClass.RightToLeft;
-
-        /// <summary>
-        /// Helper to check if a directionality is removed by rule X9
-        /// </summary>
-        /// <param name="biDiClass">The bidi type to check</param>
-        /// <returns>True if rule X9 would remove this character; otherwise false</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool IsRemovedByX9(BidiClass biDiClass)
-        {
-            switch (biDiClass)
-            {
-                    case BidiClass.LeftToRightEmbedding:
-                    case  BidiClass.RightToLeftEmbedding:
-                    case  BidiClass.LeftToRightOverride:
-                    case  BidiClass.RightToLeftOverride:
-                    case  BidiClass.PopDirectionalFormat:
-                    case  BidiClass.BoundaryNeutral:
-                        return true;
-                default:
-                    return false;
-            }
-        }
-
-        /// <summary>
-        /// Check if a a directionality is neutral for rules N1 and N2
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool IsNeutralClass(BidiClass direction)
-        {
-            switch (direction)
-            {
-                    case BidiClass.ParagraphSeparator:
-                    case BidiClass.SegmentSeparator:
-                    case BidiClass.WhiteSpace:
-                    case BidiClass.OtherNeutral:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.PopDirectionalIsolate:
-                        return true;
-                        default:
-                            return false;
-            }
-        }
-
-        /// <summary>
-        /// Maps a direction to a strong class for rule N0
-        /// </summary>
-        /// <param name="direction">The direction to map</param>
-        /// <returns>A strong direction - R, L or ON</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static BidiClass GetStrongClassN0(BidiClass direction)
-        {
-            switch (direction)
-            {
-                    case BidiClass.EuropeanNumber:
-                    case BidiClass.ArabicNumber:
-                    case BidiClass.ArabicLetter:
-                    case BidiClass.RightToLeft:
-                        return BidiClass.RightToLeft;
-                    case BidiClass.LeftToRight:
-                        return BidiClass.LeftToRight;
-                    default:
-                        return BidiClass.OtherNeutral;
-            }
-        }
-
-        /// <summary>
-        /// Hold the start and end index of a pair of brackets
-        /// </summary>
-        private readonly struct BracketPair : IComparable<BracketPair>
-        {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="BracketPair"/> struct.
-            /// </summary>
-            /// <param name="openingIndex">Index of the opening bracket</param>
-            /// <param name="closingIndex">Index of the closing bracket</param>
-            public BracketPair(int openingIndex, int closingIndex)
-            {
-                OpeningIndex = openingIndex;
-                ClosingIndex = closingIndex;
-            }
-
-            /// <summary>
-            /// Gets the index of the opening bracket
-            /// </summary>
-            public int OpeningIndex { get; }
-
-            /// <summary>
-            /// Gets the index of the closing bracket
-            /// </summary>
-            public int ClosingIndex { get; }
-
-            public int CompareTo(BracketPair other)
-                => OpeningIndex.CompareTo(other.OpeningIndex);
-        }
-
-        /// <summary>
-        /// Status stack entry used while resolving explicit
-        /// embedding levels
-        /// </summary>
-        private readonly struct Status
-        {
-            public Status(sbyte embeddingLevel, BidiClass overrideStatus, bool isolateStatus)
-            {
-                EmbeddingLevel = embeddingLevel;
-                OverrideStatus = overrideStatus;
-                IsolateStatus = isolateStatus;
-            }
-
-            public sbyte EmbeddingLevel { get; }
-
-            public BidiClass OverrideStatus { get; }
-
-            public bool IsolateStatus { get; }
-        }
-
-        /// <summary>
-        /// Provides information about a level run - a continuous
-        /// sequence of equal levels.
-        /// </summary>
-        private readonly struct LevelRun
-        {
-            public LevelRun(int start, int length, int level, BidiClass sos, BidiClass eos)
-            {
-                Start = start;
-                Length = length;
-                Level = level;
-                Sos = sos;
-                Eos = eos;
-            }
-
-            public int Start { get; }
-
-            public int Length { get; }
-
-            public int Level { get; }
-
-            public BidiClass Sos { get; }
-
-            public BidiClass Eos { get; }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TextTrimming.cs b/src/Avalonia.Visuals/Media/TextTrimming.cs
deleted file mode 100644
index f8a63dfede..0000000000
--- a/src/Avalonia.Visuals/Media/TextTrimming.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes how text is trimmed when it overflows.
-    /// </summary>
-    public enum TextTrimming
-    {
-        /// <summary>
-        /// Text is not trimmed.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// Text is trimmed at a character boundary. An ellipsis (...) is drawn in place of remaining text.
-        /// </summary>
-        CharacterEllipsis,
-
-        /// <summary>
-        /// Text is trimmed at a word boundary. An ellipsis (...) is drawn in place of remaining text.
-        /// </summary>
-        WordEllipsis
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/TileBrush.cs b/src/Avalonia.Visuals/Media/TileBrush.cs
deleted file mode 100644
index 0a4bc0e56d..0000000000
--- a/src/Avalonia.Visuals/Media/TileBrush.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Describes how a <see cref="TileBrush"/> is tiled.
-    /// </summary>
-    public enum TileMode
-    {
-        /// <summary>
-        /// A single repeat of the content will be displayed.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// The content will be repeated horizontally, with alternate tiles mirrored.
-        /// </summary>
-        FlipX,
-
-        /// <summary>
-        /// The content will be repeated vertically, with alternate tiles mirrored.
-        /// </summary>
-        FlipY,
-
-        /// <summary>
-        /// The content will be repeated horizontally and vertically, with alternate tiles mirrored.
-        /// </summary>
-        FlipXY,
-
-        /// <summary>
-        /// The content will be repeated.
-        /// </summary>
-        Tile
-    }
-
-    /// <summary>
-    /// Base class for brushes which display repeating images.
-    /// </summary>
-    public abstract class TileBrush : Brush, ITileBrush
-    {
-        /// <summary>
-        /// Defines the <see cref="AlignmentX"/> property.
-        /// </summary>
-        public static readonly StyledProperty<AlignmentX> AlignmentXProperty =
-            AvaloniaProperty.Register<TileBrush, AlignmentX>(nameof(AlignmentX), AlignmentX.Center);
-
-        /// <summary>
-        /// Defines the <see cref="AlignmentY"/> property.
-        /// </summary>
-        public static readonly StyledProperty<AlignmentY> AlignmentYProperty =
-            AvaloniaProperty.Register<TileBrush, AlignmentY>(nameof(AlignmentY), AlignmentY.Center);
-
-        /// <summary>
-        /// Defines the <see cref="DestinationRect"/> property.
-        /// </summary>
-        public static readonly StyledProperty<RelativeRect> DestinationRectProperty =
-            AvaloniaProperty.Register<TileBrush, RelativeRect>(nameof(DestinationRect), RelativeRect.Fill);
-
-        /// <summary>
-        /// Defines the <see cref="SourceRect"/> property.
-        /// </summary>
-        public static readonly StyledProperty<RelativeRect> SourceRectProperty =
-            AvaloniaProperty.Register<TileBrush, RelativeRect>(nameof(SourceRect), RelativeRect.Fill);
-
-        /// <summary>
-        /// Defines the <see cref="Stretch"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Stretch> StretchProperty =
-            AvaloniaProperty.Register<TileBrush, Stretch>(nameof(Stretch), Stretch.Uniform);
-
-        /// <summary>
-        /// Defines the <see cref="TileMode"/> property.
-        /// </summary>
-        public static readonly StyledProperty<TileMode> TileModeProperty =
-            AvaloniaProperty.Register<TileBrush, TileMode>(nameof(TileMode));
-
-        static TileBrush()
-        {
-            AffectsRender<TileBrush>(
-                AlignmentXProperty,
-                AlignmentYProperty,
-                DestinationRectProperty,
-                SourceRectProperty,
-                StretchProperty,
-                TileModeProperty);
-            RenderOptions.BitmapInterpolationModeProperty.OverrideDefaultValue<TileBrush>(BitmapInterpolationMode.Default);
-        }
-
-        /// <summary>
-        /// Gets or sets the horizontal alignment of a tile in the destination.
-        /// </summary>
-        public AlignmentX AlignmentX
-        {
-            get { return GetValue(AlignmentXProperty); }
-            set { SetValue(AlignmentXProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the horizontal alignment of a tile in the destination.
-        /// </summary>
-        public AlignmentY AlignmentY
-        {
-            get { return GetValue(AlignmentYProperty); }
-            set { SetValue(AlignmentYProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the rectangle on the destination in which to paint a tile.
-        /// </summary>
-        public RelativeRect DestinationRect
-        {
-            get { return GetValue(DestinationRectProperty); }
-            set { SetValue(DestinationRectProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the rectangle of the source image that will be displayed.
-        /// </summary>
-        public RelativeRect SourceRect
-        {
-            get { return GetValue(SourceRectProperty); }
-            set { SetValue(SourceRectProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value controlling how the source rectangle will be stretched to fill
-        /// the destination rect.
-        /// </summary>
-        public Stretch Stretch
-        {
-            get { return (Stretch)GetValue(StretchProperty); }
-            set { SetValue(StretchProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the brush's tile mode.
-        /// </summary>
-        public TileMode TileMode
-        {
-            get { return (TileMode)GetValue(TileModeProperty); }
-            set { SetValue(TileModeProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the bitmap interpolation mode.
-        /// </summary>
-        /// <value>
-        /// The bitmap interpolation mode.
-        /// </value>
-        public BitmapInterpolationMode BitmapInterpolationMode
-        {
-            get { return RenderOptions.GetBitmapInterpolationMode(this); }
-            set { RenderOptions.SetBitmapInterpolationMode(this, value); }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Transform.cs b/src/Avalonia.Visuals/Media/Transform.cs
deleted file mode 100644
index 60701ecfaf..0000000000
--- a/src/Avalonia.Visuals/Media/Transform.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using Avalonia.Animation;
-using Avalonia.Animation.Animators;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Media
-{
-    /// <summary>
-    /// Represents a transform on an <see cref="IVisual"/>.
-    /// </summary>
-    public abstract class Transform : Animatable, IMutableTransform
-    {
-        static Transform()
-        {
-            Animation.Animation.RegisterAnimator<TransformAnimator>(prop =>
-                typeof(ITransform).IsAssignableFrom(prop.OwnerType));
-        }
-
-        /// <summary>
-        /// Raised when the transform changes.
-        /// </summary>
-        public event EventHandler? Changed;
-
-        /// <summary>
-        /// Gets the transform's <see cref="Matrix"/>.
-        /// </summary>
-        public abstract Matrix Value { get; }
-
-        /// <summary>
-        /// Parses a <see cref="Transform"/> string.
-        /// </summary>
-        /// <param name="s">Six comma-delimited double values that describe the new <see cref="Transform"/>. For details check <see cref="Matrix.Parse(string)"/> </param>
-        /// <returns>The <see cref="Transform"/>.</returns>
-        public static Transform Parse(string s)
-        {
-            return new MatrixTransform(Matrix.Parse(s));
-        }
-
-        /// <summary>
-        /// Raises the <see cref="Changed"/> event.
-        /// </summary>
-        protected void RaiseChanged()
-        {
-            Changed?.Invoke(this, EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Returns a String representing this transform matrix instance.
-        /// </summary>
-        /// <returns>The string representation.</returns>
-        public override string ToString()
-        {
-            return Value.ToString();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IBitmapImpl.cs b/src/Avalonia.Visuals/Platform/IBitmapImpl.cs
deleted file mode 100644
index 1e68bc477d..0000000000
--- a/src/Avalonia.Visuals/Platform/IBitmapImpl.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.IO;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.Imaging.Bitmap"/>.
-    /// </summary>
-    public interface IBitmapImpl : IDisposable
-    {
-        /// <summary>
-        /// Gets the dots per inch (DPI) of the image.
-        /// </summary>
-        Vector Dpi { get; }
-
-        /// <summary>
-        /// Gets the size of the bitmap, in device pixels.
-        /// </summary>
-        PixelSize PixelSize { get; }
-        
-        /// <summary>
-        /// Version of the pixel data
-        /// </summary>
-        int Version { get; }
-
-        /// <summary>
-        /// Saves the bitmap to a file.
-        /// </summary>
-        /// <param name="fileName">The filename.</param>
-        void Save(string fileName);
-
-        /// <summary>
-        /// Saves the bitmap to a stream in png format.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        void Save(Stream stream);
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
deleted file mode 100644
index 82af6ff0b6..0000000000
--- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the interface through which drawing occurs.
-    /// </summary>
-    public interface IDrawingContextImpl : IDisposable
-    {
-        /// <summary>
-        /// Gets or sets the current transform of the drawing context.
-        /// </summary>
-        Matrix Transform { get; set; }
-
-        /// <summary>
-        /// Clears the render target to the specified color.
-        /// </summary>
-        /// <param name="color">The color.</param>
-        void Clear(Color color);
-
-        /// <summary>
-        /// Draws a bitmap image.
-        /// </summary>
-        /// <param name="source">The bitmap image.</param>
-        /// <param name="opacity">The opacity to draw with.</param>
-        /// <param name="sourceRect">The rect in the image to draw.</param>
-        /// <param name="destRect">The rect in the output to draw to.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default);
-
-        /// <summary>
-        /// Draws a bitmap image.
-        /// </summary>
-        /// <param name="source">The bitmap image.</param>
-        /// <param name="opacityMask">The opacity mask to draw with.</param>
-        /// <param name="opacityMaskRect">The destination rect for the opacity mask.</param>
-        /// <param name="destRect">The rect in the output to draw to.</param>
-        void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect);
-
-        /// <summary>
-        /// Draws a line.
-        /// </summary>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="p1">The first point of the line.</param>
-        /// <param name="p2">The second point of the line.</param>
-        void DrawLine(IPen pen, Point p1, Point p2);
-
-        /// <summary>
-        /// Draws a geometry.
-        /// </summary>
-        /// <param name="brush">The fill brush.</param>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="geometry">The geometry.</param>
-        void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry);
-
-        /// <summary>
-        /// Draws a rectangle with the specified Brush and Pen.
-        /// </summary>
-        /// <param name="brush">The brush used to fill the rectangle, or <c>null</c> for no fill.</param>
-        /// <param name="pen">The pen used to stroke the rectangle, or <c>null</c> for no stroke.</param>
-        /// <param name="rect">The rectangle bounds.</param>
-        /// <param name="boxShadows">Box shadow effect parameters</param>
-        /// <remarks>
-        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
-        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
-        /// </remarks>
-        void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect,
-            BoxShadows boxShadows = default);
-
-        /// <summary>
-        /// Draws an ellipse with the specified Brush and Pen.
-        /// </summary>
-        /// <param name="brush">The brush used to fill the ellipse, or <c>null</c> for no fill.</param>
-        /// <param name="pen">The pen used to stroke the ellipse, or <c>null</c> for no stroke.</param>
-        /// <param name="rect">The ellipse bounds.</param>
-        /// <remarks>
-        /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
-        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
-        /// </remarks>
-        void DrawEllipse(IBrush? brush, IPen? pen, Rect rect);
-
-
-        /// <summary>
-        /// Draws a glyph run.
-        /// </summary>
-        /// <param name="foreground">The foreground.</param>
-        /// <param name="glyphRun">The glyph run.</param>
-        void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun);
-
-        /// <summary>
-        /// Creates a new <see cref="IRenderTargetBitmapImpl"/> that can be used as a render layer
-        /// for the current render target.
-        /// </summary>
-        /// <param name="size">The size of the layer in DIPs.</param>
-        /// <returns>An <see cref="IRenderTargetBitmapImpl"/></returns>
-        /// <remarks>
-        /// Depending on the rendering backend used, a layer created via this method may be more
-        /// performant than a standard render target bitmap. In particular the Direct2D backend
-        /// has to do a format conversion each time a standard render target bitmap is rendered,
-        /// but a layer created via this method has no such overhead.
-        /// </remarks>
-        IDrawingContextLayerImpl CreateLayer(Size size);
-
-        /// <summary>
-        /// Pushes a clip rectangle.
-        /// </summary>
-        /// <param name="clip">The clip rectangle.</param>
-        void PushClip(Rect clip);
-
-        /// <summary>
-        /// Pushes a clip rounded rectangle.
-        /// </summary>
-        /// <param name="clip">The clip rounded rectangle</param>
-        void PushClip(RoundedRect clip);
-
-        /// <summary>
-        /// Pops the latest pushed clip rectangle.
-        /// </summary>
-        void PopClip();
-
-        /// <summary>
-        /// Pushes an opacity value.
-        /// </summary>
-        /// <param name="opacity">The opacity.</param>
-        void PushOpacity(double opacity);
-
-        /// <summary>
-        /// Pops the latest pushed opacity value.
-        /// </summary>
-        void PopOpacity();
-
-        /// <summary>
-        /// Pushes an opacity mask
-        /// </summary>
-        void PushOpacityMask(IBrush mask, Rect bounds);
-
-        /// <summary>
-        /// Pops the latest pushed opacity mask.
-        /// </summary>
-        void PopOpacityMask();
-
-        /// <summary>
-        /// Pushes a clip geometry.
-        /// </summary>
-        /// <param name="clip">The clip geometry.</param>
-        void PushGeometryClip(IGeometryImpl clip);
-
-        /// <summary>
-        /// Pops the latest pushed geometry clip.
-        /// </summary>
-        void PopGeometryClip();
-        
-        /// <summary>
-        /// Pushes a bitmap blending value.
-        /// </summary>
-        /// <param name="blendingMode">The bitmap blending mode.</param>
-        void PushBitmapBlendMode(BitmapBlendingMode blendingMode);
-
-        /// <summary>
-        /// Pops the latest pushed bitmap blending value.
-        /// </summary>
-        void PopBitmapBlendMode();
-
-        /// <summary>
-        /// Adds a custom draw operation
-        /// </summary>
-        /// <param name="custom">Custom draw operation</param>
-        void Custom(ICustomDrawOperation custom);
-    }
-
-    public interface IDrawingContextLayerImpl : IRenderTargetBitmapImpl
-    {
-        /// <summary>
-        /// Does optimized blit with Src blend mode
-        /// </summary>
-        /// <param name="context"></param>
-        void Blit(IDrawingContextImpl context);
-        
-        /// <summary>
-        /// Returns true if layer supports optimized blit
-        /// </summary>
-        bool CanBlit { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IFontManagerImpl.cs b/src/Avalonia.Visuals/Platform/IFontManagerImpl.cs
deleted file mode 100644
index 0110287afd..0000000000
--- a/src/Avalonia.Visuals/Platform/IFontManagerImpl.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using System.Globalization;
-using Avalonia.Media;
-
-namespace Avalonia.Platform
-{
-    public interface IFontManagerImpl
-    {
-        /// <summary>
-        ///     Gets the system's default font family's name.
-        /// </summary>
-        string GetDefaultFontFamilyName();
-
-        /// <summary>
-        ///     Get all installed fonts in the system.
-        /// <param name="checkForUpdates">If <c>true</c> the font collection is updated.</param>
-        /// </summary>
-        IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false);
-
-        /// <summary>
-        ///     Tries to match a specified character to a typeface that supports specified font properties.
-        /// </summary>
-        /// <param name="codepoint">The codepoint to match against.</param>
-        /// <param name="fontStyle">The font style.</param>
-        /// <param name="fontWeight">The font weight.</param>
-        /// <param name="fontStretch">The font stretch.</param>
-        /// <param name="fontFamily">The font family. This is optional and used for fallback lookup.</param>
-        /// <param name="culture">The culture.</param>
-        /// <param name="typeface">The matching typeface.</param>
-        /// <returns>
-        ///     <c>True</c>, if the <see cref="IFontManagerImpl"/> could match the character to specified parameters, <c>False</c> otherwise.
-        /// </returns>
-        bool TryMatchCharacter(int codepoint, FontStyle fontStyle,
-            FontWeight fontWeight, FontStretch fontStretch,
-            FontFamily? fontFamily, CultureInfo? culture, out Typeface typeface);
-
-        /// <summary>
-        ///     Creates a glyph typeface.
-        /// </summary>
-        /// <param name="typeface">The typeface.</param>
-        /// <returns>0
-        ///     The created glyph typeface. Can be <c>Null</c> if it was not possible to create a glyph typeface.
-        /// </returns>
-        IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface);
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IGeometryContext.cs b/src/Avalonia.Visuals/Platform/IGeometryContext.cs
deleted file mode 100644
index 3f7273b53b..0000000000
--- a/src/Avalonia.Visuals/Platform/IGeometryContext.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using Avalonia.Media;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Describes a geometry using drawing commands.
-    /// </summary>
-    public interface IGeometryContext : IDisposable
-    {
-        /// <summary>
-        /// Draws an arc to the specified point.
-        /// </summary>
-        /// <param name="point">The destination point.</param>
-        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
-        /// <param name="rotationAngle">The rotation angle of the oval that specifies the curve.</param>
-        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
-        /// <param name="sweepDirection">
-        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
-        /// </param>
-        void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection);
-
-        /// <summary>
-        /// Begins a new figure.
-        /// </summary>
-        /// <param name="startPoint">The starting point for the figure.</param>
-        /// <param name="isFilled">Whether the figure is filled.</param>
-        void BeginFigure(Point startPoint, bool isFilled = true);
-
-        /// <summary>
-        /// Draws a Bezier curve to the specified point.
-        /// </summary>
-        /// <param name="point1">The first control point used to specify the shape of the curve.</param>
-        /// <param name="point2">The second control point used to specify the shape of the curve.</param>
-        /// <param name="point3">The destination point for the end of the curve.</param>
-        void CubicBezierTo(Point point1, Point point2, Point point3);
-
-        /// <summary>
-        /// Draws a quadratic Bezier curve to the specified point
-        /// </summary>
-        /// <param name="control">Control point</param>
-        /// <param name="endPoint">DestinationPoint</param>
-        void QuadraticBezierTo(Point control, Point endPoint);
-
-        /// <summary>
-        /// Draws a line to the specified point.
-        /// </summary>
-        /// <param name="point">The destination point.</param>
-        void LineTo(Point point);
-
-        /// <summary>
-        /// Ends the figure started by <see cref="BeginFigure(Point, bool)"/>.
-        /// </summary>
-        /// <param name="isClosed">Whether the figure is closed.</param>
-        void EndFigure(bool isClosed);
-
-        /// <summary>
-        /// Sets the fill rule.
-        /// </summary>
-        /// <param name="fillRule">The fill rule.</param>
-        void SetFillRule(FillRule fillRule);
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Platform/IGeometryImpl.cs b/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
deleted file mode 100644
index ed6de1b5c7..0000000000
--- a/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using Avalonia.Media;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a <see cref="Geometry"/>.
-    /// </summary>
-    public interface IGeometryImpl
-    {
-        /// <summary>
-        /// Gets the geometry's bounding rectangle.
-        /// </summary>
-        Rect Bounds { get; }
-        
-        /// <summary>
-        /// Gets the geometry's total length as if all its contours are placed
-        /// in a straight line.
-        /// </summary>
-        double ContourLength { get; }
-
-        /// <summary>
-        /// Gets the geometry's bounding rectangle with the specified pen.
-        /// </summary>
-        /// <param name="pen">The pen to use. May be null.</param>
-        /// <returns>The bounding rectangle.</returns>
-        Rect GetRenderBounds(IPen? pen);
-
-        /// <summary>
-        /// Indicates whether the geometry's fill contains the specified point.
-        /// </summary>
-        /// <param name="point">The point.</param>
-        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
-        bool FillContains(Point point);
-
-        /// <summary>
-        /// Intersects the geometry with another geometry.
-        /// </summary>
-        /// <param name="geometry">The other geometry.</param>
-        /// <returns>A new <see cref="IGeometryImpl"/> representing the intersection.</returns>
-        IGeometryImpl Intersect(IGeometryImpl geometry);
-
-        /// <summary>
-        /// Indicates whether the geometry's stroke contains the specified point.
-        /// </summary>
-        /// <param name="pen">The stroke to use.</param>
-        /// <param name="point">The point.</param>
-        /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
-        bool StrokeContains(IPen pen, Point point);
-
-        /// <summary>
-        /// Makes a clone of the geometry with the specified transform.
-        /// </summary>
-        /// <param name="transform">The transform.</param>
-        /// <returns>The cloned geometry.</returns>
-        ITransformedGeometryImpl WithTransform(Matrix transform);
-
-        /// <summary>
-        /// Attempts to get the corresponding point at the
-        /// specified distance
-        /// </summary>
-        /// <param name="distance">The contour distance to get from.</param>
-        /// <param name="point">The point in the specified distance.</param>
-        /// <returns>If there's valid point at the specified distance.</returns>
-        bool TryGetPointAtDistance(double distance, out Point point);
-
-        /// <summary>
-        /// Attempts to get the corresponding point and
-        /// tangent from the specified distance along the
-        /// contour of the geometry.
-        /// </summary>
-        /// <param name="distance">The contour distance to get from.</param>
-        /// <param name="point">The point in the specified distance.</param>
-        /// <param name="tangent">The tangent in the specified distance.</param>
-        /// <returns>If there's valid point and tangent at the specified distance.</returns>
-        bool TryGetPointAndTangentAtDistance(double distance, out Point point, out Point tangent);
-        
-        /// <summary>
-        /// Attempts to get the corresponding path segment
-        /// given by the two distances specified.
-        /// Imagine it like snipping a part of the current
-        /// geometry.
-        /// </summary>
-        /// <param name="startDistance">The contour distance to start snipping from.</param>
-        /// <param name="stopDistance">The contour distance to stop snipping to.</param>
-        /// <param name="startOnBeginFigure">If ture, the resulting snipped path will start with a BeginFigure call.</param>
-        /// <param name="segmentGeometry">The resulting snipped path.</param>
-        /// <returns>If the snipping operation is successful.</returns>
-        bool TryGetSegment(double startDistance, double stopDistance, bool startOnBeginFigure, out IGeometryImpl segmentGeometry);
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IGlyphRunImpl.cs b/src/Avalonia.Visuals/Platform/IGlyphRunImpl.cs
deleted file mode 100644
index 08786d9689..0000000000
--- a/src/Avalonia.Visuals/Platform/IGlyphRunImpl.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    ///     Actual implementation of a glyph run that stores platform dependent resources.
-    /// </summary>
-    public interface IGlyphRunImpl : IDisposable { }
-}
diff --git a/src/Avalonia.Visuals/Platform/IGlyphTypefaceImpl.cs b/src/Avalonia.Visuals/Platform/IGlyphTypefaceImpl.cs
deleted file mode 100644
index 6afd79d29c..0000000000
--- a/src/Avalonia.Visuals/Platform/IGlyphTypefaceImpl.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-
-namespace Avalonia.Platform
-{
-    public interface IGlyphTypefaceImpl : IDisposable
-    {
-        /// <summary>
-        ///     Gets the font design units per em.
-        /// </summary>
-        short DesignEmHeight { get; }
-
-        /// <summary>
-        ///     Gets the recommended distance above the baseline in design em size. 
-        /// </summary>
-        int Ascent { get; }
-
-        /// <summary>
-        ///     Gets the recommended distance under the baseline in design em size. 
-        /// </summary>
-        int Descent { get; }
-
-        /// <summary>
-        ///      Gets the recommended additional space between two lines of text in design em size. 
-        /// </summary>
-        int LineGap { get; }
-
-        /// <summary>
-        ///     Gets a value that indicates the distance of the underline from the baseline in design em size.
-        /// </summary>
-        int UnderlinePosition { get; }
-
-        /// <summary>
-        ///     Gets a value that indicates the thickness of the underline in design em size.
-        /// </summary>
-        int UnderlineThickness { get; }
-
-        /// <summary>
-        ///     Gets a value that indicates the distance of the strikethrough from the baseline in design em size.
-        /// </summary>
-        int StrikethroughPosition { get; }
-
-        /// <summary>
-        ///     Gets a value that indicates the thickness of the underline in design em size.
-        /// </summary>
-        int StrikethroughThickness { get; }
-
-        /// <summary>
-        ///     A <see cref="bool"/> value indicating whether all glyphs in the font have the same advancement. 
-        /// </summary>
-        bool IsFixedPitch { get; }
-
-        /// <summary>
-        ///     Returns an glyph index for the specified codepoint.
-        /// </summary>
-        /// <remarks>
-        ///     Returns <c>0</c> if a glyph isn't found.
-        /// </remarks>
-        /// <param name="codepoint">The codepoint.</param>
-        /// <returns>
-        ///     A glyph index.
-        /// </returns>
-        ushort GetGlyph(uint codepoint);
-
-        /// <summary>
-        ///     Returns an array of glyph indices. Codepoints that are not represented by the font are returned as <code>0</code>.
-        /// </summary>
-        /// <param name="codepoints">The codepoints to map.</param>
-        /// <returns>
-        ///     An array of glyph indices.
-        /// </returns>
-        ushort[] GetGlyphs(ReadOnlySpan<uint> codepoints);
-
-        /// <summary>
-        ///     Returns the glyph advance for the specified glyph.
-        /// </summary>
-        /// <param name="glyph">The glyph.</param>
-        /// <returns>
-        ///     The advance.
-        /// </returns>
-        int GetGlyphAdvance(ushort glyph);
-
-        /// <summary>
-        ///     Returns an array of glyph advances in design em size.
-        /// </summary>
-        /// <param name="glyphs">The glyph indices.</param>
-        /// <returns>
-        ///     An array of glyph advances.
-        /// </returns>
-        int[] GetGlyphAdvances(ReadOnlySpan<ushort> glyphs);
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
deleted file mode 100644
index a295a8cdc9..0000000000
--- a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Avalonia.Media;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the main platform-specific interface for the rendering subsystem.
-    /// </summary>
-    public interface IPlatformRenderInterface
-    {
-        /// Creates an ellipse geometry implementation.
-        /// </summary>
-        /// <param name="rect">The bounds of the ellipse.</param>
-        /// <returns>An ellipse geometry..</returns>
-        IGeometryImpl CreateEllipseGeometry(Rect rect);
-
-        /// <summary>
-        /// Creates a line geometry implementation.
-        /// </summary>
-        /// <param name="p1">The start of the line.</param>
-        /// <param name="p2">The end of the line.</param>
-        /// <returns>A line geometry.</returns>
-        IGeometryImpl CreateLineGeometry(Point p1, Point p2);
-
-        /// <summary>
-        /// Creates a rectangle geometry implementation.
-        /// </summary>
-        /// <param name="rect">The bounds of the rectangle.</param>
-        /// <returns>A rectangle.</returns>
-        IGeometryImpl CreateRectangleGeometry(Rect rect);
-
-        /// <summary>
-        /// Creates a stream geometry implementation.
-        /// </summary>
-        /// <returns>An <see cref="IStreamGeometryImpl"/>.</returns>
-        IStreamGeometryImpl CreateStreamGeometry();
-
-        /// <summary>
-        /// Creates a geometry group implementation.
-        /// </summary>
-        /// <param name="fillRule">The fill rule.</param>
-        /// <param name="children">The geometries to group.</param>
-        /// <returns>A combined geometry.</returns>
-        IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children);
-
-        /// <summary>
-        /// Creates a geometry group implementation.
-        /// </summary>
-        /// <param name="combineMode">The combine mode</param>
-        /// <param name="g1">The first geometry.</param>
-        /// <param name="g2">The second geometry.</param>
-        /// <returns>A combined geometry.</returns>
-        IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2);
-
-        /// <summary>
-        /// Creates a renderer.
-        /// </summary>
-        /// <param name="surfaces">
-        /// The list of native platform surfaces that can be used for output.
-        /// </param>
-        /// <returns>An <see cref="IRenderTarget"/>.</returns>
-        IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces);
-
-        /// <summary>
-        /// Creates a render target bitmap implementation.
-        /// </summary>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <returns>An <see cref="IRenderTargetBitmapImpl"/>.</returns>
-        IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi);
-
-        /// <summary>
-        /// Creates a writeable bitmap implementation.
-        /// </summary>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <param name="format">Pixel format.</param>
-        /// <param name="alphaFormat">Alpha format .</param>
-        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
-        IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat format, AlphaFormat alphaFormat);
-
-        /// <summary>
-        /// Loads a bitmap implementation from a file..
-        /// </summary>
-        /// <param name="fileName">The filename of the bitmap.</param>        
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IBitmapImpl LoadBitmap(string fileName);
-
-        /// <summary>
-        /// Loads a bitmap implementation from a file..
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param>        
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IBitmapImpl LoadBitmap(Stream stream);
-
-        /// <summary>
-        /// Loads a WriteableBitmap implementation from a stream to a specified width maintaining aspect ratio.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param> 
-        /// <param name="width">The desired width of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
-        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
-        IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
-
-        /// <summary>
-        /// Loads a WriteableBitmap implementation from a stream to a specified height maintaining aspect ratio.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param> 
-        /// <param name="height">The desired height of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
-        
-        /// <summary>
-        /// Loads a WriteableBitmap implementation from a file.
-        /// </summary>
-        /// <param name="fileName">The filename of the bitmap.</param>        
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IWriteableBitmapImpl LoadWriteableBitmap(string fileName);
-
-        /// <summary>
-        /// Loads a WriteableBitmap implementation from a file.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param>        
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IWriteableBitmapImpl LoadWriteableBitmap(Stream stream);
-
-        /// <summary>
-        /// Loads a bitmap implementation from a stream to a specified width maintaining aspect ratio.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param> 
-        /// <param name="width">The desired width of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
-
-        /// <summary>
-        /// Loads a bitmap implementation from a stream to a specified height maintaining aspect ratio.
-        /// </summary>
-        /// <param name="stream">The stream to read the bitmap from.</param> 
-        /// <param name="height">The desired height of the resulting bitmap.</param>
-        /// <param name="interpolationMode">The <see cref="BitmapInterpolationMode"/> to use should resizing be required.</param>
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IBitmapImpl LoadBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
-
-        IBitmapImpl ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
-
-        /// <summary>
-        /// Loads a bitmap implementation from a pixels in memory.
-        /// </summary>
-        /// <param name="format">The pixel format.</param>
-        /// <param name="alphaFormat">The alpha format.</param>
-        /// <param name="data">The pointer to source bytes.</param>
-        /// <param name="size">The size of the bitmap in device pixels.</param>
-        /// <param name="dpi">The DPI of the bitmap.</param>
-        /// <param name="stride">The number of bytes per row.</param>
-        /// <returns>An <see cref="IBitmapImpl"/>.</returns>
-        IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride);
-
-        /// <summary>
-        /// Creates a platform implementation of a glyph run.
-        /// </summary>
-        /// <param name="glyphRun">The glyph run.</param>
-        /// <returns></returns>
-        IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun);
-
-        bool SupportsIndividualRoundRects { get; }
-
-        /// <summary>
-        /// Default <see cref="AlphaFormat"/> used on this platform.
-        /// </summary>
-        public AlphaFormat DefaultAlphaFormat { get; }
-
-        /// <summary>
-        /// Default <see cref="PixelFormat"/> used on this platform.
-        /// </summary>
-        public PixelFormat DefaultPixelFormat { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IPlatformSettings.cs b/src/Avalonia.Visuals/Platform/IPlatformSettings.cs
deleted file mode 100644
index e4b28e6575..0000000000
--- a/src/Avalonia.Visuals/Platform/IPlatformSettings.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-
-namespace Avalonia.Platform
-{
-    public interface IPlatformSettings
-    {
-        Size DoubleClickSize { get; }
-
-        TimeSpan DoubleClickTime { get; }
-
-        /// <summary>
-        /// Determines the size of the area within that you should click twice in order for a double click to be counted.
-        /// </summary>
-        Size TouchDoubleClickSize { get; }
-
-        /// <summary>
-        /// Determines the time span that what will be used to determine the double-click.
-        /// </summary>
-        TimeSpan TouchDoubleClickTime { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IRenderTargetBitmapImpl.cs b/src/Avalonia.Visuals/Platform/IRenderTargetBitmapImpl.cs
deleted file mode 100644
index 9add07afe3..0000000000
--- a/src/Avalonia.Visuals/Platform/IRenderTargetBitmapImpl.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a
-    /// <see cref="Avalonia.Media.Imaging.RenderTargetBitmap"/>.
-    /// </summary>
-    public interface IRenderTargetBitmapImpl : IBitmapImpl, IRenderTarget
-    {
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IStreamGeometryContextImpl.cs b/src/Avalonia.Visuals/Platform/IStreamGeometryContextImpl.cs
deleted file mode 100644
index 4587979308..0000000000
--- a/src/Avalonia.Visuals/Platform/IStreamGeometryContextImpl.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Describes a geometry using drawing commands.
-    /// </summary>
-    public interface IStreamGeometryContextImpl : IGeometryContext
-    {      
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IStreamGeometryImpl.cs b/src/Avalonia.Visuals/Platform/IStreamGeometryImpl.cs
deleted file mode 100644
index 5b070fde02..0000000000
--- a/src/Avalonia.Visuals/Platform/IStreamGeometryImpl.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.StreamGeometry"/>.
-    /// </summary>
-    public interface IStreamGeometryImpl : IGeometryImpl
-    {
-        /// <summary>
-        /// Clones the geometry.
-        /// </summary>
-        /// <returns>A cloned geometry.</returns>
-        IStreamGeometryImpl Clone();
-
-        /// <summary>
-        /// Opens the geometry to start defining it.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="IStreamGeometryContextImpl"/> which can be used to define the geometry.
-        /// </returns>
-        IStreamGeometryContextImpl Open();
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/ITextShaperImpl.cs b/src/Avalonia.Visuals/Platform/ITextShaperImpl.cs
deleted file mode 100644
index aced05c9d8..0000000000
--- a/src/Avalonia.Visuals/Platform/ITextShaperImpl.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Globalization;
-using Avalonia.Media;
-using Avalonia.Media.TextFormatting;
-using Avalonia.Utilities;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// An abstraction that is used produce shaped text.
-    /// </summary>
-    public interface ITextShaperImpl
-    {
-        /// <summary>
-        /// Shapes the specified region within the text and returns a shaped buffer.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        /// <param name="typeface">The typeface.</param>
-        /// <param name="fontRenderingEmSize">The font rendering em size.</param>
-        /// <param name="culture">The culture.</param>
-        /// <param name="bidiLevel">The bidi level.</param>
-        /// <returns>A shaped glyph run.</returns>
-        ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize, CultureInfo? culture, sbyte bidiLevel);
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/ITransformedGeometryImpl.cs b/src/Avalonia.Visuals/Platform/ITransformedGeometryImpl.cs
deleted file mode 100644
index 1ed025b571..0000000000
--- a/src/Avalonia.Visuals/Platform/ITransformedGeometryImpl.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Represents a geometry with a transform applied.
-    /// </summary>
-    /// <remarks>
-    /// An <see cref="ITransformedGeometryImpl"/> transforms a geometry without transforming its
-    /// stroke thickness.
-    /// </remarks>
-    public interface ITransformedGeometryImpl : IGeometryImpl
-    {
-        /// <summary>
-        /// Gets the source geometry that the <see cref="Transform"/> is applied to.
-        /// </summary>
-        IGeometryImpl SourceGeometry { get; }
-
-        /// <summary>
-        /// Gets the applied transform.
-        /// </summary>
-        Matrix Transform { get; }
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IWriteableBitmapImpl.cs b/src/Avalonia.Visuals/Platform/IWriteableBitmapImpl.cs
deleted file mode 100644
index c4e2e4915f..0000000000
--- a/src/Avalonia.Visuals/Platform/IWriteableBitmapImpl.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.Imaging.WriteableBitmap"/>.
-    /// </summary>
-    public interface IWriteableBitmapImpl : IBitmapImpl
-    {
-        ILockedFramebuffer Lock();
-    }
-}
diff --git a/src/Avalonia.Visuals/Point.cs b/src/Avalonia.Visuals/Point.cs
deleted file mode 100644
index 67e7d71fbc..0000000000
--- a/src/Avalonia.Visuals/Point.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-using System;
-using System.Globalization;
-#if !BUILDTASK
-using Avalonia.Animation.Animators;
-#endif
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Defines a point.
-    /// </summary>
-#if !BUILDTASK
-    public
-#endif
-    readonly struct Point : IEquatable<Point>
-    {
-        static Point()
-        {
-#if !BUILDTASK
-            Animation.Animation.RegisterAnimator<PointAnimator>(prop => typeof(Point).IsAssignableFrom(prop.PropertyType));
-#endif
-        }
-
-        /// <summary>
-        /// The X position.
-        /// </summary>
-        private readonly double _x;
-
-        /// <summary>
-        /// The Y position.
-        /// </summary>
-        private readonly double _y;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Point"/> structure.
-        /// </summary>
-        /// <param name="x">The X position.</param>
-        /// <param name="y">The Y position.</param>
-        public Point(double x, double y)
-        {
-            _x = x;
-            _y = y;
-        }
-
-        /// <summary>
-        /// Gets the X position.
-        /// </summary>
-        public double X => _x;
-
-        /// <summary>
-        /// Gets the Y position.
-        /// </summary>
-        public double Y => _y;
-
-        /// <summary>
-        /// Converts the <see cref="Point"/> to a <see cref="Vector"/>.
-        /// </summary>
-        /// <param name="p">The point.</param>
-        public static implicit operator Vector(Point p)
-        {
-            return new Vector(p._x, p._y);
-        }
-
-        /// <summary>
-        /// Negates a point.
-        /// </summary>
-        /// <param name="a">The point.</param>
-        /// <returns>The negated point.</returns>
-        public static Point operator -(Point a)
-        {
-            return new Point(-a._x, -a._y);
-        }
-
-        /// <summary>
-        /// Checks for equality between two <see cref="Point"/>s.
-        /// </summary>
-        /// <param name="left">The first point.</param>
-        /// <param name="right">The second point.</param>
-        /// <returns>True if the points are equal; otherwise false.</returns>
-        public static bool operator ==(Point left, Point right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Checks for inequality between two <see cref="Point"/>s.
-        /// </summary>
-        /// <param name="left">The first point.</param>
-        /// <param name="right">The second point.</param>
-        /// <returns>True if the points are unequal; otherwise false.</returns>
-        public static bool operator !=(Point left, Point right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Adds two points.
-        /// </summary>
-        /// <param name="a">The first point.</param>
-        /// <param name="b">The second point.</param>
-        /// <returns>A point that is the result of the addition.</returns>
-        public static Point operator +(Point a, Point b)
-        {
-            return new Point(a._x + b._x, a._y + b._y);
-        }
-
-        /// <summary>
-        /// Adds a vector to a point.
-        /// </summary>
-        /// <param name="a">The point.</param>
-        /// <param name="b">The vector.</param>
-        /// <returns>A point that is the result of the addition.</returns>
-        public static Point operator +(Point a, Vector b)
-        {
-            return new Point(a._x + b.X, a._y + b.Y);
-        }
-
-        /// <summary>
-        /// Subtracts two points.
-        /// </summary>
-        /// <param name="a">The first point.</param>
-        /// <param name="b">The second point.</param>
-        /// <returns>A point that is the result of the subtraction.</returns>
-        public static Point operator -(Point a, Point b)
-        {
-            return new Point(a._x - b._x, a._y - b._y);
-        }
-
-        /// <summary>
-        /// Subtracts a vector from a point.
-        /// </summary>
-        /// <param name="a">The point.</param>
-        /// <param name="b">The vector.</param>
-        /// <returns>A point that is the result of the subtraction.</returns>
-        public static Point operator -(Point a, Vector b)
-        {
-            return new Point(a._x - b.X, a._y - b.Y);
-        }
-
-        /// <summary>
-        /// Multiplies a point by a factor coordinate-wise
-        /// </summary>
-        /// <param name="p">Point to multiply</param>
-        /// <param name="k">Factor</param>
-        /// <returns>Points having its coordinates multiplied</returns>
-        public static Point operator *(Point p, double k) => new Point(p.X * k, p.Y * k);
-
-        /// <summary>
-        /// Multiplies a point by a factor coordinate-wise
-        /// </summary>
-        /// <param name="p">Point to multiply</param>
-        /// <param name="k">Factor</param>
-        /// <returns>Points having its coordinates multiplied</returns>
-        public static Point operator *(double k, Point p) => new Point(p.X * k, p.Y * k);
-
-        /// <summary>
-        /// Divides a point by a factor coordinate-wise
-        /// </summary>
-        /// <param name="p">Point to divide by</param>
-        /// <param name="k">Factor</param>
-        /// <returns>Points having its coordinates divided</returns>
-        public static Point operator /(Point p, double k) => new Point(p.X / k, p.Y / k);
-
-        /// <summary>
-        /// Applies a matrix to a point.
-        /// </summary>
-        /// <param name="point">The point.</param>
-        /// <param name="matrix">The matrix.</param>
-        /// <returns>The resulting point.</returns>
-        public static Point operator *(Point point, Matrix matrix)
-        {
-            return new Point(
-                (point.X * matrix.M11) + (point.Y * matrix.M21) + matrix.M31,
-                (point.X * matrix.M12) + (point.Y * matrix.M22) + matrix.M32);
-        }
-
-        /// <summary>
-        /// Parses a <see cref="Point"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The <see cref="Point"/>.</returns>
-        public static Point Parse(string s)
-        {
-            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Point."))
-            {
-                return new Point(
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble()
-                );
-            }
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the point is equal to the other given point.
-        /// </summary>
-        /// <param name="other">The other point to test equality against.</param>
-        /// <returns>True if this point is equal to other; False otherwise.</returns>
-        public bool Equals(Point other)
-        {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
-            return _x == other._x &&
-                   _y == other._y;
-            // ReSharper enable CompareOfFloatsByEqualityOperator
-        }
-
-        /// <summary>
-        /// Checks for equality between a point and an object.
-        /// </summary>
-        /// <param name="obj">The object.</param>
-        /// <returns>
-        /// True if <paramref name="obj"/> is a point that equals the current point.
-        /// </returns>
-        public override bool Equals(object? obj) => obj is Point other && Equals(other);
-
-        /// <summary>
-        /// Returns a hash code for a <see cref="Point"/>.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hash = 17;
-                hash = (hash * 23) + _x.GetHashCode();
-                hash = (hash * 23) + _y.GetHashCode();
-                return hash;
-            }
-        }
-
-        /// <summary>
-        /// Returns the string representation of the point.
-        /// </summary>
-        /// <returns>The string representation of the point.</returns>
-        public override string ToString()
-        {
-            return string.Format(CultureInfo.InvariantCulture, "{0}, {1}", _x, _y);
-        }
-
-        /// <summary>
-        /// Transforms the point by a matrix.
-        /// </summary>
-        /// <param name="transform">The transform.</param>
-        /// <returns>The transformed point.</returns>
-        public Point Transform(Matrix transform)
-        {
-            var x = X;
-            var y = Y;
-            var xadd = y * transform.M21 + transform.M31;
-            var yadd = x * transform.M12 + transform.M32;
-            x *= transform.M11;
-            x += xadd;
-            y *= transform.M22;
-            y += yadd;
-            return new Point(x, y);
-        }
-
-        /// <summary>
-        /// Returns a new point with the specified X coordinate.
-        /// </summary>
-        /// <param name="x">The X coordinate.</param>
-        /// <returns>The new point.</returns>
-        public Point WithX(double x)
-        {
-            return new Point(x, _y);
-        }
-
-        /// <summary>
-        /// Returns a new point with the specified Y coordinate.
-        /// </summary>
-        /// <param name="y">The Y coordinate.</param>
-        /// <returns>The new point.</returns>
-        public Point WithY(double y)
-        {
-            return new Point(_x, y);
-        }
-
-        /// <summary>
-        /// Deconstructs the point into its X and Y coordinates.
-        /// </summary>
-        /// <param name="x">The X coordinate.</param>
-        /// <param name="y">The Y coordinate.</param>
-        public void Deconstruct(out double x, out double y)
-        {
-            x = this._x;
-            y = this._y;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the X and Y coordinates are zero.
-        /// </summary>
-        public bool IsDefault
-        {
-            get { return (_x == 0) && (_y == 0); }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Properties/AssemblyInfo.cs b/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
deleted file mode 100644
index ebff097199..0000000000
--- a/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Runtime.CompilerServices;
-using Avalonia.Metadata;
-
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media.Imaging")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media.Transformation")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
-
-[assembly: InternalsVisibleTo("Avalonia.Visuals.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Web.Blazor,  PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
diff --git a/src/Avalonia.Visuals/Rect.cs b/src/Avalonia.Visuals/Rect.cs
deleted file mode 100644
index 6d7d6c2e54..0000000000
--- a/src/Avalonia.Visuals/Rect.cs
+++ /dev/null
@@ -1,576 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Animation.Animators;
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Defines a rectangle.
-    /// </summary>
-    public readonly struct Rect : IEquatable<Rect>
-    {
-        static Rect()
-        {
-            Animation.Animation.RegisterAnimator<RectAnimator>(prop => typeof(Rect).IsAssignableFrom(prop.PropertyType));
-        }
-
-        /// <summary>
-        /// An empty rectangle.
-        /// </summary>
-        public static readonly Rect Empty = default(Rect);
-
-        /// <summary>
-        /// The X position.
-        /// </summary>
-        private readonly double _x;
-
-        /// <summary>
-        /// The Y position.
-        /// </summary>
-        private readonly double _y;
-
-        /// <summary>
-        /// The width.
-        /// </summary>
-        private readonly double _width;
-
-        /// <summary>
-        /// The height.
-        /// </summary>
-        private readonly double _height;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rect"/> structure.
-        /// </summary>
-        /// <param name="x">The X position.</param>
-        /// <param name="y">The Y position.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        public Rect(double x, double y, double width, double height)
-        {
-            _x = x;
-            _y = y;
-            _width = width;
-            _height = height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rect"/> structure.
-        /// </summary>
-        /// <param name="size">The size of the rectangle.</param>
-        public Rect(Size size)
-        {
-            _x = 0;
-            _y = 0;
-            _width = size.Width;
-            _height = size.Height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rect"/> structure.
-        /// </summary>
-        /// <param name="position">The position of the rectangle.</param>
-        /// <param name="size">The size of the rectangle.</param>
-        public Rect(Point position, Size size)
-        {
-            _x = position.X;
-            _y = position.Y;
-            _width = size.Width;
-            _height = size.Height;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rect"/> structure.
-        /// </summary>
-        /// <param name="topLeft">The top left position of the rectangle.</param>
-        /// <param name="bottomRight">The bottom right position of the rectangle.</param>
-        public Rect(Point topLeft, Point bottomRight)
-        {
-            _x = topLeft.X;
-            _y = topLeft.Y;
-            _width = bottomRight.X - topLeft.X;
-            _height = bottomRight.Y - topLeft.Y;
-        }
-
-        /// <summary>
-        /// Gets the X position.
-        /// </summary>
-        public double X => _x;
-
-        /// <summary>
-        /// Gets the Y position.
-        /// </summary>
-        public double Y => _y;
-
-        /// <summary>
-        /// Gets the width.
-        /// </summary>
-        public double Width => _width;
-
-        /// <summary>
-        /// Gets the height.
-        /// </summary>
-        public double Height => _height;
-
-        /// <summary>
-        /// Gets the position of the rectangle.
-        /// </summary>
-        public Point Position => new Point(_x, _y);
-
-        /// <summary>
-        /// Gets the size of the rectangle.
-        /// </summary>
-        public Size Size => new Size(_width, _height);
-
-        /// <summary>
-        /// Gets the right position of the rectangle.
-        /// </summary>
-        public double Right => _x + _width;
-
-        /// <summary>
-        /// Gets the bottom position of the rectangle.
-        /// </summary>
-        public double Bottom => _y + _height;
-        
-        /// <summary>
-        /// Gets the left position.
-        /// </summary>
-        public double Left => _x;
-
-        /// <summary>
-        /// Gets the top position.
-        /// </summary>
-        public double Top => _y;
-
-        /// <summary>
-        /// Gets the top left point of the rectangle.
-        /// </summary>
-        public Point TopLeft => new Point(_x, _y);
-
-        /// <summary>
-        /// Gets the top right point of the rectangle.
-        /// </summary>
-        public Point TopRight => new Point(Right, _y);
-
-        /// <summary>
-        /// Gets the bottom left point of the rectangle.
-        /// </summary>
-        public Point BottomLeft => new Point(_x, Bottom);
-
-        /// <summary>
-        /// Gets the bottom right point of the rectangle.
-        /// </summary>
-        public Point BottomRight => new Point(Right, Bottom);
-
-        /// <summary>
-        /// Gets the center point of the rectangle.
-        /// </summary>
-        public Point Center => new Point(_x + (_width / 2), _y + (_height / 2));
-
-        /// <summary>
-        /// Gets a value that indicates whether the rectangle is empty.
-        /// </summary>
-        // ReSharper disable CompareOfFloatsByEqualityOperator
-        public bool IsEmpty => _width == 0 && _height == 0;
-        // ReSharper restore CompareOfFloatsByEqualityOperator
-
-        /// <summary>
-        /// Checks for equality between two <see cref="Rect"/>s.
-        /// </summary>
-        /// <param name="left">The first rect.</param>
-        /// <param name="right">The second rect.</param>
-        /// <returns>True if the rects are equal; otherwise false.</returns>
-        public static bool operator ==(Rect left, Rect right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Checks for inequality between two <see cref="Rect"/>s.
-        /// </summary>
-        /// <param name="left">The first rect.</param>
-        /// <param name="right">The second rect.</param>
-        /// <returns>True if the rects are unequal; otherwise false.</returns>
-        public static bool operator !=(Rect left, Rect right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Multiplies a rectangle by a scaling vector.
-        /// </summary>
-        /// <param name="rect">The rectangle.</param>
-        /// <param name="scale">The vector scale.</param>
-        /// <returns>The scaled rectangle.</returns>
-        public static Rect operator *(Rect rect, Vector scale)
-        {
-            return new Rect(
-                rect.X * scale.X,
-                rect.Y * scale.Y,
-                rect.Width * scale.X,
-                rect.Height * scale.Y);
-        }
-        
-        /// <summary>
-        /// Multiplies a rectangle by a scale.
-        /// </summary>
-        /// <param name="rect">The rectangle.</param>
-        /// <param name="scale">The scale.</param>
-        /// <returns>The scaled rectangle.</returns>
-        public static Rect operator *(Rect rect, double scale)
-        {
-            return new Rect(
-                rect.X * scale,
-                rect.Y * scale,
-                rect.Width * scale,
-                rect.Height * scale);
-        }
-
-        /// <summary>
-        /// Divides a rectangle by a vector.
-        /// </summary>
-        /// <param name="rect">The rectangle.</param>
-        /// <param name="scale">The vector scale.</param>
-        /// <returns>The scaled rectangle.</returns>
-        public static Rect operator /(Rect rect, Vector scale)
-        {
-            return new Rect(
-                rect.X / scale.X, 
-                rect.Y / scale.Y, 
-                rect.Width / scale.X, 
-                rect.Height / scale.Y);
-        }
-
-        /// <summary>
-        /// Determines whether a point in in the bounds of the rectangle.
-        /// </summary>
-        /// <param name="p">The point.</param>
-        /// <returns>true if the point is in the bounds of the rectangle; otherwise false.</returns>
-        public bool Contains(Point p)
-        {
-            return p.X >= _x && p.X <= _x + _width &&
-                   p.Y >= _y && p.Y <= _y + _height;
-        }
-
-        /// <summary>
-        /// Determines whether the rectangle fully contains another rectangle.
-        /// </summary>
-        /// <param name="r">The rectangle.</param>
-        /// <returns>true if the rectangle is fully contained; otherwise false.</returns>
-        public bool Contains(Rect r)
-        {
-            return Contains(r.TopLeft) && Contains(r.BottomRight);
-        }
-
-        /// <summary>
-        /// Centers another rectangle in this rectangle.
-        /// </summary>
-        /// <param name="rect">The rectangle to center.</param>
-        /// <returns>The centered rectangle.</returns>
-        public Rect CenterRect(Rect rect)
-        {
-            return new Rect(
-                _x + ((_width - rect._width) / 2),
-                _y + ((_height - rect._height) / 2),
-                rect._width,
-                rect._height);
-        }
-
-        /// <summary>
-        /// Inflates the rectangle.
-        /// </summary>
-        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
-        /// <returns>The inflated rectangle.</returns>
-        public Rect Inflate(double thickness)
-        {
-            return Inflate(new Thickness(thickness));
-        }
-
-        /// <summary>
-        /// Inflates the rectangle.
-        /// </summary>
-        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
-        /// <returns>The inflated rectangle.</returns>
-        public Rect Inflate(Thickness thickness)
-        {
-            return new Rect(
-                new Point(_x - thickness.Left, _y - thickness.Top),
-                Size.Inflate(thickness));
-        }
-
-        /// <summary>
-        /// Deflates the rectangle.
-        /// </summary>
-        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
-        /// <returns>The deflated rectangle.</returns>
-        public Rect Deflate(double thickness)
-        {
-            return Deflate(new Thickness(thickness));
-        }
-
-        /// <summary>
-        /// Deflates the rectangle by a <see cref="Thickness"/>.
-        /// </summary>
-        /// <param name="thickness">The thickness to be subtracted for each side of the rectangle.</param>
-        /// <returns>The deflated rectangle.</returns>
-        public Rect Deflate(Thickness thickness)
-        {
-            return new Rect(
-                new Point(_x + thickness.Left, _y + thickness.Top),
-                Size.Deflate(thickness));
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the rect is equal to the other given rect.
-        /// </summary>
-        /// <param name="other">The other rect to test equality against.</param>
-        /// <returns>True if this rect is equal to other; False otherwise.</returns>
-        public bool Equals(Rect other)
-        {
-            // ReSharper disable CompareOfFloatsByEqualityOperator
-            return _x == other._x &&
-                   _y == other._y &&
-                   _width == other._width &&
-                   _height == other._height;
-            // ReSharper enable CompareOfFloatsByEqualityOperator
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the given object is equal to this rectangle.
-        /// </summary>
-        /// <param name="obj">The object to compare against.</param>
-        /// <returns>True if the object is equal to this rectangle; false otherwise.</returns>
-        public override bool Equals(object? obj) => obj is Rect other && Equals(other);
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hash = 17;
-                hash = (hash * 23) + X.GetHashCode();
-                hash = (hash * 23) + Y.GetHashCode();
-                hash = (hash * 23) + Width.GetHashCode();
-                hash = (hash * 23) + Height.GetHashCode();
-                return hash;
-            }
-        }
-
-        /// <summary>
-        /// Gets the intersection of two rectangles.
-        /// </summary>
-        /// <param name="rect">The other rectangle.</param>
-        /// <returns>The intersection.</returns>
-        public Rect Intersect(Rect rect)
-        {
-            var newLeft = (rect.X > X) ? rect.X : X;
-            var newTop = (rect.Y > Y) ? rect.Y : Y;
-            var newRight = (rect.Right < Right) ? rect.Right : Right;
-            var newBottom = (rect.Bottom < Bottom) ? rect.Bottom : Bottom;
-
-            if ((newRight > newLeft) && (newBottom > newTop))
-            {
-                return new Rect(newLeft, newTop, newRight - newLeft, newBottom - newTop);
-            }
-            else
-            {
-                return Empty;
-            }
-        }
-
-        /// <summary>
-        /// Determines whether a rectangle intersects with this rectangle.
-        /// </summary>
-        /// <param name="rect">The other rectangle.</param>
-        /// <returns>
-        /// True if the specified rectangle intersects with this one; otherwise false.
-        /// </returns>
-        public bool Intersects(Rect rect)
-        {
-            return (rect.X < Right) && (X < rect.Right) && (rect.Y < Bottom) && (Y < rect.Bottom);
-        }
-
-        /// <summary>
-        /// Returns the axis-aligned bounding box of a transformed rectangle.
-        /// </summary>
-        /// <param name="matrix">The transform.</param>
-        /// <returns>The bounding box</returns>
-        public Rect TransformToAABB(Matrix matrix)
-        {
-            ReadOnlySpan<Point> points = stackalloc Point[4]
-            {
-                TopLeft.Transform(matrix),
-                TopRight.Transform(matrix),
-                BottomRight.Transform(matrix),
-                BottomLeft.Transform(matrix)
-            };
-
-            var left = double.MaxValue;
-            var right = double.MinValue;
-            var top = double.MaxValue;
-            var bottom = double.MinValue;
-
-            foreach (var p in points)
-            {
-                if (p.X < left) left = p.X;
-                if (p.X > right) right = p.X;
-                if (p.Y < top) top = p.Y;
-                if (p.Y > bottom) bottom = p.Y;
-            }
-
-            return new Rect(new Point(left, top), new Point(right, bottom));
-        }
-
-        /// <summary>
-        /// Translates the rectangle by an offset.
-        /// </summary>
-        /// <param name="offset">The offset.</param>
-        /// <returns>The translated rectangle.</returns>
-        public Rect Translate(Vector offset)
-        {
-            return new Rect(Position + offset, Size);
-        }
-
-        /// <summary>
-		/// Normalizes the rectangle so both the <see cref="Width"/> and <see 
-        /// cref="Height"/> are positive, without changing the location of the rectangle
-		/// </summary>
-        /// <returns>Normalized Rect</returns>
-		/// <remarks>
-		/// Empty rect will be return when Rect contains invalid values. Like NaN.
-		/// </remarks>
-		public Rect Normalize()
-        {
-            Rect rect = this;            
-
-            if(double.IsNaN(rect.Right) || double.IsNaN(rect.Bottom) || 
-                double.IsNaN(rect.X) || double.IsNaN(rect.Y) || 
-                double.IsNaN(Height) || double.IsNaN(Width))
-            {
-                return Rect.Empty;
-            }
-
-            if (rect.Width < 0)
-            {
-                var x = X + Width;
-                var width = X - x;
-
-                rect = rect.WithX(x).WithWidth(width);
-            }
-
-            if (rect.Height < 0)
-            {
-                var y = Y + Height;
-                var height = Y - y;
-
-                rect = rect.WithY(y).WithHeight(height);
-            }
-
-            return rect;
-        }
-
-
-            /// <summary>
-            /// Gets the union of two rectangles.
-            /// </summary>
-            /// <param name="rect">The other rectangle.</param>
-            /// <returns>The union.</returns>
-            public Rect Union(Rect rect)
-        {
-            if (IsEmpty)
-            {
-                return rect;
-            }
-            else if (rect.IsEmpty)
-            {
-                return this;
-            }
-            else
-            {
-                var x1 = Math.Min(X, rect.X);
-                var x2 = Math.Max(Right, rect.Right);
-                var y1 = Math.Min(Y, rect.Y);
-                var y2 = Math.Max(Bottom, rect.Bottom);
-
-                return new Rect(new Point(x1, y1), new Point(x2, y2));
-            }
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="Rect"/> with the specified X position.
-        /// </summary>
-        /// <param name="x">The x position.</param>
-        /// <returns>The new <see cref="Rect"/>.</returns>
-        public Rect WithX(double x)
-        {
-            return new Rect(x, _y, _width, _height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="Rect"/> with the specified Y position.
-        /// </summary>
-        /// <param name="y">The y position.</param>
-        /// <returns>The new <see cref="Rect"/>.</returns>
-        public Rect WithY(double y)
-        {
-            return new Rect(_x, y, _width, _height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="Rect"/> with the specified width.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <returns>The new <see cref="Rect"/>.</returns>
-        public Rect WithWidth(double width)
-        {
-            return new Rect(_x, _y, width, _height);
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="Rect"/> with the specified height.
-        /// </summary>
-        /// <param name="height">The height.</param>
-        /// <returns>The new <see cref="Rect"/>.</returns>
-        public Rect WithHeight(double height)
-        {
-            return new Rect(_x, _y, _width, height);
-        }
-
-        /// <summary>
-        /// Returns the string representation of the rectangle.
-        /// </summary>
-        /// <returns>The string representation of the rectangle.</returns>
-        public override string ToString()
-        {
-            return string.Format(
-                CultureInfo.InvariantCulture,
-                "{0}, {1}, {2}, {3}",
-                _x,
-                _y,
-                _width,
-                _height);
-        }
-
-        /// <summary>
-        /// Parses a <see cref="Rect"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The parsed <see cref="Rect"/>.</returns>
-        public static Rect Parse(string s)
-        {
-            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Rect."))
-            {
-                return new Rect(
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble(),
-                    tokenizer.ReadDouble()
-                );
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/RelativePoint.cs b/src/Avalonia.Visuals/RelativePoint.cs
deleted file mode 100644
index 4550dbd54b..0000000000
--- a/src/Avalonia.Visuals/RelativePoint.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using System;
-using System.Globalization;
-
-using Avalonia.Animation.Animators;
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Defines the reference point units of an <see cref="RelativePoint"/> or 
-    /// <see cref="RelativeRect"/>.
-    /// </summary>
-    public enum RelativeUnit
-    {
-        /// <summary>
-        /// The point is expressed as a fraction of the containing element's size.
-        /// </summary>
-        Relative,
-
-        /// <summary>
-        /// The point is absolute (i.e. in pixels).
-        /// </summary>
-        Absolute,
-    }
-
-    /// <summary>
-    /// Defines a point that may be defined relative to a containing element.
-    /// </summary>
-    public readonly struct RelativePoint : IEquatable<RelativePoint>
-    {
-        /// <summary>
-        /// A point at the top left of the containing element.
-        /// </summary>
-        public static readonly RelativePoint TopLeft = new RelativePoint(0, 0, RelativeUnit.Relative);
-
-        /// <summary>
-        /// A point at the center of the containing element.
-        /// </summary>
-        public static readonly RelativePoint Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
-
-        /// <summary>
-        /// A point at the bottom right of the containing element.
-        /// </summary>
-        public static readonly RelativePoint BottomRight = new RelativePoint(1, 1, RelativeUnit.Relative);
-
-        private readonly Point _point;
-
-        private readonly RelativeUnit _unit;
-
-        static RelativePoint()
-        {
-            Animation.Animation.RegisterAnimator<RelativePointAnimator>(prop => typeof(RelativePoint).IsAssignableFrom(prop.PropertyType));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RelativePoint"/> struct.
-        /// </summary>
-        /// <param name="x">The X point.</param>
-        /// <param name="y">The Y point</param>
-        /// <param name="unit">The unit.</param>
-        public RelativePoint(double x, double y, RelativeUnit unit)
-            : this(new Point(x, y), unit)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RelativePoint"/> struct.
-        /// </summary>
-        /// <param name="point">The point.</param>
-        /// <param name="unit">The unit.</param>
-        public RelativePoint(Point point, RelativeUnit unit)
-        {
-            _point = point;
-            _unit = unit;
-        }
-
-        /// <summary>
-        /// Gets the point.
-        /// </summary>
-        public Point Point => _point;
-
-        /// <summary>
-        /// Gets the unit.
-        /// </summary>
-        public RelativeUnit Unit => _unit;
-
-        /// <summary>
-        /// Checks for equality between two <see cref="RelativePoint"/>s.
-        /// </summary>
-        /// <param name="left">The first point.</param>
-        /// <param name="right">The second point.</param>
-        /// <returns>True if the points are equal; otherwise false.</returns>
-        public static bool operator ==(RelativePoint left, RelativePoint right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Checks for inequality between two <see cref="RelativePoint"/>s.
-        /// </summary>
-        /// <param name="left">The first point.</param>
-        /// <param name="right">The second point.</param>
-        /// <returns>True if the points are unequal; otherwise false.</returns>
-        public static bool operator !=(RelativePoint left, RelativePoint right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <summary>
-        /// Checks if the <see cref="RelativePoint"/> equals another object.
-        /// </summary>
-        /// <param name="obj">The other object.</param>
-        /// <returns>True if the objects are equal, otherwise false.</returns>
-        public override bool Equals(object? obj) => obj is RelativePoint other && Equals(other);
-
-        /// <summary>
-        /// Checks if the <see cref="RelativePoint"/> equals another point.
-        /// </summary>
-        /// <param name="p">The other point.</param>
-        /// <returns>True if the objects are equal, otherwise false.</returns>
-        public bool Equals(RelativePoint p)
-        {
-            return Unit == p.Unit && Point == p.Point;
-        }
-
-        /// <summary>
-        /// Gets a hashcode for a <see cref="RelativePoint"/>.
-        /// </summary>
-        /// <returns>A hash code.</returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return (_point.GetHashCode() * 397) ^ (int)_unit;
-            }
-        }
-
-        /// <summary>
-        /// Converts a <see cref="RelativePoint"/> into pixels.
-        /// </summary>
-        /// <param name="size">The size of the visual.</param>
-        /// <returns>The origin point in pixels.</returns>
-        public Point ToPixels(Size size)
-        {
-            return _unit == RelativeUnit.Absolute ?
-                _point :
-                new Point(_point.X * size.Width, _point.Y * size.Height);
-        }
-
-        /// <summary>
-        /// Parses a <see cref="RelativePoint"/> string.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns>The parsed <see cref="RelativePoint"/>.</returns>
-        public static RelativePoint Parse(string s)
-        {
-            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid RelativePoint."))
-            {
-                var x = tokenizer.ReadString();
-                var y = tokenizer.ReadString();
-
-                var unit = RelativeUnit.Absolute;
-                var scale = 1.0;
-
-                if (x.EndsWith("%"))
-                {
-                    if (!y.EndsWith("%"))
-                    {
-                        throw new FormatException("If one coordinate is relative, both must be.");
-                    }
-
-                    x = x.TrimEnd('%');
-                    y = y.TrimEnd('%');
-                    unit = RelativeUnit.Relative;
-                    scale = 0.01;
-                }
-
-                return new RelativePoint(
-                    double.Parse(x, CultureInfo.InvariantCulture) * scale,
-                    double.Parse(y, CultureInfo.InvariantCulture) * scale,
-                    unit);
-            }
-        }
-
-        /// <summary>
-        /// Returns a String representing this RelativePoint instance.
-        /// </summary>
-        /// <returns>The string representation.</returns>
-        public override string ToString()
-        {
-            return _unit == RelativeUnit.Absolute ?
-                _point.ToString() :
-                 string.Format(CultureInfo.InvariantCulture, "{0}%, {1}%", _point.X * 100, _point.Y * 100);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IDeferredRendererLock.cs b/src/Avalonia.Visuals/Rendering/IDeferredRendererLock.cs
deleted file mode 100644
index eab3dca58e..0000000000
--- a/src/Avalonia.Visuals/Rendering/IDeferredRendererLock.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace Avalonia.Rendering
-{
-    public interface IDeferredRendererLock
-    {
-        IDisposable? TryLock();
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderLoop.cs b/src/Avalonia.Visuals/Rendering/IRenderLoop.cs
deleted file mode 100644
index dd7442e7f8..0000000000
--- a/src/Avalonia.Visuals/Rendering/IRenderLoop.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// The application render loop.
-    /// </summary>
-    /// <remarks>
-    /// The render loop is responsible for advancing the animation timer and updating the scene
-    /// graph for visible windows.
-    /// </remarks>
-    public interface IRenderLoop
-    {
-        /// <summary>
-        /// Adds an update task.
-        /// </summary>
-        /// <param name="i">The update task.</param>
-        /// <remarks>
-        /// Registered update tasks will be polled on each tick of the render loop after the
-        /// animation timer has been pulsed.
-        /// </remarks>
-        void Add(IRenderLoopTask i);
-
-        /// <summary>
-        /// Removes an update task.
-        /// </summary>
-        /// <param name="i">The update task.</param>
-        void Remove(IRenderLoopTask i);
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderRoot.cs b/src/Avalonia.Visuals/Rendering/IRenderRoot.cs
deleted file mode 100644
index 54e58bf39c..0000000000
--- a/src/Avalonia.Visuals/Rendering/IRenderRoot.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// Represents the root of a renderable tree.
-    /// </summary>
-    public interface IRenderRoot : IVisual
-    {
-        /// <summary>
-        /// Gets the client size of the window.
-        /// </summary>
-        Size ClientSize { get; }
-
-        /// <summary>
-        /// Gets the renderer for the window.
-        /// </summary>
-        IRenderer Renderer { get; }
-
-        /// <summary>
-        /// The scaling factor to use in rendering.
-        /// </summary>
-        double RenderScaling { get; }
-
-        /// <summary>
-        /// Creates a render target for the window.
-        /// </summary>
-        /// <returns>An <see cref="IRenderTarget"/>.</returns>
-        IRenderTarget CreateRenderTarget();
-
-        /// <summary>
-        /// Adds a rectangle to the window's dirty region.
-        /// </summary>
-        /// <param name="rect">The rectangle.</param>
-        void Invalidate(Rect rect);
-
-        /// <summary>
-        /// Converts a point from screen to client coordinates.
-        /// </summary>
-        /// <param name="point">The point in screen device coordinates.</param>
-        /// <returns>The point in client coordinates.</returns>
-        Point PointToClient(PixelPoint point);
-
-        /// <summary>
-        /// Converts a point from client to screen coordinates.
-        /// </summary>
-        /// <param name="point">The point in client coordinates.</param>
-        /// <returns>The point in screen device coordinates.</returns>
-        PixelPoint PointToScreen(Point point);
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IRenderTimer.cs b/src/Avalonia.Visuals/Rendering/IRenderTimer.cs
deleted file mode 100644
index d333e928a0..0000000000
--- a/src/Avalonia.Visuals/Rendering/IRenderTimer.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// Defines the interface implemented by an application render timer.
-    /// </summary>
-    public interface IRenderTimer
-    {
-        /// <summary>
-        /// Raised when the render timer ticks to signal a new frame should be drawn.
-        /// </summary>
-        /// <remarks>
-        /// This event can be raised on any thread; it is the responsibility of the subscriber to
-        /// switch execution to the right thread.
-        /// </remarks>
-        event Action<TimeSpan> Tick;
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IVisualBrushInitialize.cs b/src/Avalonia.Visuals/Rendering/IVisualBrushInitialize.cs
deleted file mode 100644
index 00449c5344..0000000000
--- a/src/Avalonia.Visuals/Rendering/IVisualBrushInitialize.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Avalonia.Media;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// Internal interface for initializing controls that are to be used as the visual in a
-    /// <see cref="VisualBrush"/>.
-    /// </summary>
-    public interface IVisualBrushInitialize
-    {
-        /// <summary>
-        /// Ensures that the control is ready to use as the visual in a visual brush.
-        /// </summary>
-        void EnsureInitialized();
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/IVisualBrushRenderer.cs b/src/Avalonia.Visuals/Rendering/IVisualBrushRenderer.cs
deleted file mode 100644
index 1cd6515635..0000000000
--- a/src/Avalonia.Visuals/Rendering/IVisualBrushRenderer.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Avalonia.Media;
-using Avalonia.Platform;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// Defines a renderer used to render a visual brush to a bitmap.
-    /// </summary>
-    public interface IVisualBrushRenderer
-    {
-        /// <summary>
-        /// Gets the size of the intermediate render target to which the visual brush should be
-        /// drawn.
-        /// </summary>
-        /// <param name="brush">The visual brush.</param>
-        /// <returns>The size of the intermediate render target to create.</returns>
-        Size GetRenderTargetSize(IVisualBrush brush);
-
-        /// <summary>
-        /// Renders a visual brush to a bitmap.
-        /// </summary>
-        /// <param name="context">The drawing context to render to.</param>
-        /// <param name="brush">The visual brush.</param>
-        /// <returns>A bitmap containing the rendered brush.</returns>
-        void RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush);
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
deleted file mode 100644
index 23016de148..0000000000
--- a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
+++ /dev/null
@@ -1,351 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Logging;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering
-{
-    /// <summary>
-    /// A renderer which renders the state of the visual tree without an intermediate scene graph
-    /// representation.
-    /// </summary>
-    /// <remarks>
-    /// The immediate renderer supports only clip-bound-based hit testing; a control's geometry is
-    /// not taken into account.
-    /// </remarks>
-    public class ImmediateRenderer : RendererBase, IRenderer, IVisualBrushRenderer
-    {
-        private readonly IVisual _root;
-        private readonly IRenderRoot? _renderRoot;
-        private bool _updateTransformedBounds = true;
-        private IRenderTarget? _renderTarget;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmediateRenderer"/> class.
-        /// </summary>
-        /// <param name="root">The control to render.</param>
-        public ImmediateRenderer(IVisual root)
-        {
-            _root = root ?? throw new ArgumentNullException(nameof(root));
-            _renderRoot = root as IRenderRoot;
-        }
-
-        private ImmediateRenderer(IVisual root, bool updateTransformedBounds)
-        {
-            _root = root ?? throw new ArgumentNullException(nameof(root));
-            _renderRoot = root as IRenderRoot;
-            _updateTransformedBounds = updateTransformedBounds;
-        }
-
-        /// <inheritdoc/>
-        public bool DrawFps { get; set; }
-
-        /// <inheritdoc/>
-        public bool DrawDirtyRects { get; set; }
-
-        /// <inheritdoc/>
-        public event EventHandler<SceneInvalidatedEventArgs>? SceneInvalidated;
-
-        /// <inheritdoc/>
-        public void Paint(Rect rect)
-        {
-            if (_renderTarget == null)
-            {
-                _renderTarget = ((IRenderRoot)_root).CreateRenderTarget();
-            }
-
-            try
-            {
-                using (var context = new DrawingContext(_renderTarget.CreateDrawingContext(this)))
-                {
-                    context.PlatformImpl.Clear(Colors.Transparent);
-
-                    using (context.PushTransformContainer())
-                    {
-                        Render(context, _root, _root.Bounds);
-                    }
-
-                    if (DrawDirtyRects)
-                    {
-                        var color = (uint)new Random().Next(0xffffff) | 0x44000000;
-                        context.FillRectangle(
-                            new SolidColorBrush(color),
-                            rect);
-                    }
-
-                    if (DrawFps)
-                    {
-                        RenderFps(context, _root.Bounds, null);
-                    }
-                }
-            }
-            catch (RenderTargetCorruptedException ex)
-            {
-                Logger.TryGet(LogEventLevel.Information, LogArea.Animations)?.Log(this, "Render target was corrupted. Exception: {0}", ex);
-                _renderTarget.Dispose();
-                _renderTarget = null;
-            }
-
-            SceneInvalidated?.Invoke(this, new SceneInvalidatedEventArgs((IRenderRoot)_root, rect));
-        }
-
-        /// <inheritdoc/>
-        public void Resized(Size size)
-        {
-        }
-
-        /// <summary>
-        /// Renders a visual to a render target.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="target">The render target.</param>
-        public static void Render(IVisual visual, IRenderTarget target)
-        {
-            using (var renderer = new ImmediateRenderer(visual, updateTransformedBounds: false))
-            using (var context = new DrawingContext(target.CreateDrawingContext(renderer)))
-            {
-                renderer.Render(context, visual, visual.Bounds);
-            }
-        }
-
-        /// <summary>
-        /// Renders a visual to a drawing context.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="context">The drawing context.</param>
-        public static void Render(IVisual visual, DrawingContext context)
-        {
-            using (var renderer = new ImmediateRenderer(visual, updateTransformedBounds: false))
-            {
-                renderer.Render(context, visual, visual.Bounds);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void AddDirty(IVisual visual)
-        {
-            if (visual.Bounds != Rect.Empty)
-            {
-                var m = visual.TransformToVisual(_root);
-
-                if (m.HasValue)
-                {
-                    var bounds = new Rect(visual.Bounds.Size).TransformToAABB(m.Value);
-
-                    //use transformedbounds as previous render state of the visual bounds
-                    //so we can invalidate old and new bounds of a control in case it moved/shrinked
-                    if (visual.TransformedBounds.HasValue)
-                    {
-                        var trb = visual.TransformedBounds.Value;
-                        var trBounds = trb.Bounds.TransformToAABB(trb.Transform);
-
-                        if (trBounds != bounds)
-                        {
-                            _renderRoot?.Invalidate(trBounds);
-                        }
-                    }
-
-                    _renderRoot?.Invalidate(bounds);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Ends the operation of the renderer.
-        /// </summary>
-        public void Dispose()
-        {
-            _renderTarget?.Dispose();
-        }
-
-        /// <inheritdoc/>
-        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter)
-        {
-            return HitTest(root, p, filter);
-        }
-
-        public IVisual? HitTestFirst(Point p, IVisual root, Func<IVisual, bool> filter)
-        {
-            return HitTest(root, p, filter).FirstOrDefault();
-        }
-
-        /// <inheritdoc/>
-        public void RecalculateChildren(IVisual visual) => AddDirty(visual);
-
-        /// <inheritdoc/>
-        public void Start()
-        {
-        }
-
-        /// <inheritdoc/>
-        public void Stop()
-        {
-        }
-
-        /// <inheritdoc/>
-        Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
-        {
-            (brush.Visual as IVisualBrushInitialize)?.EnsureInitialized();
-            return brush.Visual?.Bounds.Size ?? Size.Empty;
-        }
-
-        /// <inheritdoc/>
-        void IVisualBrushRenderer.RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush)
-        {
-            var visual = brush.Visual;
-            Render(new DrawingContext(context), visual, visual.Bounds);
-        }
-
-        internal static void Render(IVisual visual, DrawingContext context, bool updateTransformedBounds)
-        {
-            using var renderer = new ImmediateRenderer(visual, updateTransformedBounds);
-            renderer.Render(context, visual, visual.Bounds);
-        }
-
-        private static void ClearTransformedBounds(IVisual visual)
-        {
-            foreach (var e in visual.GetSelfAndVisualDescendants())
-            {
-                visual.TransformedBounds = null;
-            }
-        }
-
-        private static Rect GetTransformedBounds(IVisual visual)
-        {
-            if (visual.RenderTransform == null)
-            {
-                return visual.Bounds;
-            }
-            else
-            {
-                var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
-                var offset = Matrix.CreateTranslation(visual.Bounds.Position + origin);
-                var m = (-offset) * visual.RenderTransform.Value * (offset);
-                return visual.Bounds.TransformToAABB(m);
-            }
-        }
-
-        private static IEnumerable<IVisual> HitTest(
-           IVisual visual,
-           Point p,
-           Func<IVisual, bool>? filter)
-        {
-            _ = visual ?? throw new ArgumentNullException(nameof(visual));
-
-            if (filter?.Invoke(visual) != false)
-            {
-                bool containsPoint;
-
-                if (visual is ICustomSimpleHitTest custom)
-                {
-                    containsPoint = custom.HitTest(p);
-                }
-                else
-                {
-                    containsPoint = visual.TransformedBounds?.Contains(p) == true;
-                }
-
-                if ((containsPoint || !visual.ClipToBounds) && visual.VisualChildren.Count > 0)
-                {
-                    foreach (var child in visual.VisualChildren.SortByZIndex())
-                    {
-                        foreach (var result in HitTest(child, p, filter))
-                        {
-                            yield return result;
-                        }
-                    }
-                }
-
-                if (containsPoint)
-                {
-                    yield return visual;
-                }
-            }
-        }
-
-        private void Render(DrawingContext context, IVisual visual, Rect clipRect)
-        {
-            var opacity = visual.Opacity;
-            var clipToBounds = visual.ClipToBounds;
-            var bounds = new Rect(visual.Bounds.Size);
-
-            if (visual.IsVisible && opacity > 0)
-            {
-                var m = Matrix.CreateTranslation(visual.Bounds.Position);
-
-                var renderTransform = Matrix.Identity;
-
-                if (visual.RenderTransform != null)
-                {
-                    var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
-                    var offset = Matrix.CreateTranslation(origin);
-                    renderTransform = (-offset) * visual.RenderTransform.Value * (offset);
-                }
-
-                m = renderTransform * m;
-
-                if (clipToBounds)
-                {
-                    if (visual.RenderTransform != null)
-                    {
-                        clipRect = new Rect(visual.Bounds.Size);
-                    }
-                    else
-                    {
-                        clipRect = clipRect.Intersect(new Rect(visual.Bounds.Size));
-                    }
-                }
-
-                using (context.PushPostTransform(m))
-                using (context.PushOpacity(opacity))
-                using (clipToBounds
-#pragma warning disable CS0618 // Type or member is obsolete
-                    ? visual is IVisualWithRoundRectClip roundClipVisual
-                        ? context.PushClip(new RoundedRect(bounds, roundClipVisual.ClipToBoundsRadius))
-                        : context.PushClip(bounds) 
-                    : default(DrawingContext.PushedState))
-#pragma warning restore CS0618 // Type or member is obsolete
-
-                using (visual.Clip != null ? context.PushGeometryClip(visual.Clip) : default(DrawingContext.PushedState))
-                using (visual.OpacityMask != null ? context.PushOpacityMask(visual.OpacityMask, bounds) : default(DrawingContext.PushedState))
-                using (context.PushTransformContainer())
-                {
-                    visual.Render(context);
-
-#pragma warning disable 0618
-                    var transformed =
-                        new TransformedBounds(bounds, new Rect(), context.CurrentContainerTransform);
-#pragma warning restore 0618
-
-                    if (_updateTransformedBounds)
-                        visual.TransformedBounds = transformed;
-
-                    foreach (var child in visual.VisualChildren.OrderBy(x => x, ZIndexComparer.Instance))
-                    {
-                        var childBounds = GetTransformedBounds(child);
-
-                        if (!child.ClipToBounds || clipRect.Intersects(childBounds))
-                        {
-                            var childClipRect = child.RenderTransform == null
-                                ? clipRect.Translate(-childBounds.Position)
-                                : clipRect;
-                            Render(context, child, childClipRect);
-                        }
-                        else if (_updateTransformedBounds)
-                        {
-                            ClearTransformedBounds(child);
-                        }
-                    }
-                }
-            }
-
-            if (!visual.IsVisible && _updateTransformedBounds)
-            {
-                ClearTransformedBounds(visual);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/BitmapBlendModeNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/BitmapBlendModeNode.cs
deleted file mode 100644
index 45b62b843b..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/BitmapBlendModeNode.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents an bitmap blending mode push or pop.
-    /// </summary>
-    internal class BitmapBlendModeNode : IDrawOperation
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BitmapBlendModeNode"/> class that represents an
-        /// <see cref="BitmapBlendingMode"/> push.
-        /// </summary>
-        /// <param name="bitmapBlend">The <see cref="BitmapBlendingMode"/> to push.</param>
-        public BitmapBlendModeNode(BitmapBlendingMode bitmapBlend)
-        {
-            BlendingMode = bitmapBlend;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BitmapBlendModeNode"/> class that represents an
-        /// <see cref="BitmapBlendingMode"/> pop.
-        /// </summary>
-        public BitmapBlendModeNode()
-        {
-        }
-
-        /// <inheritdoc/>
-        public Rect Bounds => Rect.Empty;
-
-        /// <summary>
-        /// Gets the BitmapBlend to be pushed or null if the operation represents a pop.
-        /// </summary>
-        public BitmapBlendingMode? BlendingMode { get; }
-
-        /// <inheritdoc/>
-        public bool HitTest(Point p) => false;
-
-        /// <summary>
-        /// Determines if this draw operation equals another.
-        /// </summary>
-        /// <param name="blendingMode">the <see cref="BitmapBlendModeNode"/> how to compare</param>
-        /// <returns>True if the draw operations are the same, otherwise false.</returns>
-        /// <remarks>
-        /// The properties of the other draw operation are passed in as arguments to prevent
-        /// allocation of a not-yet-constructed draw operation object.
-        /// </remarks>
-        public bool Equals(BitmapBlendingMode? blendingMode) => BlendingMode == blendingMode;
-
-        /// <inheritdoc/>
-        public void Render(IDrawingContextImpl context)
-        {
-            if (BlendingMode.HasValue)
-            {
-                context.PushBitmapBlendMode(BlendingMode.Value);
-            }
-            else
-            {
-                context.PopBitmapBlendMode();
-            }
-        }
-
-        public void Dispose()
-        {
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
deleted file mode 100644
index 9710ca6c3c..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ /dev/null
@@ -1,479 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A drawing context which builds a scene graph.
-    /// </summary>
-    internal class DeferredDrawingContextImpl : IDrawingContextImpl, IDrawingContextWithAcrylicLikeSupport
-    {
-        private readonly ISceneBuilder _sceneBuilder;
-        private VisualNode? _node;
-        private int _childIndex;
-        private int _drawOperationindex;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeferredDrawingContextImpl"/> class.
-        /// </summary>
-        /// <param name="sceneBuilder">
-        /// A scene builder used for constructing child scenes for visual brushes.
-        /// </param>
-        /// <param name="layers">The scene layers.</param>
-        public DeferredDrawingContextImpl(ISceneBuilder sceneBuilder, SceneLayers layers)
-        {
-            _sceneBuilder = sceneBuilder;
-            Layers = layers;
-        }
-
-        /// <inheritdoc/>
-        public Matrix Transform { get; set; } = Matrix.Identity;
-
-        /// <summary>
-        /// Gets the layers in the scene being built.
-        /// </summary>
-        public SceneLayers Layers { get; }
-
-        /// <summary>
-        /// Informs the drawing context of the visual node that is about to be rendered.
-        /// </summary>
-        /// <param name="node">The visual node.</param>
-        /// <returns>
-        /// An object which when disposed will commit the changes to visual node.
-        /// </returns>
-        public UpdateState BeginUpdate(VisualNode node)
-        {
-            _ = node ?? throw new ArgumentNullException(nameof(node));
-
-            if (_node != null)
-            {
-                if (_childIndex < _node.Children.Count)
-                {
-                    _node.ReplaceChild(_childIndex, node);
-                }
-                else
-                {
-                    _node.AddChild(node);
-                }
-
-                ++_childIndex;
-            }
-
-            var state = new UpdateState(this, _node, _childIndex, _drawOperationindex);
-            _node = node;
-            _childIndex = _drawOperationindex = 0;
-            return state;
-        }
-
-        /// <inheritdoc/>
-        public void Clear(Color color)
-        {
-            // Cannot clear a deferred scene.
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            // Nothing to do here since we allocate no unmanaged resources.
-        }
-
-        /// <summary>
-        /// Removes any remaining drawing operations from the visual node.
-        /// </summary>
-        /// <remarks>
-        /// Drawing operations are updated in place, overwriting existing drawing operations if
-        /// they are different. Once drawing has completed for the current visual node, it is
-        /// possible that there are stale drawing operations at the end of the list. This method
-        /// trims these stale drawing operations.
-        /// </remarks>
-        public void TrimChildren()
-        {
-            _node!.TrimChildren(_childIndex);
-        }
-
-        /// <inheritdoc/>
-        public void DrawGeometry(IBrush? brush, IPen? pen, IGeometryImpl geometry)
-        {
-            var next = NextDrawAs<GeometryNode>();
-
-            if (next == null || !next.Item.Equals(Transform, brush, pen, geometry))
-            {
-                Add(new GeometryNode(Transform, brush, pen, geometry, CreateChildScene(brush)));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
-        {
-            var next = NextDrawAs<ImageNode>();
-
-            if (next == null || !next.Item.Equals(Transform, source, opacity, sourceRect, destRect, bitmapInterpolationMode))
-            {
-                Add(new ImageNode(Transform, source, opacity, sourceRect, destRect, bitmapInterpolationMode));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect sourceRect)
-        {
-            // This method is currently only used to composite layers so shouldn't be called here.
-            throw new NotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public void DrawLine(IPen pen, Point p1, Point p2)
-        {
-            var next = NextDrawAs<LineNode>();
-
-            if (next == null || !next.Item.Equals(Transform, pen, p1, p2))
-            {
-                Add(new LineNode(Transform, pen, p1, p2, CreateChildScene(pen.Brush)));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void DrawRectangle(IBrush? brush, IPen? pen, RoundedRect rect,
-            BoxShadows boxShadows = default)
-        {
-            var next = NextDrawAs<RectangleNode>();
-
-            if (next == null || !next.Item.Equals(Transform, brush, pen, rect, boxShadows))
-            {
-                Add(new RectangleNode(Transform, brush, pen, rect, boxShadows, CreateChildScene(brush)));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void DrawRectangle(IExperimentalAcrylicMaterial material, RoundedRect rect)
-        {
-            var next = NextDrawAs<ExperimentalAcrylicNode>();
-
-            if (next == null || !next.Item.Equals(Transform, material, rect))
-            {
-                Add(new ExperimentalAcrylicNode(Transform, material, rect));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        public void DrawEllipse(IBrush? brush, IPen? pen, Rect rect)
-        {
-            var next = NextDrawAs<EllipseNode>();
-
-            if (next == null || !next.Item.Equals(Transform, brush, pen, rect))
-            {
-                Add(new EllipseNode(Transform, brush, pen, rect, CreateChildScene(brush)));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        public void Custom(ICustomDrawOperation custom)
-        {
-            var next = NextDrawAs<CustomDrawOperation>();
-            if (next == null || !next.Item.Equals(Transform, custom))
-                Add(new CustomDrawOperation(custom, Transform));
-            else
-                ++_drawOperationindex;
-        }
-
-        /// <inheritdoc/>
-        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
-        {
-            var next = NextDrawAs<GlyphRunNode>();
-
-            if (next == null || !next.Item.Equals(Transform, foreground, glyphRun))
-            {
-                Add(new GlyphRunNode(Transform, foreground, glyphRun, CreateChildScene(foreground)));
-            }
-
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-        public IDrawingContextLayerImpl CreateLayer(Size size)
-        {
-            throw new NotSupportedException("Creating layers on a deferred drawing context not supported");
-        }
-
-        /// <inheritdoc/>
-        public void PopClip()
-        {
-            var next = NextDrawAs<ClipNode>();
-
-            if (next == null || !next.Item.Equals(null))
-            {
-                Add(new ClipNode());
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PopGeometryClip()
-        {
-            var next = NextDrawAs<GeometryClipNode>();
-
-            if (next == null || !next.Item.Equals(null))
-            {
-                Add(new GeometryClipNode());
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PopBitmapBlendMode()
-        {
-            var next = NextDrawAs<BitmapBlendModeNode>();
-
-            if (next == null || !next.Item.Equals(null))
-            {
-                Add(new BitmapBlendModeNode());
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-        
-        /// <inheritdoc/>
-        public void PopOpacity()
-        {
-            var next = NextDrawAs<OpacityNode>();
-
-            if (next == null || !next.Item.Equals(null))
-            {
-                Add(new OpacityNode());
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PopOpacityMask()
-        {
-            var next = NextDrawAs<OpacityMaskNode>();
-
-            if (next == null || !next.Item.Equals(null, null))
-            {
-                Add(new OpacityMaskNode());
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PushClip(Rect clip)
-        {
-            var next = NextDrawAs<ClipNode>();
-
-            if (next == null || !next.Item.Equals(Transform, clip))
-            {
-                Add(new ClipNode(Transform, clip));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc />
-        public void PushClip(RoundedRect clip)
-        {
-            var next = NextDrawAs<ClipNode>();
-
-            if (next == null || !next.Item.Equals(Transform, clip))
-            {
-                Add(new ClipNode(Transform, clip));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PushGeometryClip(IGeometryImpl? clip)
-        {
-            if (clip is null)
-                return;
-
-            var next = NextDrawAs<GeometryClipNode>();
-
-            if (next == null || !next.Item.Equals(Transform, clip))
-            {
-                Add(new GeometryClipNode(Transform, clip));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PushOpacity(double opacity)
-        {
-            var next = NextDrawAs<OpacityNode>();
-
-            if (next == null || !next.Item.Equals(opacity))
-            {
-                Add(new OpacityNode(opacity));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PushOpacityMask(IBrush mask, Rect bounds)
-        {
-            var next = NextDrawAs<OpacityMaskNode>();
-
-            if (next == null || !next.Item.Equals(mask, bounds))
-            {
-                Add(new OpacityMaskNode(mask, bounds, CreateChildScene(mask)));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PushBitmapBlendMode(BitmapBlendingMode blendingMode)
-        {
-            var next = NextDrawAs<BitmapBlendModeNode>();
-
-            if (next == null || !next.Item.Equals(blendingMode))
-            {
-                Add(new BitmapBlendModeNode(blendingMode));
-            }
-            else
-            {
-                ++_drawOperationindex;
-            }
-        }
-        
-        public readonly struct UpdateState : IDisposable
-        {
-            public UpdateState(
-                DeferredDrawingContextImpl owner,
-                VisualNode? node,
-                int childIndex,
-                int drawOperationIndex)
-            {
-                Owner = owner;
-                Node = node;
-                ChildIndex = childIndex;
-                DrawOperationIndex = drawOperationIndex;
-            }
-
-            public void Dispose()
-            {
-                Owner._node!.TrimDrawOperations(Owner._drawOperationindex);
-
-                var dirty = Owner.Layers.GetOrAdd(Owner._node.LayerRoot!).Dirty;
-
-                var drawOperations = Owner._node.DrawOperations;
-                var drawOperationsCount = drawOperations.Count;
-
-                for (var i = 0; i < drawOperationsCount; i++)
-                {
-                    dirty.Add(drawOperations[i].Item.Bounds);
-                }
-
-                Owner._node = Node;
-                Owner._childIndex = ChildIndex;
-                Owner._drawOperationindex = DrawOperationIndex;
-            }
-
-            public DeferredDrawingContextImpl Owner { get; }
-            public VisualNode? Node { get; }
-            public int ChildIndex { get; }
-            public int DrawOperationIndex { get; }
-        }
-
-        private void Add<T>(T node) where T : class, IDrawOperation
-        {
-            using (var refCounted = RefCountable.Create(node))
-            {
-                Add(refCounted);
-            }
-        }
-
-        private void Add(IRef<IDrawOperation> node)
-        {
-            if (_drawOperationindex < _node!.DrawOperations.Count)
-            {
-                _node.ReplaceDrawOperation(_drawOperationindex, node);
-            }
-            else
-            {
-                _node.AddDrawOperation(node);
-            }
-
-            ++_drawOperationindex;
-        }
-
-        private IRef<T>? NextDrawAs<T>() where T : class, IDrawOperation
-        {
-            return _drawOperationindex < _node!.DrawOperations.Count ? _node.DrawOperations[_drawOperationindex] as IRef<T> : null;
-        }
-
-        private IDictionary<IVisual, Scene>? CreateChildScene(IBrush? brush)
-        {
-            var visualBrush = brush as VisualBrush;
-
-            if (visualBrush != null)
-            {
-                var visual = visualBrush.Visual;
-
-                if (visual != null)
-                {
-                    (visual as IVisualBrushInitialize)?.EnsureInitialized();
-                    var scene = new Scene(visual);
-                    _sceneBuilder.UpdateAll(scene);
-                    return new Dictionary<IVisual, Scene> { { visualBrush.Visual, scene } };
-                }
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/EllipseNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/EllipseNode.cs
deleted file mode 100644
index 504256b932..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/EllipseNode.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents an ellipse draw.
-    /// </summary>
-    internal class EllipseNode : BrushDrawOperation
-    {
-        public EllipseNode(
-            Matrix transform, 
-            IBrush? brush, 
-            IPen? pen, 
-            Rect rect, 
-            IDictionary<IVisual, Scene>? childScenes = null) 
-            : base(rect.Inflate(pen?.Thickness ?? 0), transform)
-        {
-            Transform = transform;
-            Brush = brush?.ToImmutable();
-            Pen = pen?.ToImmutable();
-            Rect = rect;
-            ChildScenes = childScenes;
-        }
-
-        /// <summary>
-        /// Gets the fill brush.
-        /// </summary>
-        public IBrush? Brush { get; }
-
-        /// <summary>
-        /// Gets the stroke pen.
-        /// </summary>
-        public ImmutablePen? Pen { get; }
-
-        /// <summary>
-        /// Gets the transform with which the node will be drawn.
-        /// </summary>
-        public Matrix Transform { get; }
-
-        /// <summary>
-        /// Gets the rect of the ellipse to draw.
-        /// </summary>
-        public Rect Rect { get; }
-
-        public override IDictionary<IVisual, Scene>? ChildScenes { get; }
-
-        public bool Equals(Matrix transform, IBrush? brush, IPen? pen, Rect rect)
-        {
-            return transform == Transform &&
-                   Equals(brush, Brush) &&
-                   Equals(Pen, pen) &&
-                   rect.Equals(Rect);
-        }
-
-        public override void Render(IDrawingContextImpl context)
-        {
-            context.DrawEllipse(Brush, Pen, Rect);
-        }
-
-        public override bool HitTest(Point p)
-        {
-            if (!Transform.TryInvert(out Matrix inverted))
-            {
-                return false;
-            }
-
-            p *= inverted;
-
-            var center = Rect.Center;
-
-            var strokeThickness = Pen?.Thickness ?? 0;
-
-            var rx = Rect.Width / 2 + strokeThickness / 2;
-            var ry = Rect.Height / 2 + strokeThickness / 2;
-
-            var dx = p.X - center.X;
-            var dy = p.Y - center.Y;
-
-            if (Math.Abs(dx) > rx || Math.Abs(dy) > ry)
-            {
-                return false;
-            }
-
-            if (Brush != null)
-            {
-                return Contains(rx, ry);
-            }
-            else if (strokeThickness > 0)
-            {
-                bool inStroke = Contains(rx, ry);
-
-                rx = Rect.Width / 2 - strokeThickness / 2;
-                ry = Rect.Height / 2 - strokeThickness / 2;
-
-                bool inInner = Contains(rx, ry);
-
-                return inStroke && !inInner;
-            }
-
-            bool Contains(double radiusX, double radiusY)
-            {
-                var rx2 = radiusX * radiusX;
-                var ry2 = radiusY * radiusY;
-
-                var distance = ry2 * dx * dx + rx2 * dy * dy;
-
-                return distance <= rx2 * ry2;
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
deleted file mode 100644
index 7de1035441..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents a geometry draw.
-    /// </summary>
-    internal class GeometryNode : BrushDrawOperation
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GeometryNode"/> class.
-        /// </summary>
-        /// <param name="transform">The transform.</param>
-        /// <param name="brush">The fill brush.</param>
-        /// <param name="pen">The stroke pen.</param>
-        /// <param name="geometry">The geometry.</param>
-        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
-        public GeometryNode(Matrix transform,
-            IBrush? brush,
-            IPen? pen,
-            IGeometryImpl geometry,
-            IDictionary<IVisual, Scene>? childScenes = null)
-            : base(geometry.GetRenderBounds(pen), transform)
-        {
-            Transform = transform;
-            Brush = brush?.ToImmutable();
-            Pen = pen?.ToImmutable();
-            Geometry = geometry;
-            ChildScenes = childScenes;
-        }
-
-        /// <summary>
-        /// Gets the transform with which the node will be drawn.
-        /// </summary>
-        public Matrix Transform { get; }
-
-        /// <summary>
-        /// Gets the fill brush.
-        /// </summary>
-        public IBrush? Brush { get; }
-
-        /// <summary>
-        /// Gets the stroke pen.
-        /// </summary>
-        public ImmutablePen? Pen { get; }
-
-        /// <summary>
-        /// Gets the geometry to draw.
-        /// </summary>
-        public IGeometryImpl Geometry { get; }
-
-        /// <inheritdoc/>
-        public override IDictionary<IVisual, Scene>? ChildScenes { get; }
-
-        /// <summary>
-        /// Determines if this draw operation equals another.
-        /// </summary>
-        /// <param name="transform">The transform of the other draw operation.</param>
-        /// <param name="brush">The fill of the other draw operation.</param>
-        /// <param name="pen">The stroke of the other draw operation.</param>
-        /// <param name="geometry">The geometry of the other draw operation.</param>
-        /// <returns>True if the draw operations are the same, otherwise false.</returns>
-        /// <remarks>
-        /// The properties of the other draw operation are passed in as arguments to prevent
-        /// allocation of a not-yet-constructed draw operation object.
-        /// </remarks>
-        public bool Equals(Matrix transform, IBrush? brush, IPen? pen, IGeometryImpl geometry)
-        {
-            return transform == Transform &&
-                   Equals(brush, Brush) &&
-                   Equals(Pen, pen) &&
-                   Equals(geometry, Geometry);
-        }
-
-        /// <inheritdoc/>
-        public override void Render(IDrawingContextImpl context)
-        {
-            context.Transform = Transform;
-            context.DrawGeometry(Brush, Pen, Geometry);
-        }
-
-        /// <inheritdoc/>
-        public override bool HitTest(Point p)
-        {
-            if (Transform.HasInverse)
-            {
-                p *= Transform.Invert();
-                return (Brush != null && Geometry.FillContains(p)) ||
-                    (Pen != null && Geometry.StrokeContains(Pen, p));
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
deleted file mode 100644
index d3da19d8c9..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using Avalonia.Platform;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// A node in the scene graph which represents an image draw.
-    /// </summary>
-    internal class ImageNode : DrawOperation
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageNode"/> class.
-        /// </summary>
-        /// <param name="transform">The transform.</param>
-        /// <param name="source">The image to draw.</param>
-        /// <param name="opacity">The draw opacity.</param>
-        /// <param name="sourceRect">The source rect.</param>
-        /// <param name="destRect">The destination rect.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        public ImageNode(Matrix transform, IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
-            : base(destRect, transform)
-        {
-            Transform = transform;
-            Source = source.Clone();
-            Opacity = opacity;
-            SourceRect = sourceRect;
-            DestRect = destRect;
-            BitmapInterpolationMode = bitmapInterpolationMode;
-            SourceVersion = Source.Item.Version;
-        }        
-
-        /// <summary>
-        /// Gets the transform with which the node will be drawn.
-        /// </summary>
-        public Matrix Transform { get; }
-
-        /// <summary>
-        /// Gets the image to draw.
-        /// </summary>
-        public IRef<IBitmapImpl> Source { get; }
-
-        /// <summary>
-        /// Source bitmap Version
-        /// </summary>
-        public int SourceVersion { get; }
-
-        /// <summary>
-        /// Gets the draw opacity.
-        /// </summary>
-        public double Opacity { get; }
-
-        /// <summary>
-        /// Gets the source rect.
-        /// </summary>
-        public Rect SourceRect { get; }
-
-        /// <summary>
-        /// Gets the destination rect.
-        /// </summary>
-        public Rect DestRect { get; }
-
-        /// <summary>
-        /// Gets the bitmap interpolation mode.
-        /// </summary>
-        /// <value>
-        /// The scaling mode.
-        /// </value>
-        public BitmapInterpolationMode BitmapInterpolationMode { get; }
-        
-        /// <summary>
-        /// The bitmap blending mode.
-        /// </summary>
-        /// <value>
-        /// The blending mode.
-        /// </value>
-        public BitmapBlendingMode BitmapBlendingMode { get; }
-
-        /// <summary>
-        /// Determines if this draw operation equals another.
-        /// </summary>
-        /// <param name="transform">The transform of the other draw operation.</param>
-        /// <param name="source">The image of the other draw operation.</param>
-        /// <param name="opacity">The opacity of the other draw operation.</param>
-        /// <param name="sourceRect">The source rect of the other draw operation.</param>
-        /// <param name="destRect">The dest rect of the other draw operation.</param>
-        /// <param name="bitmapInterpolationMode">The bitmap interpolation mode.</param>
-        /// <returns>True if the draw operations are the same, otherwise false.</returns>
-        /// <remarks>
-        /// The properties of the other draw operation are passed in as arguments to prevent
-        /// allocation of a not-yet-constructed draw operation object.
-        /// </remarks>
-        public bool Equals(Matrix transform, IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
-        {
-            return transform == Transform &&
-                   Equals(source.Item, Source.Item) &&
-                   source.Item.Version == SourceVersion &&
-                   opacity == Opacity &&
-                   sourceRect == SourceRect &&
-                   destRect == DestRect &&
-                   bitmapInterpolationMode == BitmapInterpolationMode;
-        }
-
-        /// <inheritdoc/>
-        public override void Render(IDrawingContextImpl context)
-        {
-            context.Transform = Transform;
-            context.DrawBitmap(Source, Opacity, SourceRect, DestRect, BitmapInterpolationMode);
-        }
-
-        /// <inheritdoc/>
-        public override bool HitTest(Point p) => Bounds.Contains(p);
-
-        public override void Dispose()
-        {
-            Source?.Dispose();
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
deleted file mode 100644
index 63c22efc3f..0000000000
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ /dev/null
@@ -1,466 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Threading;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering.SceneGraph
-{
-    /// <summary>
-    /// Builds a scene graph from a visual tree.
-    /// </summary>
-    public class SceneBuilder : ISceneBuilder
-    {
-        /// <inheritdoc/>
-        public void UpdateAll(Scene scene)
-        {
-            _ = scene ?? throw new ArgumentNullException(nameof(scene));
-            Dispatcher.UIThread.VerifyAccess();
-
-            UpdateSize(scene);
-            scene.Layers.GetOrAdd(scene.Root.Visual);
-
-            using (var impl = new DeferredDrawingContextImpl(this, scene.Layers))
-            using (var context = new DrawingContext(impl))
-            {
-                var clip = new Rect(scene.Root.Visual.Bounds.Size);
-                Update(context, scene, (VisualNode)scene.Root, clip, true);
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool Update(Scene scene, IVisual visual)
-        {
-            _ = scene ?? throw new ArgumentNullException(nameof(scene));
-            _ = visual ?? throw new ArgumentNullException(nameof(visual));
-
-            Dispatcher.UIThread.VerifyAccess();
-
-            if (!scene.Root.Visual.IsVisible)
-            {
-                throw new AvaloniaInternalException("Cannot update the scene for an invisible root visual.");
-            }
-
-            var node = (VisualNode?)scene.FindNode(visual);
-
-            if (visual == scene.Root.Visual)
-            {
-                UpdateSize(scene);
-            }
-
-            if (visual.VisualRoot == scene.Root.Visual)
-            {
-                if (node?.Parent != null &&
-                    visual.VisualParent != null &&
-                    node.Parent.Visual != visual.VisualParent)
-                {
-                    // The control has changed parents. Remove the node and recurse into the new parent node.
-                    ((VisualNode)node.Parent).RemoveChild(node);
-                    Deindex(scene, node);
-                    node = (VisualNode?)scene.FindNode(visual.VisualParent);
-                }
-
-                if (visual.IsVisible)
-                {
-                    // If the node isn't yet part of the scene, find the nearest ancestor that is.
-                    node = node ?? FindExistingAncestor(scene, visual);
-
-                    // We don't need to do anything if this part of the tree has already been fully
-                    // updated.
-                    if (node != null && !node.SubTreeUpdated)
-                    {
-                        // If the control we've been asked to update isn't part of the scene then
-                        // we're carrying out an add operation, so recurse and add all the
-                        // descendents too.
-                        var recurse = node.Visual != visual;
-
-                        using (var impl = new DeferredDrawingContextImpl(this, scene.Layers))
-                        using (var context = new DrawingContext(impl))
-                        {
-                            var clip = new Rect(scene.Root.Visual.Bounds.Size);
-
-                            if (node.Parent != null)
-                            {
-                                context.PushPostTransform(node.Parent.Transform);
-                                clip = node.Parent.ClipBounds;
-                            }
-
-                            using (context.PushTransformContainer())
-                            {
-                                Update(context, scene, node, clip, recurse);
-                            }
-                        }
-
-                        return true;
-                    }
-                }
-                else
-                {
-                    if (node != null)
-                    {
-                        // The control has been hidden so remove it from its parent and deindex the
-                        // node and its descendents.
-                        ((VisualNode?)node.Parent)?.RemoveChild(node);
-                        Deindex(scene, node);
-                        return true;
-                    }
-                }
-            }
-            else if (node != null)
-            {
-                // The control has been removed so remove it from its parent and deindex the
-                // node and its descendents.
-                var trim = FindFirstDeadAncestor(scene, node);
-                ((VisualNode)trim.Parent!).RemoveChild(trim);
-                Deindex(scene, trim);
-                return true;
-            }
-
-            return false;
-        }
-
-        private static VisualNode? FindExistingAncestor(Scene scene, IVisual visual)
-        {
-            var node = scene.FindNode(visual);
-
-            while (node == null && visual.IsVisible)
-            {
-                var parent = visual.VisualParent;
-
-                if (parent is null)
-                    return null;
-
-                visual = parent;
-                node = scene.FindNode(visual);
-            }
-
-            return visual.IsVisible ? (VisualNode?)node : null;
-        }
-
-        private static VisualNode FindFirstDeadAncestor(Scene scene, IVisualNode node)
-        {
-            var parent = node.Parent;
-
-            while (parent!.Visual.VisualRoot == null)
-            {
-                node = parent;
-                parent = node.Parent;
-            }
-
-            return (VisualNode)node;
-        }
-
-        private static object GetOrCreateChildNode(Scene scene, IVisual child, VisualNode parent)
-        {
-            var result = (VisualNode?)scene.FindNode(child);
-
-            if (result != null && result.Parent != parent)
-            {
-                Deindex(scene, result);
-                result = null;
-            }
-
-            return result ?? CreateNode(scene, child, parent);
-        }
-
-        private static void Update(DrawingContext context, Scene scene, VisualNode node, Rect clip, bool forceRecurse)
-        {
-            var visual = node.Visual;
-            var opacity = visual.Opacity;
-            var clipToBounds = visual.ClipToBounds;
-#pragma warning disable CS0618 // Type or member is obsolete
-            var clipToBoundsRadius = visual is IVisualWithRoundRectClip roundRectClip ?
-                roundRectClip.ClipToBoundsRadius :
-                default;
-#pragma warning restore CS0618 // Type or member is obsolete
-
-            var bounds = new Rect(visual.Bounds.Size);
-            var contextImpl = (DeferredDrawingContextImpl)context.PlatformImpl;
-
-            contextImpl.Layers.Find(node.LayerRoot!)?.Dirty.Add(node.Bounds);
-
-            if (visual.IsVisible)
-            {
-                var m = node != scene.Root ? 
-                    Matrix.CreateTranslation(visual.Bounds.Position) :
-                    Matrix.Identity;
-
-                var renderTransform = Matrix.Identity;
-
-                if (visual.RenderTransform != null)
-                {
-                    var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
-                    var offset = Matrix.CreateTranslation(origin);
-                    renderTransform = (-offset) * visual.RenderTransform.Value * (offset);
-                }
-
-                m = renderTransform * m;
-
-                using (contextImpl.BeginUpdate(node))
-                using (context.PushPostTransform(m))
-                using (context.PushTransformContainer())
-                {
-                    var globalBounds = bounds.TransformToAABB(contextImpl.Transform);
-                    var clipBounds = clipToBounds ?
-                        globalBounds.Intersect(clip) :
-                        clip;
-
-                    forceRecurse = forceRecurse ||
-                        node.ClipBounds != clipBounds ||
-                        node.Opacity != opacity ||
-                        node.Transform != contextImpl.Transform;
-
-                    node.Transform = contextImpl.Transform;
-                    node.ClipBounds = clipBounds;
-                    node.ClipToBounds = clipToBounds;
-                    node.LayoutBounds = globalBounds;
-                    node.ClipToBoundsRadius = clipToBoundsRadius;
-                    node.GeometryClip = visual.Clip?.PlatformImpl;
-                    node.Opacity = opacity;
-
-                    // TODO: Check equality between node.OpacityMask and visual.OpacityMask before assigning.
-                    node.OpacityMask = visual.OpacityMask?.ToImmutable();
-
-                    if (ShouldStartLayer(visual))
-                    {
-                        if (node.LayerRoot != visual)
-                        {
-                            MakeLayer(scene, node);
-                        }
-                        else
-                        {
-                            UpdateLayer(node, scene.Layers[node.LayerRoot]);
-                        }
-                    }
-                    else if (node.LayerRoot == node.Visual && node.Parent != null)
-                    {
-                        ClearLayer(scene, node);
-                    }
-
-                    if (node.ClipToBounds)
-                    {
-                        clip = clip.Intersect(node.ClipBounds);
-                    }
-
-                    try
-                    {
-                        visual.Render(context);
-                    }
-                    catch { }
-
-                    var transformed = new TransformedBounds(new Rect(visual.Bounds.Size), clip, node.Transform);
-                    visual.TransformedBounds = transformed;
-
-                    if (forceRecurse)
-                    {
-                        var visualChildren = (IList<IVisual>) visual.VisualChildren;
-
-                        node.TryPreallocateChildren(visualChildren.Count);
-
-                        if (visualChildren.Count == 1)
-                        {
-                            var childNode = GetOrCreateChildNode(scene, visualChildren[0], node);
-                            Update(context, scene, (VisualNode)childNode, clip, forceRecurse);
-                        }
-                        else if (visualChildren.Count > 1)
-                        {
-                            var count = visualChildren.Count;
-                            var sortedChildren = new (IVisual visual, int index)[count];
-
-                            for (var i = 0; i < count; i++)
-                            {
-                                sortedChildren[i] = (visualChildren[i], i);
-                            }
-
-                            // Regular Array.Sort is unstable, we need to provide indices as well to avoid reshuffling elements.
-                            Array.Sort(sortedChildren, (lhs, rhs) =>
-                            {
-                                var result = ZIndexComparer.Instance.Compare(lhs.visual, rhs.visual);
-
-                                return result == 0 ? lhs.index.CompareTo(rhs.index) : result;
-                            });
-
-                            foreach (var child in sortedChildren)
-                            {
-                                var childNode = GetOrCreateChildNode(scene, child.Item1, node);
-                                Update(context, scene, (VisualNode)childNode, clip, forceRecurse);
-                            }
-                        }
-
-                        node.SubTreeUpdated = true;
-                        contextImpl.TrimChildren();
-                    }
-                }
-            }
-            else
-            {
-                contextImpl.BeginUpdate(node).Dispose();
-            }
-        }
-
-        private void UpdateSize(Scene scene)
-        {
-            var renderRoot = scene.Root.Visual as IRenderRoot;
-            var newSize = renderRoot?.ClientSize ?? scene.Root.Visual.Bounds.Size;
-
-            scene.Scaling = renderRoot?.RenderScaling ?? 1;
-
-            if (scene.Size != newSize)
-            {
-                var oldSize = scene.Size;
-
-                scene.Size = newSize;
-
-                Rect horizontalDirtyRect = Rect.Empty;
-                Rect verticalDirtyRect = Rect.Empty;
-
-                if (newSize.Width > oldSize.Width)
-                {
-                    horizontalDirtyRect = new Rect(oldSize.Width, 0, newSize.Width - oldSize.Width, oldSize.Height);
-                }
-
-                if (newSize.Height > oldSize.Height)
-                {
-                    verticalDirtyRect = new Rect(0, oldSize.Height, newSize.Width, newSize.Height - oldSize.Height);
-                }
-
-                foreach (var layer in scene.Layers)
-                {
-                    layer.Dirty.Add(horizontalDirtyRect);
-                    layer.Dirty.Add(verticalDirtyRect);
-                }
-            }
-        }
-
-        private static VisualNode CreateNode(Scene scene, IVisual visual, VisualNode parent)
-        {
-            var node = new VisualNode(visual, parent);
-            node.LayerRoot = parent.LayerRoot;
-            scene.Add(node);
-            return node;
-        }
-
-        private static void Deindex(Scene scene, VisualNode node)
-        {
-            var nodeChildren = node.Children;
-            var nodeChildrenCount = nodeChildren.Count;
-
-            for (var i = 0; i < nodeChildrenCount; i++)
-            {
-                if (nodeChildren[i] is VisualNode visual)
-                {
-                    Deindex(scene, visual);
-                }
-            }
-
-            scene.Remove(node);
-
-            node.SubTreeUpdated = true;
-
-            scene.Layers[node.LayerRoot!].Dirty.Add(node.Bounds);
-
-            node.Visual.TransformedBounds = null;
-
-            if (node.LayerRoot == node.Visual && node.Visual != scene.Root.Visual)
-            {
-                scene.Layers.Remove(node.LayerRoot);
-            }
-        }
-
-        private static void ClearLayer(Scene scene, VisualNode node)
-        {
-            var parent = (VisualNode)node.Parent!;
-            var oldLayerRoot = node.LayerRoot;
-            var newLayerRoot = parent.LayerRoot!;
-            var existingDirtyRects = scene.Layers[node.LayerRoot!].Dirty;
-            var newDirtyRects = scene.Layers[newLayerRoot].Dirty;
-
-            existingDirtyRects.Coalesce();
-
-            foreach (var r in existingDirtyRects)
-            {
-                newDirtyRects.Add(r);
-            }
-
-            var oldLayer = scene.Layers[oldLayerRoot!];
-            PropagateLayer(node, scene.Layers[newLayerRoot], oldLayer);
-            scene.Layers.Remove(oldLayer);
-        }
-
-        private static void MakeLayer(Scene scene, VisualNode node)
-        {
-            var oldLayerRoot = node.LayerRoot!;
-            var layer = scene.Layers.Add(node.Visual);
-            var oldLayer = scene.Layers[oldLayerRoot!];
-
-            UpdateLayer(node, layer);
-            PropagateLayer(node, layer, scene.Layers[oldLayerRoot]);
-        }
-
-        private static void UpdateLayer(VisualNode node, SceneLayer layer)
-        {
-            layer.Opacity = node.Visual.Opacity;
-
-            if (node.Visual.OpacityMask != null)
-            {
-                layer.OpacityMask = node.Visual.OpacityMask?.ToImmutable();
-                layer.OpacityMaskRect = node.ClipBounds;
-            }
-            else
-            {
-                layer.OpacityMask = null;
-                layer.OpacityMaskRect = Rect.Empty;
-            }
-
-            layer.GeometryClip = node.HasAncestorGeometryClip ?
-                CreateLayerGeometryClip(node) :
-                null;
-        }
-
-        private static void PropagateLayer(VisualNode node, SceneLayer layer, SceneLayer oldLayer)
-        {
-            node.LayerRoot = layer.LayerRoot;
-
-            layer.Dirty.Add(node.Bounds);
-            oldLayer.Dirty.Add(node.Bounds);
-
-            foreach (VisualNode child in node.Children)
-            {
-                // If the child is not the start of a new layer, recurse.
-                if (child.LayerRoot != child.Visual)
-                {
-                    PropagateLayer(child, layer, oldLayer);
-                }
-            }
-        }
-
-        // HACK: Disabled layers because they're broken in current renderer. See #2244.
-        private static bool ShouldStartLayer(IVisual visual) => false;
-
-        private static IGeometryImpl? CreateLayerGeometryClip(VisualNode node)
-        {
-            IGeometryImpl? result = null;
-            VisualNode? n = node;
-
-            for (;;)
-            {
-                n = (VisualNode?)n!.Parent;
-
-                if (n == null || (n.GeometryClip == null && !n.HasAncestorGeometryClip))
-                {
-                    break;
-                }
-
-                if (n?.GeometryClip != null)
-                {
-                    var transformed = n.GeometryClip.WithTransform(n.Transform);
-
-                    result = result == null ? transformed : result.Intersect(transformed);
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Visual.cs b/src/Avalonia.Visuals/Visual.cs
deleted file mode 100644
index 324b253a0f..0000000000
--- a/src/Avalonia.Visuals/Visual.cs
+++ /dev/null
@@ -1,649 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using Avalonia.Collections;
-using Avalonia.Data;
-using Avalonia.Logging;
-using Avalonia.LogicalTree;
-using Avalonia.Media;
-using Avalonia.Metadata;
-using Avalonia.Rendering;
-using Avalonia.Utilities;
-using Avalonia.VisualTree;
-
-#nullable enable
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Base class for controls that provides rendering and related visual properties.
-    /// </summary>
-    /// <remarks>
-    /// The <see cref="Visual"/> class represents elements that have a visual on-screen
-    /// representation and stores all the information needed for an 
-    /// <see cref="IRenderer"/> to render the control. To traverse the visual tree, use the
-    /// extension methods defined in <see cref="VisualExtensions"/>.
-    /// </remarks>
-    [UsableDuringInitialization]
-    public class Visual : StyledElement, IVisual
-    {
-        /// <summary>
-        /// Defines the <see cref="Bounds"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Visual, Rect> BoundsProperty =
-            AvaloniaProperty.RegisterDirect<Visual, Rect>(nameof(Bounds), o => o.Bounds);
-
-        public static readonly DirectProperty<Visual, TransformedBounds?> TransformedBoundsProperty =
-            AvaloniaProperty.RegisterDirect<Visual, TransformedBounds?>(
-                nameof(TransformedBounds),
-                o => o.TransformedBounds);
-
-        /// <summary>
-        /// Defines the <see cref="ClipToBounds"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> ClipToBoundsProperty =
-            AvaloniaProperty.Register<Visual, bool>(nameof(ClipToBounds));
-
-        /// <summary>
-        /// Defines the <see cref="Clip"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Geometry?> ClipProperty =
-            AvaloniaProperty.Register<Visual, Geometry?>(nameof(Clip));
-
-        /// <summary>
-        /// Defines the <see cref="IsVisibleProperty"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> IsVisibleProperty =
-            AvaloniaProperty.Register<Visual, bool>(nameof(IsVisible), true);
-
-        /// <summary>
-        /// Defines the <see cref="Opacity"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> OpacityProperty =
-            AvaloniaProperty.Register<Visual, double>(nameof(Opacity), 1);
-
-        /// <summary>
-        /// Defines the <see cref="OpacityMask"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IBrush?> OpacityMaskProperty =
-            AvaloniaProperty.Register<Visual, IBrush?>(nameof(OpacityMask));
-
-        /// <summary>
-        /// Defines the <see cref="RenderTransform"/> property.
-        /// </summary>
-        public static readonly StyledProperty<ITransform?> RenderTransformProperty =
-            AvaloniaProperty.Register<Visual, ITransform?>(nameof(RenderTransform));
-
-        /// <summary>
-        /// Defines the <see cref="RenderTransformOrigin"/> property.
-        /// </summary>
-        public static readonly StyledProperty<RelativePoint> RenderTransformOriginProperty =
-            AvaloniaProperty.Register<Visual, RelativePoint>(nameof(RenderTransformOrigin), defaultValue: RelativePoint.Center);
-
-        /// <summary>
-        /// Defines the <see cref="IVisual.VisualParent"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Visual, IVisual?> VisualParentProperty =
-            AvaloniaProperty.RegisterDirect<Visual, IVisual?>(nameof(IVisual.VisualParent), o => o._visualParent);
-
-        /// <summary>
-        /// Defines the <see cref="ZIndex"/> property.
-        /// </summary>
-        public static readonly StyledProperty<int> ZIndexProperty =
-            AvaloniaProperty.Register<Visual, int>(nameof(ZIndex));
-
-        private Rect _bounds;
-        private TransformedBounds? _transformedBounds;
-        private IRenderRoot? _visualRoot;
-        private IVisual? _visualParent;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="Visual"/> class.
-        /// </summary>
-        static Visual()
-        {
-            AffectsRender<Visual>(
-                BoundsProperty,
-                ClipProperty,
-                ClipToBoundsProperty,
-                IsVisibleProperty,
-                OpacityProperty);
-            RenderTransformProperty.Changed.Subscribe(RenderTransformChanged);
-            ZIndexProperty.Changed.Subscribe(ZIndexChanged);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Visual"/> class.
-        /// </summary>
-        public Visual()
-        {
-            // Disable transitions until we're added to the visual tree.
-            DisableTransitions();
-
-            var visualChildren = new AvaloniaList<IVisual>();
-            visualChildren.ResetBehavior = ResetBehavior.Remove;
-            visualChildren.Validate = visual => ValidateVisualChild(visual);
-            visualChildren.CollectionChanged += VisualChildrenChanged;
-            VisualChildren = visualChildren;
-        }
-
-        /// <summary>
-        /// Raised when the control is attached to a rooted visual tree.
-        /// </summary>
-        public event EventHandler<VisualTreeAttachmentEventArgs>? AttachedToVisualTree;
-
-        /// <summary>
-        /// Raised when the control is detached from a rooted visual tree.
-        /// </summary>
-        public event EventHandler<VisualTreeAttachmentEventArgs>? DetachedFromVisualTree;
-
-        /// <summary>
-        /// Gets the bounds of the control relative to its parent.
-        /// </summary>
-        public Rect Bounds
-        {
-            get { return _bounds; }
-            protected set { SetAndRaise(BoundsProperty, ref _bounds, value); }
-        }
-
-        /// <summary>
-        /// Gets the bounds of the control relative to the window, accounting for rendering transforms.
-        /// </summary>
-        public TransformedBounds? TransformedBounds => _transformedBounds;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the control should be clipped to its bounds.
-        /// </summary>
-        public bool ClipToBounds
-        {
-            get { return GetValue(ClipToBoundsProperty); }
-            set { SetValue(ClipToBoundsProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the geometry clip for this visual.
-        /// </summary>
-        public Geometry? Clip
-        {
-            get { return GetValue(ClipProperty); }
-            set { SetValue(ClipProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this control and all its parents are visible.
-        /// </summary>
-        public bool IsEffectivelyVisible
-        {
-            get
-            {
-                IVisual? node = this;
-
-                while (node != null)
-                {
-                    if (!node.IsVisible)
-                    {
-                        return false;
-                    }
-
-                    node = node.VisualParent;
-                }
-
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this control is visible.
-        /// </summary>
-        public bool IsVisible
-        {
-            get { return GetValue(IsVisibleProperty); }
-            set { SetValue(IsVisibleProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the opacity of the control.
-        /// </summary>
-        public double Opacity
-        {
-            get { return GetValue(OpacityProperty); }
-            set { SetValue(OpacityProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the opacity mask of the control.
-        /// </summary>
-        public IBrush? OpacityMask
-        {
-            get { return GetValue(OpacityMaskProperty); }
-            set { SetValue(OpacityMaskProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the render transform of the control.
-        /// </summary>
-        public ITransform? RenderTransform
-        {
-            get { return GetValue(RenderTransformProperty); }
-            set { SetValue(RenderTransformProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the transform origin of the control.
-        /// </summary>
-        public RelativePoint RenderTransformOrigin
-        {
-            get { return GetValue(RenderTransformOriginProperty); }
-            set { SetValue(RenderTransformOriginProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z index of the control.
-        /// </summary>
-        /// <remarks>
-        /// Controls with a higher <see cref="ZIndex"/> will appear in front of controls with
-        /// a lower ZIndex. If two controls have the same ZIndex then the control that appears
-        /// later in the containing element's children collection will appear on top.
-        /// </remarks>
-        public int ZIndex
-        {
-            get { return GetValue(ZIndexProperty); }
-            set { SetValue(ZIndexProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets the control's child visuals.
-        /// </summary>
-        protected IAvaloniaList<IVisual> VisualChildren
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets the root of the visual tree, if the control is attached to a visual tree.
-        /// </summary>
-        protected IRenderRoot? VisualRoot => _visualRoot ?? (this as IRenderRoot);
-
-        /// <summary>
-        /// Gets a value indicating whether this control is attached to a visual root.
-        /// </summary>
-        bool IVisual.IsAttachedToVisualTree => VisualRoot != null;
-
-        /// <summary>
-        /// Gets the control's child controls.
-        /// </summary>
-        IAvaloniaReadOnlyList<IVisual> IVisual.VisualChildren => VisualChildren;
-
-        /// <summary>
-        /// Gets the control's parent visual.
-        /// </summary>
-        IVisual? IVisual.VisualParent => _visualParent;
-
-        /// <summary>
-        /// Gets the root of the visual tree, if the control is attached to a visual tree.
-        /// </summary>
-        IRenderRoot? IVisual.VisualRoot => VisualRoot;
-        
-        TransformedBounds? IVisual.TransformedBounds
-        {
-            get { return _transformedBounds; }
-            set { SetAndRaise(TransformedBoundsProperty, ref _transformedBounds, value); }
-        }
-
-        /// <summary>
-        /// Invalidates the visual and queues a repaint.
-        /// </summary>
-        public void InvalidateVisual()
-        {
-            VisualRoot?.Renderer?.AddDirty(this);
-        }
-
-        /// <summary>
-        /// Renders the visual to a <see cref="DrawingContext"/>.
-        /// </summary>
-        /// <param name="context">The drawing context.</param>
-        public virtual void Render(DrawingContext context)
-        {
-            Contract.Requires<ArgumentNullException>(context != null);
-        }
-
-        /// <summary>
-        /// Indicates that a property change should cause <see cref="InvalidateVisual"/> to be
-        /// called.
-        /// </summary>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// This method should be called in a control's static constructor with each property
-        /// on the control which when changed should cause a redraw. This is similar to WPF's
-        /// FrameworkPropertyMetadata.AffectsRender flag.
-        /// </remarks>
-        [Obsolete("Use AffectsRender<T> and specify the control type.")]
-        protected static void AffectsRender(params AvaloniaProperty[] properties)
-        {
-            AffectsRender<Visual>(properties);
-        }
-
-        /// <summary>
-        /// Indicates that a property change should cause <see cref="InvalidateVisual"/> to be
-        /// called.
-        /// </summary>
-        /// <typeparam name="T">The control which the property affects.</typeparam>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// This method should be called in a control's static constructor with each property
-        /// on the control which when changed should cause a redraw. This is similar to WPF's
-        /// FrameworkPropertyMetadata.AffectsRender flag.
-        /// </remarks>
-        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
-            where T : Visual
-        {
-            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
-            {
-                if (e.Sender is T sender)
-                {
-                    sender.InvalidateVisual();
-                }
-            }
-
-            static void InvalidateAndSubscribe(AvaloniaPropertyChangedEventArgs e)
-            {
-                if (e.Sender is T sender)
-                {
-                    if (e.OldValue is IAffectsRender oldValue)
-                    {
-                        WeakEventHandlerManager.Unsubscribe<EventArgs, T>(oldValue, nameof(oldValue.Invalidated), sender.AffectsRenderInvalidated);
-                    }
-
-                    if (e.NewValue is IAffectsRender newValue)
-                    {
-                        WeakEventHandlerManager.Subscribe<IAffectsRender, EventArgs, T>(newValue, nameof(newValue.Invalidated), sender.AffectsRenderInvalidated);
-                    }
-
-                    sender.InvalidateVisual();
-                }
-            }
-
-            foreach (var property in properties)
-            {
-                if (property.CanValueAffectRender())
-                {
-                    property.Changed.Subscribe(e => InvalidateAndSubscribe(e));
-                }
-                else
-                {
-                    property.Changed.Subscribe(e => Invalidate(e));
-                }
-            }
-        }
-
-        protected override void LogicalChildrenCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            base.LogicalChildrenCollectionChanged(sender, e);
-            VisualRoot?.Renderer?.RecalculateChildren(this);
-        }
-
-        /// <summary>
-        /// Calls the <see cref="OnAttachedToVisualTree(VisualTreeAttachmentEventArgs)"/> method 
-        /// for this control and all of its visual descendants.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
-        {
-            Logger.TryGet(LogEventLevel.Verbose, LogArea.Visual)?.Log(this, "Attached to visual tree");
-
-            _visualRoot = e.Root;
-
-            if (RenderTransform is IMutableTransform mutableTransform)
-            {
-                mutableTransform.Changed += RenderTransformChanged;
-            }
-
-            EnableTransitions();
-            OnAttachedToVisualTree(e);
-            AttachedToVisualTree?.Invoke(this, e);
-            InvalidateVisual();
-
-            var visualChildren = VisualChildren;
-
-            if (visualChildren != null)
-            {
-                var visualChildrenCount = visualChildren.Count;
-
-                for (var i = 0; i < visualChildrenCount; i++)
-                {
-                    if (visualChildren[i] is Visual child)
-                    {
-                        child.OnAttachedToVisualTreeCore(e);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Calls the <see cref="OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs)"/> method 
-        /// for this control and all of its visual descendants.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
-        {
-            Logger.TryGet(LogEventLevel.Verbose, LogArea.Visual)?.Log(this, "Detached from visual tree");
-
-            _visualRoot = null;
-
-            if (RenderTransform is IMutableTransform mutableTransform)
-            {
-                mutableTransform.Changed -= RenderTransformChanged;
-            }
-
-            DisableTransitions();
-            OnDetachedFromVisualTree(e);
-            DetachedFromVisualTree?.Invoke(this, e);
-            e.Root?.Renderer?.AddDirty(this);
-
-            var visualChildren = VisualChildren;
-
-            if (visualChildren != null)
-            {
-                var visualChildrenCount = visualChildren.Count;
-
-                for (var i = 0; i < visualChildrenCount; i++)
-                {
-                    if (visualChildren[i] is Visual child)
-                    {
-                        child.OnDetachedFromVisualTreeCore(e);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Called when the control is added to a rooted visual tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called when the control is removed from a rooted visual tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called when the control's visual parent changes.
-        /// </summary>
-        /// <param name="oldParent">The old visual parent.</param>
-        /// <param name="newParent">The new visual parent.</param>
-        protected virtual void OnVisualParentChanged(IVisual? oldParent, IVisual? newParent)
-        {
-            RaisePropertyChanged(
-                VisualParentProperty,
-                new Optional<IVisual?>(oldParent),
-                new BindingValue<IVisual?>(newParent),
-                BindingPriority.LocalValue);
-        }
-
-        protected internal sealed override void LogBindingError(AvaloniaProperty property, Exception e)
-        {
-            // Don't log a binding error unless the control is attached to a logical tree.
-            if (((ILogical)this).IsAttachedToLogicalTree)
-            {
-                if (e is BindingChainException b &&
-                    string.IsNullOrEmpty(b.ExpressionErrorPoint) &&
-                    DataContext == null)
-                {
-                    // The error occurred at the root of the binding chain and DataContext is null;
-                    // don't log this - the DataContext probably hasn't been set up yet.
-                    return;
-                }
-
-                Logger.TryGet(LogEventLevel.Warning, LogArea.Binding)?.Log(
-                    this,
-                    "Error in binding to {Target}.{Property}: {Message}",
-                    this,
-                    property,
-                    e.Message);
-            }
-        }
-
-        /// <summary>
-        /// Called when a visual's <see cref="RenderTransform"/> changes.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void RenderTransformChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var sender = e.Sender as Visual;
-
-            if (sender?.VisualRoot != null)
-            {
-                var oldValue = e.OldValue as Transform;
-                var newValue = e.NewValue as Transform;
-
-                if (oldValue != null)
-                {
-                    oldValue.Changed -= sender.RenderTransformChanged;
-                }
-
-                if (newValue != null)
-                {
-                    newValue.Changed += sender.RenderTransformChanged;
-                }
-
-                sender.InvalidateVisual();
-            }
-        }
-
-        /// <summary>
-        /// Ensures a visual child is not null and not already parented.
-        /// </summary>
-        /// <param name="c">The visual child.</param>
-        private static void ValidateVisualChild(IVisual c)
-        {
-            if (c == null)
-            {
-                throw new ArgumentNullException(nameof(c), "Cannot add null to VisualChildren.");
-            }
-
-            if (c.VisualParent != null)
-            {
-                throw new InvalidOperationException("The control already has a visual parent.");
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="ZIndex"/> property changes on any control.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void ZIndexChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var sender = e.Sender as IVisual;
-            var parent = sender?.VisualParent;
-            sender?.InvalidateVisual();
-            parent?.VisualRoot?.Renderer?.RecalculateChildren(parent);
-        }
-
-        /// <summary>
-        /// Called when the <see cref="RenderTransform"/>'s <see cref="Transform.Changed"/> event
-        /// is fired.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="e">The event args.</param>
-        private void RenderTransformChanged(object? sender, EventArgs e)
-        {
-            InvalidateVisual();
-        }
-
-        /// <summary>
-        /// Sets the visual parent of the Visual.
-        /// </summary>
-        /// <param name="value">The visual parent.</param>
-        private void SetVisualParent(Visual? value)
-        {
-            if (_visualParent == value)
-            {
-                return;
-            }
-
-            var old = _visualParent;
-            _visualParent = value;
-
-            if (_visualRoot != null)
-            {
-                var e = new VisualTreeAttachmentEventArgs(old!, _visualRoot);
-                OnDetachedFromVisualTreeCore(e);
-            }
-
-            if (_visualParent is IRenderRoot || _visualParent?.IsAttachedToVisualTree == true)
-            {
-                var root = this.FindAncestorOfType<IRenderRoot>() ??
-                    throw new AvaloniaInternalException("Visual is atached to visual tree but root could not be found.");
-                var e = new VisualTreeAttachmentEventArgs(_visualParent, root);
-                OnAttachedToVisualTreeCore(e);
-            }
-
-            OnVisualParentChanged(old, value);
-        }
-
-        private void AffectsRenderInvalidated(object? sender, EventArgs e) => InvalidateVisual();
-
-        /// <summary>
-        /// Called when the <see cref="VisualChildren"/> collection changes.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="e">The event args.</param>
-        private void VisualChildrenChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    SetVisualParent(e.NewItems!, this);
-                    break;
-
-                case NotifyCollectionChangedAction.Remove:
-                    SetVisualParent(e.OldItems!, null);
-                    break;
-
-                case NotifyCollectionChangedAction.Replace:
-                    SetVisualParent(e.OldItems!, null);
-                    SetVisualParent(e.NewItems!, this);
-                    break;
-            }
-        }
-        
-        private static void SetVisualParent(IList children, Visual? parent)
-        {
-            var count = children.Count;
-
-            for (var i = 0; i < count; i++)
-            {
-                var visual = (Visual) children[i]!;
-                
-                visual.SetVisualParent(parent);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/VisualExtensions.cs b/src/Avalonia.Visuals/VisualExtensions.cs
deleted file mode 100644
index ff8a515db3..0000000000
--- a/src/Avalonia.Visuals/VisualExtensions.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System;
-using Avalonia.VisualTree;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Extension methods for <see cref="IVisual"/>.
-    /// </summary>
-    public static class VisualExtensions
-    {
-        /// <summary>
-        /// Converts a point from screen to client coordinates.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="point">The point in screen coordinates.</param>
-        /// <returns>The point in client coordinates.</returns>
-        public static Point PointToClient(this IVisual visual, PixelPoint point)
-        {
-            var root = visual.VisualRoot ??
-                throw new ArgumentException("Control does not belong to a visual tree.", nameof(visual));
-            var rootPoint = root.PointToClient(point);
-            return root.TranslatePoint(rootPoint, visual)!.Value;
-        }
-
-        /// <summary>
-        /// Converts a point from client to screen coordinates.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="point">The point in client coordinates.</param>
-        /// <returns>The point in screen coordinates.</returns>
-        public static PixelPoint PointToScreen(this IVisual visual, Point point)
-        {
-            var root = visual.VisualRoot ??
-                throw new ArgumentException("Control does not belong to a visual tree.", nameof(visual));
-            var p = visual.TranslatePoint(point, root);
-            return visual.VisualRoot.PointToScreen(p!.Value);
-        }
-
-        /// <summary>
-        /// Returns a transform that transforms the visual's coordinates into the coordinates
-        /// of the specified <paramref name="to"/>.
-        /// </summary>
-        /// <param name="from">The visual whose coordinates are to be transformed.</param>
-        /// <param name="to">The visual to translate the coordinates to.</param>
-        /// <returns>
-        /// A <see cref="Matrix"/> containing the transform or null if the visuals don't share a
-        /// common ancestor.
-        /// </returns>
-        public static Matrix? TransformToVisual(this IVisual from, IVisual to)
-        {
-            var common = from.FindCommonVisualAncestor(to);
-
-            if (common != null)
-            {
-                var thisOffset = GetOffsetFrom(common, from);
-                var thatOffset = GetOffsetFrom(common, to);
-
-                if (!thatOffset.TryInvert(out var thatOffsetInverted))
-                {
-                    return null;
-                }
-
-                return thatOffsetInverted * thisOffset;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Translates a point relative to this visual to coordinates that are relative to the specified visual.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="point">The point value, as relative to this visual.</param>
-        /// <param name="relativeTo">The visual to translate the given point into.</param>
-        /// <returns>
-        /// A point value, now relative to the target visual rather than this source element, or null if the
-        /// two elements have no common ancestor.
-        /// </returns>
-        public static Point? TranslatePoint(this IVisual visual, Point point, IVisual relativeTo)
-        {
-            var transform = visual.TransformToVisual(relativeTo);
-
-            if (transform.HasValue)
-            {
-                return point.Transform(transform.Value);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets a transform from an ancestor to a descendent.
-        /// </summary>
-        /// <param name="ancestor">The ancestor visual.</param>
-        /// <param name="visual">The visual.</param>
-        /// <returns>The transform.</returns>
-        private static Matrix GetOffsetFrom(IVisual ancestor, IVisual visual)
-        {
-            var result = Matrix.Identity;
-            IVisual? v = visual;
-
-            while (v != ancestor)
-            {
-                if (v.RenderTransform?.Value != null)
-                {
-                    var origin = v.RenderTransformOrigin.ToPixels(v.Bounds.Size);
-                    var offset = Matrix.CreateTranslation(origin);
-                    var renderTransform = (-offset) * v.RenderTransform.Value * (offset);
-
-                    result *= renderTransform;
-                }
-
-                var topLeft = v.Bounds.TopLeft;
-
-                if (topLeft != default)
-                {
-                    result *= Matrix.CreateTranslation(topLeft);
-                }
-
-                v = v.VisualParent;
-
-                if (v == null)
-                {
-                    throw new ArgumentException("'visual' is not a descendant of 'ancestor'.");
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/VisualTree/IVisual.cs b/src/Avalonia.Visuals/VisualTree/IVisual.cs
deleted file mode 100644
index 97c4554de6..0000000000
--- a/src/Avalonia.Visuals/VisualTree/IVisual.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using Avalonia.Collections;
-using Avalonia.Media;
-using Avalonia.Rendering;
-
-#nullable enable
-
-namespace Avalonia.VisualTree
-{
-    /// <summary>
-    /// Represents control that has a visual on-screen representation.
-    /// </summary>
-    /// <remarks>
-    /// The <see cref="IVisual"/> interface defines the interface required for a renderer to
-    /// render a control. You should not usually need to reference this interface unless
-    /// you are writing a renderer; instead use the extension methods defined in
-    /// <see cref="VisualExtensions"/> to traverse the visual tree. This interface is
-    /// implemented by <see cref="Visual"/>. It should not be necessary to implement it
-    /// anywhere else.
-    /// </remarks>
-    public interface IVisual
-    {
-        /// <summary>
-        /// Raised when the control is attached to a rooted visual tree.
-        /// </summary>
-        event EventHandler<VisualTreeAttachmentEventArgs>? AttachedToVisualTree;
-
-        /// <summary>
-        /// Raised when the control is detached from a rooted visual tree.
-        /// </summary>
-        event EventHandler<VisualTreeAttachmentEventArgs>? DetachedFromVisualTree;
-
-        /// <summary>
-        /// Gets the bounds of the control relative to its parent.
-        /// </summary>
-        Rect Bounds { get; }
-
-        /// <summary>
-        /// Gets the bounds of the control relative to the window, accounting for rendering transforms.
-        /// </summary>
-        TransformedBounds? TransformedBounds { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the control should be clipped to its bounds.
-        /// </summary>
-        bool ClipToBounds { get; set; }
-
-        /// <summary>
-        /// Gets or sets the geometry clip for this visual.
-        /// </summary>
-        Geometry? Clip { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether this control is attached to a visual root.
-        /// </summary>
-        bool IsAttachedToVisualTree { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this control and all its parents are visible.
-        /// </summary>
-        bool IsEffectivelyVisible { get; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this control is visible.
-        /// </summary>
-        bool IsVisible { get; set; }
-
-        /// <summary>
-        /// Gets or sets the opacity of the control.
-        /// </summary>
-        double Opacity { get; set; }
-
-        /// <summary>
-        /// Gets or sets the opacity mask for the control.
-        /// </summary>
-        IBrush? OpacityMask { get; set; }
-
-        /// <summary>
-        /// Gets or sets the render transform of the control.
-        /// </summary>
-        ITransform? RenderTransform { get; set; }
-
-        /// <summary>
-        /// Gets or sets the render transform origin of the control.
-        /// </summary>
-        RelativePoint RenderTransformOrigin { get; set; }
-
-        /// <summary>
-        /// Gets the control's child visuals.
-        /// </summary>
-        IAvaloniaReadOnlyList<IVisual> VisualChildren { get; }
-
-        /// <summary>
-        /// Gets the control's parent visual.
-        /// </summary>
-        IVisual? VisualParent { get; }
-
-        /// <summary>
-        /// Gets the root of the visual tree, if the control is attached to a visual tree.
-        /// </summary>
-        IRenderRoot? VisualRoot { get; }
-
-        /// <summary>
-        /// Gets or sets the Z index of the node.
-        /// </summary>
-        int ZIndex { get; set; }
-
-        /// <summary>
-        /// Invalidates the visual and queues a repaint.
-        /// </summary>
-        void InvalidateVisual();
-
-        /// <summary>
-        /// Renders the control to a <see cref="DrawingContext"/>.
-        /// </summary>
-        /// <param name="context">The context.</param>
-        void Render(DrawingContext context);
-    }
-}
diff --git a/src/Avalonia.X11/Glx/GlxDisplay.cs b/src/Avalonia.X11/Glx/GlxDisplay.cs
index fcdc10e999..1e70608168 100644
--- a/src/Avalonia.X11/Glx/GlxDisplay.cs
+++ b/src/Avalonia.X11/Glx/GlxDisplay.cs
@@ -9,7 +9,7 @@ namespace Avalonia.X11.Glx
     unsafe class GlxDisplay
     {
         private readonly X11Info _x11;
-        private readonly List<GlVersion> _probeProfiles;
+        private readonly GlVersion[] _probeProfiles;
         private readonly IntPtr _fbconfig;
         private readonly XVisualInfo* _visual;
         private string[] _displayExtensions;
@@ -21,7 +21,7 @@ namespace Avalonia.X11.Glx
         public GlxDisplay(X11Info x11, IList<GlVersion> probeProfiles) 
         {
             _x11 = x11;
-            _probeProfiles = probeProfiles.ToList();
+            _probeProfiles = probeProfiles.ToArray();
             _displayExtensions = Glx.GetExtensions(_x11.Display);
 
             var baseAttribs = new[]
@@ -76,10 +76,10 @@ namespace Avalonia.X11.Glx
             if (Glx.GetFBConfigAttrib(_x11.Display, _fbconfig, GLX_STENCIL_SIZE, out var stencil) == 0)
                 stencilSize = stencil;
 
-            var pbuffers = Enumerable.Range(0, 2).Select(_ => Glx.CreatePbuffer(_x11.Display, _fbconfig, new[]
-            {
-                GLX_PBUFFER_WIDTH, 1, GLX_PBUFFER_HEIGHT, 1, 0
-            })).ToList();
+            var attributes = new[] { GLX_PBUFFER_WIDTH, 1, GLX_PBUFFER_HEIGHT, 1, 0 };
+            
+            Glx.CreatePbuffer(_x11.Display, _fbconfig, attributes);
+            Glx.CreatePbuffer(_x11.Display, _fbconfig, attributes);
             
             XLib.XFlush(_x11.Display);
 
@@ -104,7 +104,6 @@ namespace Avalonia.X11.Glx
                                     $"Renderer '{glInterface.Renderer}' is blacklisted by '{item}'");
                 }
             }
-
         }
 
         IntPtr CreatePBuffer()
diff --git a/src/Avalonia.X11/ICELib.cs b/src/Avalonia.X11/ICELib.cs
index 8ef21dd000..19c973a5e0 100644
--- a/src/Avalonia.X11/ICELib.cs
+++ b/src/Avalonia.X11/ICELib.cs
@@ -46,7 +46,7 @@ namespace Avalonia.X11
             IntPtr iceConn,
             bool swap,
             int offendingMinorOpcode,
-            ulong offendingSequence,
+            nuint offendingSequence,
             int errorClass,
             int severity,
             IntPtr values
diff --git a/src/Avalonia.X11/NativeDialogs/Gtk.cs b/src/Avalonia.X11/NativeDialogs/Gtk.cs
index a0f146afa8..73e6a2d6a4 100644
--- a/src/Avalonia.X11/NativeDialogs/Gtk.cs
+++ b/src/Avalonia.X11/NativeDialogs/Gtk.cs
@@ -195,7 +195,10 @@ namespace Avalonia.X11.NativeDialogs
 
         [DllImport(GtkName)]
         public static extern void gtk_file_chooser_set_current_name(IntPtr chooser, Utf8Buffer file);
-        
+
+        [DllImport(GtkName)]
+        public static extern void gtk_file_chooser_set_current_folder(IntPtr chooser, Utf8Buffer file);
+
         [DllImport(GtkName)]
         public static extern IntPtr gtk_file_filter_new();
         
diff --git a/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs b/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs
index 1a6514eb03..9539f024b7 100644
--- a/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs
+++ b/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs
@@ -15,8 +15,9 @@ namespace Avalonia.X11.NativeDialogs
     class GtkSystemDialog : ISystemDialogImpl
     {
         private Task<bool> _initialized;
-        private unsafe  Task<string[]> ShowDialog(string title, IWindowImpl parent, GtkFileChooserAction action,
-            bool multiSelect, string initialFileName, IEnumerable<FileDialogFilter> filters, string defaultExtension, bool overwritePrompt)
+
+        private unsafe Task<string[]> ShowDialog(string title, IWindowImpl parent, GtkFileChooserAction action,
+            bool multiSelect, string initialDirectory, string initialFileName, IEnumerable<FileDialogFilter> filters, string defaultExtension, bool overwritePrompt)
         {
             IntPtr dlg;
             using (var name = new Utf8Buffer(title))
@@ -44,7 +45,7 @@ namespace Avalonia.X11.NativeDialogs
                     filtersDic[filter] = f;
                     using (var b = new Utf8Buffer(f.Name))
                         gtk_file_filter_set_name(filter, b);
-                    
+
                     foreach (var e in f.Extensions)
                         using (var b = new Utf8Buffer("*." + e))
                             gtk_file_filter_add_pattern(filter, b);
@@ -100,17 +101,32 @@ namespace Avalonia.X11.NativeDialogs
                 gtk_dialog_add_button(dlg, open, GtkResponseType.Accept);
             using (var open = new Utf8Buffer("Cancel"))
                 gtk_dialog_add_button(dlg, open, GtkResponseType.Cancel);
+
+            if (initialDirectory != null)
+            {
+                using var dir = new Utf8Buffer(initialDirectory);
+                gtk_file_chooser_set_current_folder(dlg, dir);
+            }
+
             if (initialFileName != null)
-                using (var fn = new Utf8Buffer(initialFileName))
+            {
+                // gtk_file_chooser_set_filename() expects full path
+                using var fn = action == GtkFileChooserAction.Open
+                    ? new Utf8Buffer(Path.Combine(initialDirectory ?? "", initialFileName))
+                    : new Utf8Buffer(initialFileName);
+
+                if (action == GtkFileChooserAction.Save)
                 {
-                    if (action == GtkFileChooserAction.Save)
-                        gtk_file_chooser_set_current_name(dlg, fn);
-                    else
-                        gtk_file_chooser_set_filename(dlg, fn);
+                    gtk_file_chooser_set_current_name(dlg, fn);
                 }
+                else
+                {
+                    gtk_file_chooser_set_filename(dlg, fn);
+                }
+            }
 
             gtk_file_chooser_set_do_overwrite_confirmation(dlg, overwritePrompt);
-            
+
             gtk_window_present(dlg);
             return tcs.Task;
         }
@@ -144,13 +160,15 @@ namespace Avalonia.X11.NativeDialogs
 
             var platformImpl = parent?.PlatformImpl;
 
-            return await await RunOnGlibThread(
-                () => ShowDialog(dialog.Title, platformImpl,
-                    dialog is OpenFileDialog ? GtkFileChooserAction.Open : GtkFileChooserAction.Save,
-                    (dialog as OpenFileDialog)?.AllowMultiple ?? false,
-                    Path.Combine(string.IsNullOrEmpty(dialog.Directory) ? "" : dialog.Directory,
-                        string.IsNullOrEmpty(dialog.InitialFileName) ? "" : dialog.InitialFileName), dialog.Filters,
-                    (dialog as SaveFileDialog)?.DefaultExtension, (dialog as SaveFileDialog)?.ShowOverwritePrompt ?? false));
+            return await await RunOnGlibThread(() => ShowDialog(
+                dialog.Title, platformImpl,
+                dialog is OpenFileDialog ? GtkFileChooserAction.Open : GtkFileChooserAction.Save,
+                (dialog as OpenFileDialog)?.AllowMultiple ?? false,
+                dialog.Directory,
+                dialog.InitialFileName,
+                dialog.Filters,
+                (dialog as SaveFileDialog)?.DefaultExtension,
+                (dialog as SaveFileDialog)?.ShowOverwritePrompt ?? false));
         }
 
         public async Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
@@ -161,12 +179,20 @@ namespace Avalonia.X11.NativeDialogs
 
             return await await RunOnGlibThread(async () =>
             {
-                var res = await ShowDialog(dialog.Title, platformImpl,
-                    GtkFileChooserAction.SelectFolder, false, dialog.Directory, null, null, false);
+                var res = await ShowDialog(
+                    dialog.Title,
+                    platformImpl,GtkFileChooserAction.SelectFolder,
+                    false,
+                    dialog.Directory,
+                    null,
+                    null,
+                    null,
+                    false);
+
                 return res?.FirstOrDefault();
             });
         }
-        
+
         async Task EnsureInitialized()
         {
             if (_initialized == null) _initialized = StartGtk();
@@ -174,7 +200,7 @@ namespace Avalonia.X11.NativeDialogs
             if (!(await _initialized))
                 throw new Exception("Unable to initialize GTK on separate thread");
         }
-        
+
         void UpdateParent(IntPtr chooser, IWindowImpl parentWindow)
         {
             var xid = parentWindow.Handle.Handle;
diff --git a/src/Avalonia.X11/SMLib.cs b/src/Avalonia.X11/SMLib.cs
index e2b39cfcff..f8f13e32f8 100644
--- a/src/Avalonia.X11/SMLib.cs
+++ b/src/Avalonia.X11/SMLib.cs
@@ -124,7 +124,7 @@ namespace Avalonia.X11
             IntPtr smcConn,
             bool swap,
             int offendingMinorOpcode,
-            ulong offendingSequence,
+            nuint offendingSequence,
             int errorClass,
             int severity,
             IntPtr values
diff --git a/src/Avalonia.X11/X11Atoms.cs b/src/Avalonia.X11/X11Atoms.cs
index b59883ef94..cfda68f9e8 100644
--- a/src/Avalonia.X11/X11Atoms.cs
+++ b/src/Avalonia.X11/X11Atoms.cs
@@ -155,6 +155,7 @@ namespace Avalonia.X11
         public readonly IntPtr _NET_FRAME_EXTENTS;
         public readonly IntPtr _NET_WM_PING;
         public readonly IntPtr _NET_WM_SYNC_REQUEST;
+        public readonly IntPtr _NET_WM_SYNC_REQUEST_COUNTER;
         public readonly IntPtr _NET_SYSTEM_TRAY_S;
         public readonly IntPtr _NET_SYSTEM_TRAY_ORIENTATION;
         public readonly IntPtr _NET_SYSTEM_TRAY_OPCODE;
diff --git a/src/Avalonia.X11/X11Globals.cs b/src/Avalonia.X11/X11Globals.cs
index 057693f810..39834a44b3 100644
--- a/src/Avalonia.X11/X11Globals.cs
+++ b/src/Avalonia.X11/X11Globals.cs
@@ -41,7 +41,7 @@ namespace Avalonia.X11
                 {
                     _wmName = value;
                     // The collection might change during enumeration
-                    foreach (var s in _subscribers.ToList()) 
+                    foreach (var s in _subscribers.ToArray()) 
                         s.WmChanged(value);
                 }
             }
@@ -69,7 +69,7 @@ namespace Avalonia.X11
                 {
                     _isCompositionEnabled = value;
                     // The collection might change during enumeration
-                    foreach (var s in _subscribers.ToList()) 
+                    foreach (var s in _subscribers.ToArray()) 
                         s.CompositionChanged(value);
                 }
             }
diff --git a/src/Avalonia.X11/X11IconLoader.cs b/src/Avalonia.X11/X11IconLoader.cs
index 6632573ba2..36939f4103 100644
--- a/src/Avalonia.X11/X11IconLoader.cs
+++ b/src/Avalonia.X11/X11IconLoader.cs
@@ -2,12 +2,9 @@ using System;
 using System.IO;
 using System.Runtime.InteropServices;
 using Avalonia.Controls.Platform.Surfaces;
-using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-using static Avalonia.X11.XLib;
+
 namespace Avalonia.X11
 {
     class X11IconLoader : IPlatformIconLoader
diff --git a/src/Avalonia.X11/X11Info.cs b/src/Avalonia.X11/X11Info.cs
index 9920907601..13dc460f45 100644
--- a/src/Avalonia.X11/X11Info.cs
+++ b/src/Avalonia.X11/X11Info.cs
@@ -33,6 +33,7 @@ namespace Avalonia.X11
         public IntPtr LastActivityTimestamp { get; set; }
         public XVisualInfo? TransparentVisualInfo { get; set; }
         public bool HasXim { get; set; }
+        public bool HasXSync { get; set; }
         public IntPtr DefaultFontSet { get; set; }
         
         public unsafe X11Info(IntPtr display, IntPtr deferredDisplay, bool useXim)
@@ -101,6 +102,15 @@ namespace Avalonia.X11
             {
                 //Ignore, XI is not supported
             }
+
+            try
+            {
+                HasXSync = XSyncInitialize(display, out _, out _) != Status.Success;
+            }
+            catch
+            {
+                //Ignore, XSync is not supported
+            }
         }
     }
 }
diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs
index ec3f29c806..fa7ae69759 100644
--- a/src/Avalonia.X11/X11Platform.cs
+++ b/src/Avalonia.X11/X11Platform.cs
@@ -5,6 +5,7 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
+using Avalonia.Dialogs;
 using Avalonia.FreeDesktop;
 using Avalonia.FreeDesktop.DBusIme;
 using Avalonia.Input;
@@ -15,7 +16,6 @@ using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.X11;
 using Avalonia.X11.Glx;
-using Avalonia.X11.NativeDialogs;
 using static Avalonia.X11.XLib;
 
 namespace Avalonia.X11
@@ -80,7 +80,7 @@ namespace Avalonia.X11
                 .Bind<IClipboard>().ToConstant(new X11Clipboard(this))
                 .Bind<IPlatformSettings>().ToConstant(new PlatformSettingsStub())
                 .Bind<IPlatformIconLoader>().ToConstant(new X11IconLoader(Info))
-                .Bind<ISystemDialogImpl>().ToConstant(new GtkSystemDialog())
+                .Bind<ISystemDialogImpl>().ToConstant(DBusSystemDialog.TryCreate() as ISystemDialogImpl ?? new ManagedFileDialogExtensions.ManagedSystemDialogImpl<Window>())
                 .Bind<IMountedVolumeInfoProvider>().ToConstant(new LinuxMountedVolumeInfoProvider())
                 .Bind<IPlatformLifetimeEventsImpl>().ToConstant(new X11PlatformLifetimeEvents(this));
             
@@ -209,10 +209,10 @@ namespace Avalonia
         public bool OverlayPopups { get; set; }
 
         /// <summary>
-        /// Enables global menu support on Linux desktop environments where it's supported (e. g. XFCE and MATE with plugin, KDE, etc).
-        /// The default value is false.
+        /// Enables native file dialogs as well as global menu support on Linux desktop environments where it's supported (e. g. XFCE and MATE with plugin, KDE, etc).
+        /// The default value is true.
         /// </summary>
-        public bool UseDBusMenu { get; set; }
+        public bool UseDBusMenu { get; set; } = true;
 
         /// <summary>
         /// Deferred renderer would be used when set to true. Immediate renderer when set to false. The default value is true.
diff --git a/src/Avalonia.X11/X11PlatformLifetimeEvents.cs b/src/Avalonia.X11/X11PlatformLifetimeEvents.cs
index 1a17a018e8..8412bd0730 100644
--- a/src/Avalonia.X11/X11PlatformLifetimeEvents.cs
+++ b/src/Avalonia.X11/X11PlatformLifetimeEvents.cs
@@ -153,14 +153,14 @@ namespace Avalonia.X11
         }
 
         private static void StaticErrorHandler(IntPtr smcConn, bool swap, int offendingMinorOpcode,
-            ulong offendingSequence, int errorClass, int severity, IntPtr values)
+            nuint offendingSequence, int errorClass, int severity, IntPtr values)
         {
             GetInstance(smcConn)
                 ?.ErrorHandler(swap, offendingMinorOpcode, offendingSequence, errorClass, severity, values);
         }
 
         // ReSharper disable UnusedParameter.Local
-        private void ErrorHandler(bool swap, int offendingMinorOpcode, ulong offendingSequence, int errorClass,
+        private void ErrorHandler(bool swap, int offendingMinorOpcode, nuint offendingSequence, int errorClass,
             int severity, IntPtr values)
         {
             Logger.TryGet(LogEventLevel.Warning, LogArea.X11Platform)?.Log(this,
diff --git a/src/Avalonia.X11/X11Screens.cs b/src/Avalonia.X11/X11Screens.cs
index bf5c74e0e5..bcaafb6a53 100644
--- a/src/Avalonia.X11/X11Screens.cs
+++ b/src/Avalonia.X11/X11Screens.cs
@@ -200,6 +200,21 @@ namespace Avalonia.X11
 
         }
 
+        public Screen ScreenFromPoint(PixelPoint point)
+        {
+            return ScreenHelper.ScreenFromPoint(point, AllScreens);
+        }
+
+        public Screen ScreenFromRect(PixelRect rect)
+        {
+            return ScreenHelper.ScreenFromRect(rect, AllScreens);
+        }
+
+        public Screen ScreenFromWindow(IWindowBaseImpl window)
+        {
+            return ScreenHelper.ScreenFromWindow(window, AllScreens);
+        }
+
         public int ScreenCount => _impl.Screens.Length;
 
         public IReadOnlyList<Screen> AllScreens =>
diff --git a/src/Avalonia.X11/X11Window.Xim.cs b/src/Avalonia.X11/X11Window.Xim.cs
index ecb23ff097..bedd1d22fc 100644
--- a/src/Avalonia.X11/X11Window.Xim.cs
+++ b/src/Avalonia.X11/X11Window.Xim.cs
@@ -10,7 +10,6 @@ namespace Avalonia.X11
 {
     partial class X11Window
     {
-
         class XimInputMethod : ITextInputMethodImpl, IX11InputMethodControl
         {
             private readonly X11Window _parent;
@@ -58,9 +57,9 @@ namespace Avalonia.X11
                 UpdateActive();
             }
 
-            public void SetActive(bool active)
+            public void SetClient(ITextInputMethodClient client)
             {
-                _controlActive = active;
+                _controlActive = client is { };
                 UpdateActive();
             }
 
@@ -87,7 +86,7 @@ namespace Avalonia.X11
                 // No-op
             }
             
-            public void SetOptions(TextInputOptionsQueryEventArgs options)
+            public void SetOptions(TextInputOptions options)
             {
                 // No-op
             }
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index 520b35dd03..4975a59f33 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -45,6 +45,9 @@ namespace Avalonia.X11
         private IntPtr _handle;
         private IntPtr _xic;
         private IntPtr _renderHandle;
+        private IntPtr _xSyncCounter;
+        private XSyncValue _xSyncValue;
+        private XSyncState _xSyncState = 0;
         private bool _mapped;
         private bool _wasMappedAtLeastOnce = false;
         private double? _scalingOverride;
@@ -52,6 +55,14 @@ namespace Avalonia.X11
         private TransparencyHelper _transparencyHelper;
         private RawEventGrouper _rawEventGrouper;
         private bool _useRenderWindow = false;
+
+        enum XSyncState
+        {
+            None,
+            WaitConfigure,
+            WaitPaint
+        }
+        
         public X11Window(AvaloniaX11Platform platform, IWindowImpl popupParent)
         {
             _platform = platform;
@@ -134,8 +145,8 @@ namespace Avalonia.X11
                                        SetWindowValuemask.WinGravity | SetWindowValuemask.BackingStore)), ref attr);
             else
                 _renderHandle = _handle;
-                
-            Handle = new PlatformHandle(_handle, "XID");
+
+            Handle = new SurfacePlatformHandle(this);
             _realSize = new PixelSize(defaultWidth, defaultHeight);
             platform.Windows[_handle] = OnEvent;
             XEventMask ignoredMask = XEventMask.SubstructureRedirectMask
@@ -169,7 +180,9 @@ namespace Avalonia.X11
             if (glx != null)
                 surfaces.Insert(0, new GlxGlPlatformSurface(glx.Display, glx.DeferredContext,
                     new SurfaceInfo(this, _x11.Display, _handle, _renderHandle)));
-            
+
+            surfaces.Add(Handle);
+
             Surfaces = surfaces.ToArray();
             UpdateMotifHints();
             UpdateSizeHints(null);
@@ -188,6 +201,16 @@ namespace Avalonia.X11
                 NativeMenuExporter = DBusMenuExporter.TryCreateTopLevelNativeMenu(_handle);
             NativeControlHost = new X11NativeControlHost(_platform, this);
             InitializeIme();
+            
+            XChangeProperty(_x11.Display, _handle, _x11.Atoms.WM_PROTOCOLS, _x11.Atoms.XA_ATOM, 32,
+                PropertyMode.Replace, new[] { _x11.Atoms.WM_DELETE_WINDOW, _x11.Atoms._NET_WM_SYNC_REQUEST }, 2);
+
+            if (_x11.HasXSync)
+            {
+                _xSyncCounter = XSyncCreateCounter(_x11.Display, _xSyncValue);
+                XChangeProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_SYNC_REQUEST_COUNTER,
+                    _x11.Atoms.XA_CARDINAL, 32, PropertyMode.Replace, ref _xSyncCounter, 1);
+            }
         }
 
         class SurfaceInfo  : EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo
@@ -381,15 +404,7 @@ namespace Avalonia.X11
                      (ev.type == XEventName.VisibilityNotify &&
                       ev.VisibilityEvent.state < 2))
             {
-                if (!_triggeredExpose)
-                {
-                    _triggeredExpose = true;
-                    Dispatcher.UIThread.Post(() =>
-                    {
-                        _triggeredExpose = false;
-                        DoPaint();
-                    }, DispatcherPriority.Render);
-                }
+                EnqueuePaint();
             }
             else if (ev.type == XEventName.FocusIn)
             {
@@ -501,6 +516,11 @@ namespace Avalonia.X11
                 if (_useRenderWindow)
                     XConfigureResizeWindow(_x11.Display, _renderHandle, ev.ConfigureEvent.width,
                         ev.ConfigureEvent.height);
+                if (_xSyncState == XSyncState.WaitConfigure)
+                {
+                    _xSyncState = XSyncState.WaitPaint;
+                    EnqueuePaint();
+                }
             }
             else if (ev.type == XEventName.DestroyNotify 
                      && ev.DestroyWindowEvent.window == _handle)
@@ -516,7 +536,12 @@ namespace Avalonia.X11
                         if (Closing?.Invoke() != true)
                             Dispose();
                     }
-
+                    else if (ev.ClientMessageEvent.ptr1 == _x11.Atoms._NET_WM_SYNC_REQUEST)
+                    {
+                        _xSyncValue.Lo = new UIntPtr(ev.ClientMessageEvent.ptr3.ToPointer()).ToUInt32();
+                        _xSyncValue.Hi = ev.ClientMessageEvent.ptr4.ToInt32();
+                        _xSyncState = XSyncState.WaitConfigure;
+                    }
                 }
             }
             else if (ev.type == XEventName.KeyPress || ev.type == XEventName.KeyRelease)
@@ -728,9 +753,27 @@ namespace Avalonia.X11
             ScheduleInput(mev, ref ev);
         }
 
+        void EnqueuePaint()
+        {
+            if (!_triggeredExpose)
+            {
+                _triggeredExpose = true;
+                Dispatcher.UIThread.Post(() =>
+                {
+                    _triggeredExpose = false;
+                    DoPaint();
+                }, DispatcherPriority.Render);
+            }
+        }
+        
         void DoPaint()
         {
             Paint?.Invoke(new Rect());
+            if (_xSyncCounter != IntPtr.Zero && _xSyncState == XSyncState.WaitPaint)
+            {
+                _xSyncState = XSyncState.None;
+                XSyncSetCounter(_x11.Display, _xSyncCounter, _xSyncValue);
+            }
         }
         
         public void Invalidate(Rect rect)
@@ -776,6 +819,12 @@ namespace Avalonia.X11
                 XDestroyIC(_xic);
                 _xic = IntPtr.Zero;
             }
+
+            if (_xSyncCounter != IntPtr.Zero)
+            {
+                XSyncDestroyCounter(_x11.Display, _xSyncCounter);
+                _xSyncCounter = IntPtr.Zero;
+            }
             
             if (_handle != IntPtr.Zero)
             {
@@ -1142,5 +1191,23 @@ namespace Avalonia.X11
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 0.8, 0.8);
 
         public bool NeedsManagedDecorations => false;
+
+
+        public class SurfacePlatformHandle : IPlatformNativeSurfaceHandle
+        {
+            private readonly X11Window _owner;
+
+            public PixelSize Size => _owner.ToPixelSize(_owner.ClientSize);
+
+            public double Scaling => _owner.RenderScaling;
+
+            public SurfacePlatformHandle(X11Window owner)
+            {
+                _owner = owner;
+            }
+
+            public IntPtr Handle => _owner._renderHandle;
+            public string HandleDescriptor => "XID";
+        }
     }
 }
diff --git a/src/Avalonia.X11/XLib.cs b/src/Avalonia.X11/XLib.cs
index e2b370821f..464ec4f1c8 100644
--- a/src/Avalonia.X11/XLib.cs
+++ b/src/Avalonia.X11/XLib.cs
@@ -542,6 +542,18 @@ namespace Avalonia.X11
         public static extern int XRRQueryExtension (IntPtr dpy,
             out int event_base_return,
             out int error_base_return);
+        
+        [DllImport(libX11Ext)]
+        public static extern Status XSyncInitialize(IntPtr dpy, out int event_base_return, out int error_base_return);
+
+        [DllImport(libX11Ext)]
+        public static extern IntPtr XSyncCreateCounter(IntPtr dpy, XSyncValue initialValue);
+        
+        [DllImport(libX11Ext)]
+        public static extern int XSyncDestroyCounter(IntPtr dpy, IntPtr counter);
+        
+        [DllImport(libX11Ext)]
+        public static extern int XSyncSetCounter(IntPtr dpy, IntPtr counter, XSyncValue value);
 
         [DllImport(libX11Randr)]
         public static extern int XRRQueryVersion(IntPtr dpy,
@@ -627,6 +639,11 @@ namespace Avalonia.X11
             public int bw;
             public int d;
         }
+        
+        public struct XSyncValue {
+            public int Hi;
+            public uint Lo;
+        }
 
         public static bool XGetGeometry(IntPtr display, IntPtr window, out XGeometry geo)
         {
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs
index e218da5f41..64fafc65f3 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs
@@ -1,7 +1,9 @@
 using System;
+using System.IO;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
 using static Avalonia.LinuxFramebuffer.NativeUnsafeMethods;
 using static Avalonia.LinuxFramebuffer.Output.LibDrm;
 
@@ -142,10 +144,28 @@ namespace Avalonia.LinuxFramebuffer.Output
         public int Fd { get; private set; }
         public DrmCard(string path = null)
         {
-            path = path ?? "/dev/dri/card0";
-            Fd = open(path, 2, 0);
-            if (Fd == -1)
-                throw new Win32Exception("Couldn't open " + path);
+            if(path == null)
+            {
+                var files = Directory.GetFiles("/dev/dri/");
+
+                foreach(var file in files) 
+                {
+                    var match = Regex.Match(file, "card[0-9]+");
+
+                    if(match.Success)
+                    {
+                        Fd = open(file, 2, 0);
+                        if(Fd != -1) break; 
+                    }    
+                }
+
+                if(Fd == -1) throw new Win32Exception("Couldn't open /dev/dri/card[0-9]+");
+            }
+            else 
+            {
+                Fd = open(path, 2, 0);
+                if(Fd != -1) throw new Win32Exception($"Couldn't open {path}");
+            }
         }
 
         public DrmResources GetResources() => new DrmResources(Fd);
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
index f75c96c759..b89ea8399a 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
@@ -12,5 +12,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
-  </ItemGroup>  
+  </ItemGroup>
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
index 1ca7be67a7..04a61e5f10 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
@@ -35,7 +35,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             Transformers.Insert(2, _designTransformer = new AvaloniaXamlIlDesignPropertiesTransformer());
             Transformers.Insert(3, _bindingTransformer = new AvaloniaBindingExtensionTransformer());
             
-            
             // Targeted
             InsertBefore<PropertyReferenceResolver>(
                 new AvaloniaXamlIlResolveClassesPropertiesTransformer(),
@@ -57,6 +56,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 new AvaloniaXamlIlResolveByNameMarkupExtensionReplacer()
             );
 
+            InsertAfter<TypeReferenceResolver>(
+                new XDataTypeTransformer());
+
             // After everything else
             InsertBefore<NewObjectTransformer>(
                 new AddNameScopeRegistration(),
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs
index b622971d38..d907bcbef9 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs
@@ -160,6 +160,29 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 return true;
             }
 
+            if (type.Equals(types.RelativePoint))
+            {
+                try
+                {
+                    var relativePoint = RelativePoint.Parse(text);
+                
+                    var relativePointTypeRef = new XamlAstClrTypeReference(node, types.RelativePoint, false);
+                    
+                    result = new XamlAstNewClrObjectNode(node, relativePointTypeRef, types.RelativePointFullConstructor, new List<IXamlAstValueNode>
+                    {
+                        new XamlConstantNode(node, types.XamlIlTypes.Double, relativePoint.Point.X),
+                        new XamlConstantNode(node, types.XamlIlTypes.Double, relativePoint.Point.Y),
+                        new XamlConstantNode(node, types.RelativeUnit, (int) relativePoint.Unit),
+                    });
+
+                    return true;
+                }
+                catch
+                {
+                    throw new XamlX.XamlLoadException($"Unable to parse \"{text}\" as a relative point", node);
+                }
+            }
+
             if (type.Equals(types.GridLength))
             {
                 try
@@ -221,6 +244,32 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 }
             }
 
+            if (type.Equals(types.TextTrimming))
+            {
+                foreach (var property in types.TextTrimming.Properties)
+                {
+                    if (property.PropertyType == types.TextTrimming && property.Name.Equals(text, StringComparison.OrdinalIgnoreCase))
+                    {
+                        result = new XamlStaticOrTargetedReturnMethodCallNode(node, property.Getter, Enumerable.Empty<IXamlAstValueNode>());
+
+                        return true;
+                    }
+                }
+            }
+
+            if (type.Equals(types.TextDecorationCollection))
+            {
+                foreach (var property in types.TextDecorations.Properties)
+                {
+                    if (property.PropertyType == types.TextDecorationCollection && property.Name.Equals(text, StringComparison.OrdinalIgnoreCase))
+                    {
+                        result = new XamlStaticOrTargetedReturnMethodCallNode(node, property.Getter, Enumerable.Empty<IXamlAstValueNode>());
+
+                        return true;
+                    }
+                }
+            }
+
             result = null;
             return false;
         }
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs
index 048a6220c5..3cc3504e16 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs
@@ -117,7 +117,15 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                     return parentDataContextNode.DataContextType;
                 };
 
-                XamlIlBindingPathHelper.UpdateCompiledBindingExtension(context, binding, startTypeResolver, context.ParentNodes().OfType<XamlAstConstructableObjectNode>().First().Type.GetClrType());
+                var selfType = context.ParentNodes().OfType<XamlAstConstructableObjectNode>().First().Type.GetClrType();
+                
+                // When using self bindings with setters we need to change target type to resolved selector type.
+                if (context.GetAvaloniaTypes().ISetter.IsAssignableFrom(selfType))
+                {
+                    selfType = context.ParentNodes().OfType<AvaloniaXamlIlTargetTypeMetadataNode>().First().TargetType.GetClrType();
+                }
+
+                XamlIlBindingPathHelper.UpdateCompiledBindingExtension(context, binding, startTypeResolver, selfType);
             }
 
             return node;
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs
index cf691db860..d4dfcf9c4b 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs
@@ -49,6 +49,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                     }
                     else if (child is XamlPropertyAssignmentNode pa)
                     {
+                        var templateDataTypeAttribute = context.GetAvaloniaTypes().DataTypeAttribute;
+                        
                         if (pa.Property.Name == "DataContext"
                             && pa.Property.DeclaringType.Equals(context.GetAvaloniaTypes().StyledElement)
                             && pa.Values[0] is XamlMarkupExtensionNode ext
@@ -56,8 +58,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                         {
                             inferredDataContextTypeNode = ParseDataContext(context, on, obj);
                         }
-                        else if(context.GetAvaloniaTypes().DataTemplate.IsAssignableFrom(on.Type.GetClrType())
-                            && pa.Property.Name == "DataType"
+                        else if(pa.Property.CustomAttributes.Any(a => a.Type == templateDataTypeAttribute)
                             && pa.Values[0] is XamlTypeExtensionNode dataTypeNode)
                         {
                             inferredDataContextTypeNode = new AvaloniaXamlIlDataContextTypeMetadataNode(on, dataTypeNode.Value.GetClrType());
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
index 4c4df1f53a..70209fb3ad 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
@@ -151,6 +151,14 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                             results.Add(result);
                             result = initialNode;
                             break;
+                        case SelectorGrammar.NestingSyntax:
+                            var parentTargetType = context.ParentNodes().OfType<AvaloniaXamlIlTargetTypeMetadataNode>().FirstOrDefault();
+
+                            if (parentTargetType is null)
+                                throw new XamlParseException($"Cannot find parent style for nested selector.", node);
+
+                            result = new XamlIlNestingSelector(result, parentTargetType.TargetType.GetClrType());
+                            break;
                         default:
                             throw new XamlParseException($"Unsupported selector grammar '{i.GetType()}'.", node);
                     }
@@ -474,4 +482,20 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 m => m.Name == "Or" && m.Parameters.Count == 1 && m.Parameters[0].Name.StartsWith("IReadOnlyList"));
         }
     }
+
+    class XamlIlNestingSelector : XamlIlSelectorNode
+    {
+        public XamlIlNestingSelector(XamlIlSelectorNode previous, IXamlType targetType)
+            : base(previous)
+        {
+            TargetType = targetType;
+        }
+
+        public override IXamlType TargetType { get; }
+        protected override void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+        {
+            EmitCall(context, codeGen,
+                m => m.Name == "Nesting" && m.Parameters.Count == 1);
+        }
+    }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
index 90c3989238..28787d9b84 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
@@ -26,6 +26,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
         public IXamlType Transitions { get; }
         public IXamlType AssignBindingAttribute { get; }
         public IXamlType DependsOnAttribute { get; }
+        public IXamlType DataTypeAttribute { get; }
         public IXamlType UnsetValueType { get; }
         public IXamlType StyledElement { get; }
         public IXamlType IStyledElement { get; }
@@ -71,6 +72,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
         public IXamlConstructor MatrixFullConstructor { get; }
         public IXamlType CornerRadius { get; }
         public IXamlConstructor CornerRadiusFullConstructor { get; }
+        public IXamlType RelativeUnit { get; }
+        public IXamlType RelativePoint { get; }
+        public IXamlConstructor RelativePointFullConstructor { get; }
         public IXamlType GridLength { get; }
         public IXamlConstructor GridLengthConstructorValueType { get; }
         public IXamlType Color { get; }
@@ -88,6 +92,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
         public IXamlType ImmutableSolidColorBrush { get; }
         public IXamlConstructor ImmutableSolidColorBrushConstructorColor { get; }
         public IXamlType TypeUtilities { get; }
+        public IXamlType TextDecorationCollection { get; }
+        public IXamlType TextDecorations { get; }
+        public IXamlType TextTrimming { get; }
+        public IXamlType ISetter { get; }
 
         public AvaloniaXamlIlWellKnownTypes(TransformerConfiguration cfg)
         {
@@ -105,6 +113,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             Transitions = cfg.TypeSystem.GetType("Avalonia.Animation.Transitions");
             AssignBindingAttribute = cfg.TypeSystem.GetType("Avalonia.Data.AssignBindingAttribute");
             DependsOnAttribute = cfg.TypeSystem.GetType("Avalonia.Metadata.DependsOnAttribute");
+            DataTypeAttribute = cfg.TypeSystem.GetType("Avalonia.Metadata.DataTypeAttribute");
             AvaloniaObjectBindMethod = AvaloniaObjectExtensions.FindMethod("Bind", IDisposable, false, IAvaloniaObject,
                 AvaloniaProperty,
                 IBinding, cfg.WellKnownTypes.Object);
@@ -131,7 +140,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             NameScopeSetNameScope = NameScope.GetMethod(new FindMethodMethodSignature("SetNameScope",
                 XamlIlTypes.Void, StyledElement, INameScope)
             { IsStatic = true });
-            AvaloniaObjectSetValueMethod = AvaloniaObject.FindMethod("SetValue", XamlIlTypes.Void,
+            AvaloniaObjectSetValueMethod = AvaloniaObject.FindMethod("SetValue", IDisposable,
                 false, AvaloniaProperty, XamlIlTypes.Object, BindingPriority);
             IPropertyInfo = cfg.TypeSystem.GetType("Avalonia.Data.Core.IPropertyInfo");
             ClrPropertyInfo = cfg.TypeSystem.GetType("Avalonia.Data.Core.ClrPropertyInfo");
@@ -171,6 +180,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             (Matrix, MatrixFullConstructor) = GetNumericTypeInfo("Avalonia.Matrix", XamlIlTypes.Double, 6);
             (CornerRadius, CornerRadiusFullConstructor) = GetNumericTypeInfo("Avalonia.CornerRadius", XamlIlTypes.Double, 4);
 
+            RelativeUnit = cfg.TypeSystem.GetType("Avalonia.RelativeUnit");
+            RelativePoint = cfg.TypeSystem.GetType("Avalonia.RelativePoint");
+            RelativePointFullConstructor = RelativePoint.GetConstructor(new List<IXamlType> { XamlIlTypes.Double, XamlIlTypes.Double, RelativeUnit });
+
             GridLength = cfg.TypeSystem.GetType("Avalonia.Controls.GridLength");
             GridLengthConstructorValueType = GridLength.GetConstructor(new List<IXamlType> { XamlIlTypes.Double, cfg.TypeSystem.GetType("Avalonia.Controls.GridUnitType") });
             Color = cfg.TypeSystem.GetType("Avalonia.Media.Color");
@@ -193,6 +206,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             ImmutableSolidColorBrush = cfg.TypeSystem.GetType("Avalonia.Media.Immutable.ImmutableSolidColorBrush");
             ImmutableSolidColorBrushConstructorColor = ImmutableSolidColorBrush.GetConstructor(new List<IXamlType> { UInt });
             TypeUtilities = cfg.TypeSystem.GetType("Avalonia.Utilities.TypeUtilities");
+            TextDecorationCollection = cfg.TypeSystem.GetType("Avalonia.Media.TextDecorationCollection");
+            TextDecorations = cfg.TypeSystem.GetType("Avalonia.Media.TextDecorations");
+            TextTrimming = cfg.TypeSystem.GetType("Avalonia.Media.TextTrimming");
+            ISetter = cfg.TypeSystem.GetType("Avalonia.Styling.ISetter");
         }
     }
 
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XDataTypeTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XDataTypeTransformer.cs
new file mode 100644
index 0000000000..845dc5f831
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XDataTypeTransformer.cs
@@ -0,0 +1,73 @@
+using System.Collections.Generic;
+using System.Linq;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.Transform.Transformers;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    internal class XDataTypeTransformer : IXamlAstTransformer
+    {
+        private const string DataTypePropertyName = "DataType";
+        
+        /// <summary>
+        /// Converts x:DataType directives to regular DataType assignments if property with Avalonia.Metadata.DataTypeAttribute exists.
+        /// </summary>
+        /// <returns></returns>
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (node is XamlAstObjectNode on)
+            {
+                for (var c = 0; c < on.Children.Count; c++)
+                {
+                    var ch = on.Children[c];
+                    if (ch is XamlAstXmlDirective { Namespace: XamlNamespaces.Xaml2006, Name: DataTypePropertyName } d)
+                    {
+                        if (on.Children.OfType<XamlAstXamlPropertyValueNode>()
+                            .Any(p => ((XamlAstNamePropertyReference)p.Property)?.Name == DataTypePropertyName))
+                        {
+                            // Break iteration if any DataType property was already set by user code.
+                            break;
+                        }
+                        
+                        var templateDataTypeAttribute = context.GetAvaloniaTypes().DataTypeAttribute;
+
+                        var clrType = (on.Type as XamlAstClrTypeReference)?.Type;
+                        if (clrType is null)
+                        {
+                            break;
+                        }
+
+                        // Technically it's possible to map "x:DataType" to a property with [DataType] attribute regardless of its name,
+                        // but we go explicitly strict here and check the name as well.
+                        var (declaringType, dataTypeProperty) = GetAllProperties(clrType)
+                            .FirstOrDefault(t => t.property.Name == DataTypePropertyName && t.property.CustomAttributes
+                                .Any(a => a.Type == templateDataTypeAttribute));
+                       
+                        if (dataTypeProperty is not null)
+                        {
+                            on.Children[c] = new XamlAstXamlPropertyValueNode(d,
+                                new XamlAstNamePropertyReference(d,
+                                    new XamlAstClrTypeReference(ch, declaringType, false), dataTypeProperty.Name,
+                                    on.Type),
+                                d.Values);
+                        }
+                    }
+                }
+            }
+
+            return node;
+        }
+        
+        private static IEnumerable<(IXamlType declaringType, IXamlProperty property)> GetAllProperties(IXamlType t)
+        {
+            foreach (var p in t.Properties)
+                yield return (t, p);
+            if(t.BaseType!=null)
+                foreach (var tuple in GetAllProperties(t.BaseType))
+                    yield return tuple;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs
index 871a2a2045..e76e2cd46e 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs
@@ -55,7 +55,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                         return cached.get;
                 }
 
-                var name = lst.Count == 0 ? key : key + "_" + Guid.NewGuid().ToString("N");
+                var name = lst.Count == 0 ? key : key + "_" + context.Configuration.IdentifierGenerator.GenerateIdentifierPart();
                 
                 var field = _builder.DefineField(types.IPropertyInfo, name + "!Field", false, true);
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/ApiCompatBaseline.txt b/src/Markup/Avalonia.Markup.Xaml/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..fcc74cf864
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/ApiCompatBaseline.txt
@@ -0,0 +1 @@
+Total Issues: 0
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 548aae31a8..30d321426f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -56,16 +56,15 @@
         <Compile Include="XamlTypes.cs" />
     </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.Markup\Avalonia.Markup.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\build\Rx.props" />
   <Import Project="..\..\..\build\ApiDiff.props" />
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Markup.Xaml.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
 </Project>
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
index c21a2d4299..ef11b06369 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Text;
 using Avalonia.Data;
 using Avalonia.Data.Core;
 using Avalonia.Data.Core.Plugins;
@@ -174,7 +172,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
                 WeakEvents.CollectionChanged.Unsubscribe(incc, this);
         }
         
-        public void OnEvent(object? sender, WeakEvent ev, NotifyCollectionChangedEventArgs args)
+        public void OnEvent(object sender, WeakEvent ev, NotifyCollectionChangedEventArgs args)
         {
             if (ShouldNotifyListeners(args))
             {
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
index b6137aa89f..1091b3ec7e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 
         bool IResourceNode.HasResources => Loaded.HasResources;
 
-        public event EventHandler OwnerChanged
+        public event EventHandler? OwnerChanged
         {
             add => Loaded.OwnerChanged += value;
             remove => Loaded.OwnerChanged -= value;
@@ -52,7 +52,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
         {
             if (!_isLoading)
             {
-                return Loaded.TryGetResource(key, out value);                
+                return Loaded.TryGetResource(key, out value);
             }
 
             value = null;
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
index db33b88cc3..add97a660b 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -39,17 +39,11 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
                 targetType = setter.Property.PropertyType;
             }
 
-            // Look upwards though the ambient context for IResourceHosts and IResourceProviders
+            // Look upwards though the ambient context for IResourceNodes
             // which might be able to give us the resource.
-            foreach (var e in stack.Parents)
+            foreach (var parent in stack.Parents)
             {
-                object value;
-
-                if (e is IResourceHost host && host.TryGetResource(ResourceKey, out value))
-                {
-                    return ColorToBrushConverter.Convert(value, targetType);
-                }
-                else if (e is IResourceProvider provider && provider.TryGetResource(ResourceKey, out value))
+                if (parent is IResourceNode node && node.TryGetResource(ResourceKey, out var value))
                 {
                     return ColorToBrushConverter.Convert(value, targetType);
                 }
@@ -58,7 +52,11 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
             if (provideTarget.TargetObject is IControl target &&
                 provideTarget.TargetProperty is PropertyInfo property)
             {
-                DelayedBinding.Add(target, property, x => GetValue(x, targetType));
+                // This is stored locally to avoid allocating closure in the outer scope.
+                var localTargetType = targetType;
+                var localInstance = this;
+                
+                DelayedBinding.Add(target, property, x => localInstance.GetValue(x, localTargetType));
                 return AvaloniaProperty.UnsetValue;
             }
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs b/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs
index cee4d90917..7e5b3159d4 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs
@@ -1,9 +1,6 @@
 using Avalonia.Metadata;
-using System.Runtime.CompilerServices;
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.MarkupExtensions")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.Styling")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.Templates")]
 
-[assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
diff --git a/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs b/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs
index 607b552c28..46b5bc0c40 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs
@@ -60,11 +60,11 @@ namespace Avalonia.Markup.Xaml.Styling
             }
         }
 
-        bool IResourceNode.HasResources => (Loaded as IResourceProvider)?.HasResources ?? false;
+        bool IResourceNode.HasResources => Loaded?.HasResources ?? false;
 
         IReadOnlyList<IStyle> IStyle.Children => _loaded ?? Array.Empty<IStyle>();
 
-        public event EventHandler OwnerChanged
+        public event EventHandler? OwnerChanged
         {
             add
             {
@@ -86,9 +86,9 @@ namespace Avalonia.Markup.Xaml.Styling
 
         public bool TryGetResource(object key, out object? value)
         {
-            if (!_isLoading && Loaded is IResourceProvider p)
+            if (!_isLoading)
             {
-                return p.TryGetResource(key, out value);
+                return Loaded.TryGetResource(key, out value);
             }
 
             value = null;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
index b7db1a3fbb..4da6b1b791 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
@@ -5,8 +5,9 @@ using Avalonia.Metadata;
 
 namespace Avalonia.Markup.Xaml.Templates
 {
-    public class DataTemplate : IRecyclingDataTemplate
+    public class DataTemplate : IRecyclingDataTemplate, ITypedDataTemplate
     {
+        [DataType]
         public Type DataType { get; set; }
 
         [Content]
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
index 7b065c7f47..04e8b0a9c0 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
@@ -9,8 +9,9 @@ using Avalonia.Metadata;
 
 namespace Avalonia.Markup.Xaml.Templates
 {
-    public class TreeDataTemplate : ITreeDataTemplate
+    public class TreeDataTemplate : ITreeDataTemplate, ITypedDataTemplate
     {
+        [DataType]
         public Type DataType { get; set; }
 
         [Content]
diff --git a/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt b/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..fcc74cf864
--- /dev/null
+++ b/src/Markup/Avalonia.Markup/ApiCompatBaseline.txt
@@ -0,0 +1 @@
+Total Issues: 0
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index 21370b3bf5..6711c3dd3d 100644
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@@ -11,11 +11,14 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\build\Rx.props" />
   <Import Project="..\..\..\build\System.Memory.props" />
   <Import Project="..\..\..\build\ApiDiff.props" />
   <Import Project="..\..\..\build\NullableEnable.props" />
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Markup.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
 </Project>
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs
index a9fc18474c..16856e674d 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs
@@ -46,7 +46,7 @@ namespace Avalonia.Markup.Parsers
                 switch (state)
                 {
                     case State.Start:
-                        state = ParseStart(ref r);
+                        (state, syntax) = ParseStart(ref r);
                         break;
                     case State.Middle:
                         (state, syntax) = ParseMiddle(ref r, end);
@@ -93,27 +93,31 @@ namespace Avalonia.Markup.Parsers
             return selector;
         }
 
-        private static State ParseStart(ref CharacterReader r)
+        private static (State, ISyntax?) ParseStart(ref CharacterReader r)
         {
             r.SkipWhitespace();
             if (r.End)
             {
-                return State.End;
+                return (State.End, null);
             }
 
             if (r.TakeIf(':'))
             {
-                return State.Colon;
+                return (State.Colon, null);
             }
             else if (r.TakeIf('.'))
             {
-                return State.Class;
+                return (State.Class, null);
             }
             else if (r.TakeIf('#'))
             {
-                return State.Name;
+                return (State.Name, null);
+            }
+            else if (r.TakeIf('^'))
+            {
+                return (State.CanHaveType, new NestingSyntax());
             }
-            return State.TypeName;
+            return (State.TypeName, null);
         }
 
         private static (State, ISyntax?) ParseMiddle(ref CharacterReader r, char? end)
@@ -142,6 +146,10 @@ namespace Avalonia.Markup.Parsers
             {
                 return (State.Start, new CommaSyntax());
             }
+            else if (r.TakeIf('^'))
+            {
+                return (State.CanHaveType, new NestingSyntax());
+            }
             else if (end.HasValue && !r.End && r.Peek == end.Value)
             {
                 return (State.End, null);
@@ -635,5 +643,13 @@ namespace Avalonia.Markup.Parsers
                 return obj is CommaSyntax or;
             }
         }
+
+        public class NestingSyntax : ISyntax
+        {
+            public override bool Equals(object? obj)
+            {
+                return obj is NestingSyntax;
+            }
+        }
     }
 }
diff --git a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs b/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
index 46e2925f92..36ca2784da 100644
--- a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
+++ b/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
@@ -1,8 +1,5 @@
 using Avalonia.Metadata;
-using System.Runtime.CompilerServices;
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Data")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Data")]
 
-[assembly: InternalsVisibleTo("Avalonia.Markup.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
diff --git a/src/Shared/ModuleInitializer.cs b/src/Shared/ModuleInitializer.cs
index c14b150c1a..b5bb31ed81 100644
--- a/src/Shared/ModuleInitializer.cs
+++ b/src/Shared/ModuleInitializer.cs
@@ -3,7 +3,7 @@ namespace System.Runtime.CompilerServices
 #if !NET5_0_OR_GREATER
     internal class ModuleInitializerAttribute : Attribute
     {
-        
+
     }
 #endif
 }
diff --git a/src/Shared/SourceGeneratorAttributes.cs b/src/Shared/SourceGeneratorAttributes.cs
new file mode 100644
index 0000000000..fdb5977d23
--- /dev/null
+++ b/src/Shared/SourceGeneratorAttributes.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Avalonia.SourceGenerator
+{
+    [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = true)]
+    internal sealed class SubtypesFactoryAttribute : Attribute
+    {
+        public SubtypesFactoryAttribute(Type baseType, string @namespace)
+        {
+            BaseType = baseType;
+            Namespace = @namespace;
+        }
+
+        public string Namespace { get; }
+        public Type BaseType { get; }
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
index 50ace8209c..413c2ba4d4 100644
--- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
+++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
@@ -16,5 +16,15 @@
   </ItemGroup>
   
   <Import Project="..\..\..\build\SkiaSharp.props" />
-  <Import Project="..\..\..\build\HarfBuzzSharp.props" />  
+  <Import Project="..\..\..\build\HarfBuzzSharp.props" />
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Skia.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Skia.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
 </Project>
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index e695a9cb41..8293769138 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -9,7 +9,7 @@ using Avalonia.Rendering;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Rendering.Utilities;
 using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -126,6 +126,7 @@ namespace Avalonia.Skia
         SKCanvas ISkiaDrawingContextImpl.SkCanvas => Canvas;
         SKSurface ISkiaDrawingContextImpl.SkSurface => Surface;
         GRContext ISkiaDrawingContextImpl.GrContext => _grContext;
+        double ISkiaDrawingContextImpl.CurrentOpacity => _currentOpacity;
 
         /// <inheritdoc />
         public void Clear(Color color)
@@ -180,7 +181,8 @@ namespace Avalonia.Skia
             var size = geometry.Bounds.Size;
 
             using (var fill = brush != null ? CreatePaint(_fillPaint, brush, size) : default(PaintWrapper))
-            using (var stroke = pen?.Brush != null ? CreatePaint(_strokePaint, pen, size) : default(PaintWrapper))
+            using (var stroke = pen?.Brush != null ? CreatePaint(_strokePaint, pen, 
+                size.Inflate(new Thickness(pen?.Thickness / 2 ?? 0))) : default(PaintWrapper))
             {
                 if (fill.Paint != null)
                 {
@@ -397,7 +399,7 @@ namespace Avalonia.Skia
 
             if (pen?.Brush != null)
             {
-                using (var paint = CreatePaint(_strokePaint, pen, rect.Rect.Size))
+                using (var paint = CreatePaint(_strokePaint, pen, rect.Rect.Size.Inflate(new Thickness(pen?.Thickness / 2 ?? 0))))
                 {
                     if (paint.Paint is object)
                     {
@@ -432,7 +434,7 @@ namespace Avalonia.Skia
 
             if (pen?.Brush != null)
             {
-                using (var paint = CreatePaint(_strokePaint, pen, rect.Size))
+                using (var paint = CreatePaint(_strokePaint, pen, rect.Size.Inflate(new Thickness(pen?.Thickness / 2 ?? 0))))
                 {
                     if (paint.Paint is object)
                     {
@@ -614,10 +616,25 @@ namespace Avalonia.Skia
                     var end = linearGradient.EndPoint.ToPixels(targetSize).ToSKPoint();
 
                     // would be nice to cache these shaders possibly?
-                    using (var shader =
-                        SKShader.CreateLinearGradient(start, end, stopColors, stopOffsets, tileMode))
+                    if (linearGradient.Transform is null)
                     {
-                        paintWrapper.Paint.Shader = shader;
+                        using (var shader =
+                            SKShader.CreateLinearGradient(start, end, stopColors, stopOffsets, tileMode))
+                        {
+                            paintWrapper.Paint.Shader = shader;
+                        }
+                    }
+                    else
+                    {
+                        var transformOrigin = linearGradient.TransformOrigin.ToPixels(targetSize);
+                        var offset = Matrix.CreateTranslation(transformOrigin);
+                        var transform = (-offset) * linearGradient.Transform.Value * (offset);
+
+                        using (var shader =
+                            SKShader.CreateLinearGradient(start, end, stopColors, stopOffsets, tileMode, transform.ToSKMatrix()))
+                        {
+                            paintWrapper.Paint.Shader = shader;
+                        }   
                     }
 
                     break;
@@ -632,10 +649,25 @@ namespace Avalonia.Skia
                     if (origin.Equals(center))
                     {
                         // when the origin is the same as the center the Skia RadialGradient acts the same as D2D
-                        using (var shader =
-                            SKShader.CreateRadialGradient(center, radius, stopColors, stopOffsets, tileMode))
+                        if (radialGradient.Transform is null)
                         {
-                            paintWrapper.Paint.Shader = shader;
+                            using (var shader =
+                                SKShader.CreateRadialGradient(center, radius, stopColors, stopOffsets, tileMode))
+                            {
+                                paintWrapper.Paint.Shader = shader;
+                            }
+                        }
+                        else
+                        {
+                            var transformOrigin = radialGradient.TransformOrigin.ToPixels(targetSize);
+                            var offset = Matrix.CreateTranslation(transformOrigin);
+                            var transform = (-offset) * radialGradient.Transform.Value * (offset);
+                        
+                            using (var shader =
+                                SKShader.CreateRadialGradient(center, radius, stopColors, stopOffsets, tileMode, transform.ToSKMatrix()))
+                            {
+                                paintWrapper.Paint.Shader = shader;
+                            }
                         }
                     }
                     else
@@ -659,12 +691,30 @@ namespace Avalonia.Skia
                         }
                             
                         // compose with a background colour of the final stop to match D2D's behaviour of filling with the final color
-                        using (var shader = SKShader.CreateCompose(
-                            SKShader.CreateColor(reversedColors[0]),
-                            SKShader.CreateTwoPointConicalGradient(center, radius, origin, 0, reversedColors, reversedStops, tileMode)
-                        ))
+                        if (radialGradient.Transform is null)
                         {
-                            paintWrapper.Paint.Shader = shader;
+                            using (var shader = SKShader.CreateCompose(
+                                SKShader.CreateColor(reversedColors[0]),
+                                SKShader.CreateTwoPointConicalGradient(center, radius, origin, 0, reversedColors, reversedStops, tileMode)
+                            ))
+                            {
+                                paintWrapper.Paint.Shader = shader;
+                            }
+                        }
+                        else
+                        {
+                                
+                            var transformOrigin = radialGradient.TransformOrigin.ToPixels(targetSize);
+                            var offset = Matrix.CreateTranslation(transformOrigin);
+                            var transform = (-offset) * radialGradient.Transform.Value * (offset);
+                           
+                            using (var shader = SKShader.CreateCompose(
+                                SKShader.CreateColor(reversedColors[0]),
+                                SKShader.CreateTwoPointConicalGradient(center, radius, origin, 0, reversedColors, reversedStops, tileMode, transform.ToSKMatrix())
+                            ))
+                            {
+                                paintWrapper.Paint.Shader = shader;
+                            } 
                         }
                     }
 
@@ -679,6 +729,16 @@ namespace Avalonia.Skia
                     var angle = (float)(conicGradient.Angle - 90);
                     var rotation = SKMatrix.CreateRotationDegrees(angle, center.X, center.Y);
 
+                    if (conicGradient.Transform is { })
+                    {
+                            
+                        var transformOrigin = conicGradient.TransformOrigin.ToPixels(targetSize);
+                        var offset = Matrix.CreateTranslation(transformOrigin);
+                        var transform = (-offset) * conicGradient.Transform.Value * (offset);
+
+                        rotation = rotation.PreConcat(transform.ToSKMatrix());
+                    }
+
                     using (var shader = 
                         SKShader.CreateSweepGradient(center, stopColors, stopOffsets, rotation))
                     {
@@ -751,6 +811,15 @@ namespace Avalonia.Skia
                 tileTransform,
                 SKMatrix.CreateScale((float)(96.0 / _dpi.X), (float)(96.0 / _dpi.Y)));
 
+            if (tileBrush.Transform is { })
+            {
+                var origin = tileBrush.TransformOrigin.ToPixels(targetSize);
+                var offset = Matrix.CreateTranslation(origin);
+                var transform = (-offset) * tileBrush.Transform.Value * (offset);
+
+                paintTransform = paintTransform.PreConcat(transform.ToSKMatrix());
+            }
+
             using (var shader = image.ToShader(tileX, tileY, paintTransform))
             {
                 paintWrapper.Paint.Shader = shader;
diff --git a/src/Skia/Avalonia.Skia/FontManagerImpl.cs b/src/Skia/Avalonia.Skia/FontManagerImpl.cs
index 075a2cc746..125dd0e455 100644
--- a/src/Skia/Avalonia.Skia/FontManagerImpl.cs
+++ b/src/Skia/Avalonia.Skia/FontManagerImpl.cs
@@ -122,9 +122,7 @@ namespace Avalonia.Skia
 
                     skTypeface = _skFontManager.MatchFamily(familyName, fontStyle);
 
-                    if (skTypeface is null
-                        || (!skTypeface.FamilyName.Equals(familyName, StringComparison.Ordinal)
-                            && defaultName.Equals(skTypeface.FamilyName, StringComparison.Ordinal)))
+                    if (skTypeface is null || defaultName.Equals(skTypeface.FamilyName, StringComparison.Ordinal))
                     {
                         continue;
                     }
diff --git a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
index f59a0a32c2..bdc3d075cf 100644
--- a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
+++ b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using JetBrains.Annotations;
 using SkiaSharp;
@@ -6,6 +7,7 @@ using SkiaSharp;
 namespace Avalonia.Skia
 {
     /// <inheritdoc />
+    [Unstable]
     public class GlyphRunImpl : IGlyphRunImpl
     {
         public GlyphRunImpl([NotNull] SKTextBlob textBlob)
diff --git a/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs b/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
index 5b6e5af60f..dcb4eac7ca 100644
--- a/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
+++ b/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Runtime.InteropServices;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using HarfBuzzSharp;
 using SkiaSharp;
 
 namespace Avalonia.Skia
 {
+    [Unstable]
     public class GlyphTypefaceImpl : IGlyphTypefaceImpl
     {
         private bool _isDisposed;
diff --git a/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs b/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs
index 38fa5a5253..1b60154d46 100644
--- a/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs
@@ -1,12 +1,15 @@
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using SkiaSharp;
 
 namespace Avalonia.Skia
 {
+    [Unstable]
     public interface ISkiaDrawingContextImpl : IDrawingContextImpl
     {
         SKCanvas SkCanvas { get; }
         GRContext GrContext { get; }
         SKSurface SkSurface { get; }
+        double CurrentOpacity { get; }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
index 3010f49420..5628ae177c 100644
--- a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
+++ b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
@@ -5,7 +5,7 @@ using System.Security.Cryptography;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Skia.Helpers;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index af3b570fd7..727677c82e 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -10,7 +10,7 @@ using Avalonia.Media;
 using Avalonia.OpenGL;
 using Avalonia.OpenGL.Imaging;
 using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -35,6 +35,9 @@ namespace Avalonia.Skia
             var gl = AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>();
             if (gl != null) 
                 _skiaGpu = new GlSkiaGpu(gl, maxResourceBytes);
+
+            //TODO: SKFont crashes when disposed in finalizer so we keep it alive
+            GC.SuppressFinalize(s_font);
         }
 
         public IGeometryImpl CreateEllipseGeometry(Rect rect) => new EllipseGeometryImpl(rect);
@@ -59,6 +62,41 @@ namespace Avalonia.Skia
             return new CombinedGeometryImpl(combineMode, g1, g2);
         }
 
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun, out Matrix scale)
+        {
+            if (glyphRun.GlyphTypeface.PlatformImpl is not GlyphTypefaceImpl glyphTypeface)
+            {
+                throw new InvalidOperationException("PlatformImpl can't be null.");
+            }
+
+            var fontRenderingEmSize = (float)glyphRun.FontRenderingEmSize;
+            var skFont = new SKFont(glyphTypeface.Typeface, fontRenderingEmSize)
+            {
+                Size = fontRenderingEmSize,
+                Edging = SKFontEdging.Antialias,
+                Hinting = SKFontHinting.None,
+                LinearMetrics = true
+            };
+
+            SKPath path = new SKPath();
+            var matrix = SKMatrix.Identity;
+
+            var currentX = 0f;
+
+            foreach (var glyph in glyphRun.GlyphIndices)
+            {
+                var p = skFont.GetGlyphPath(glyph);
+
+                path.AddPath(p, currentX, 0);
+
+                currentX += p.Bounds.Right;
+            }
+
+            scale = Matrix.CreateScale(matrix.ScaleX, matrix.ScaleY);
+
+            return new StreamGeometryImpl(path);
+        }
+
         /// <inheritdoc />
         public IBitmapImpl LoadBitmap(string fileName)
         {
diff --git a/src/Skia/Avalonia.Skia/Properties/AssemblyInfo.cs b/src/Skia/Avalonia.Skia/Properties/AssemblyInfo.cs
deleted file mode 100644
index a7e556ee84..0000000000
--- a/src/Skia/Avalonia.Skia/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-
diff --git a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
index f66df9e6e9..1f3f20730f 100644
--- a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
+++ b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
@@ -59,15 +59,30 @@ namespace Avalonia.Skia
                 return typeface;
             }
 
-            //Nothing was found so we try some regular cases.
+            if (TryFindStretchFallback(key, out typeface))
+            {
+                return typeface;
+            }
+
+            //Nothing was found so we try some regular typeface.
             if (_typefaces.TryGetValue(new Typeface(key.FontFamily), out typeface))
             {
                 return typeface;
             }
 
-            return _typefaces.TryGetValue(new Typeface(key.FontFamily, FontStyle.Italic), out typeface) ?
-                typeface :
-                null;
+            SKTypeface skTypeface = null;
+
+            foreach(var pair in _typefaces)
+            {
+                skTypeface = pair.Value;
+
+                if (skTypeface.FamilyName.Contains(key.FontFamily.Name))
+                {
+                    return skTypeface;
+                }
+            }
+
+            return skTypeface;
         }
 
         private bool TryFindStretchFallback(Typeface key, out SKTypeface typeface)
diff --git a/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs b/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
index 75b4231640..d584216f17 100644
--- a/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
+++ b/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using Avalonia.Media;
 using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -103,9 +103,9 @@ namespace Avalonia.Skia
                 SkewY = (float)m.M12,
                 ScaleY = (float)m.M22,
                 TransY = (float)m.M32,
-                Persp0 = 0,
-                Persp1 = 0,
-                Persp2 = 1
+                Persp0 = (float)m.M13,
+                Persp1 = (float)m.M23,
+                Persp2 = (float)m.M33
             };
 
             return sm;
diff --git a/src/Skia/Avalonia.Skia/TextShaperImpl.cs b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
index c4d11f4613..777e907617 100644
--- a/src/Skia/Avalonia.Skia/TextShaperImpl.cs
+++ b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
 using Avalonia.Platform;
@@ -13,18 +12,22 @@ namespace Avalonia.Skia
 {
     internal class TextShaperImpl : ITextShaperImpl
     {
-        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize,
-            CultureInfo culture, sbyte bidiLevel)
+        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options)
         {
+            var typeface = options.Typeface;
+            var fontRenderingEmSize = options.FontRenderingEmSize;
+            var bidiLevel = options.BidiLevel;
+            var culture = options.Culture;
+
             using (var buffer = new Buffer())
             {
-                buffer.AddUtf16(text.Buffer.Span, text.Start, text.Length);
+                buffer.AddUtf16(text.Buffer.Span, text.BufferOffset, text.Length);
 
                 MergeBreakPair(buffer);
                 
                 buffer.GuessSegmentProperties();
 
-                buffer.Direction = (bidiLevel & 1) == 0 ? Direction.LeftToRight : Direction.RightToLeft;
+                buffer.Direction = Direction.LeftToRight; //Always shape LeftToRight
 
                 buffer.Language = new Language(culture ?? CultureInfo.CurrentCulture);              
 
@@ -32,11 +35,6 @@ namespace Avalonia.Skia
 
                 font.Shape(buffer);
 
-                if (buffer.Direction == Direction.RightToLeft)
-                {
-                    buffer.Reverse();
-                }
-
                 font.GetScale(out var scaleX, out _);
 
                 var textScale = fontRenderingEmSize / scaleX;
@@ -55,12 +53,21 @@ namespace Avalonia.Skia
 
                     var glyphIndex = (ushort)sourceInfo.Codepoint;
 
-                    var glyphCluster = (int)sourceInfo.Cluster;
+                    var glyphCluster = (int)(sourceInfo.Cluster);
 
                     var glyphAdvance = GetGlyphAdvance(glyphPositions, i, textScale);
 
                     var glyphOffset = GetGlyphOffset(glyphPositions, i, textScale);
 
+                    if(glyphIndex == 0 && text.Buffer.Span[glyphCluster] == '\t')
+                    {
+                        glyphIndex = typeface.GetGlyph(' ');
+
+                        glyphAdvance = options.IncrementalTabWidth > 0 ? 
+                            options.IncrementalTabWidth : 
+                            4 * typeface.GetGlyphAdvance(glyphIndex) * textScale;
+                    }
+
                     var targetInfo = new Media.TextFormatting.GlyphInfo(glyphIndex, glyphCluster, glyphAdvance, glyphOffset);
 
                     shapedBuffer[i] = targetInfo;
diff --git a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
index 63a1e8f869..506edf0627 100644
--- a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
@@ -4,7 +4,7 @@ using System.Threading;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Skia.Helpers;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
diff --git a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj
index 98fdccfe83..1531c95830 100644
--- a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj
+++ b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj
@@ -51,7 +51,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\Avalonia.PlatformSupport\Avalonia.PlatformSupport.csproj" />
     <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Web/Avalonia.Web.Blazor/AvaloniaBlazorAppBuilder.cs b/src/Web/Avalonia.Web.Blazor/AvaloniaBlazorAppBuilder.cs
index 2eb340406b..11d9bcc98f 100644
--- a/src/Web/Avalonia.Web.Blazor/AvaloniaBlazorAppBuilder.cs
+++ b/src/Web/Avalonia.Web.Blazor/AvaloniaBlazorAppBuilder.cs
@@ -1,6 +1,5 @@
 using Avalonia.Controls;
 using Avalonia.Platform;
-using Avalonia.PlatformSupport;
 
 namespace Avalonia.Web.Blazor
 {
diff --git a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor
index 584c77a62c..68662bd931 100644
--- a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor
+++ b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor
@@ -1,19 +1,54 @@
 <div id="container" class="avalonia-container" tabindex="0" oncontextmenu="return false;"
-     ontouchstart="@OnTouchStart"
-     ontouchend="@OnTouchEnd"
-     ontouchcancel="@OnTouchCancel"
-     ontouchmove="@OnTouchMove"
-     onmousemove="@OnMouseMove"
-     onmousedown="@OnMouseDown"
-     onmouseup="@OnMouseUp"
-     onwheel="@OnWheel"
-     onkeydown="@OnKeyDown"
-     onkeyup="@OnKeyUp">
+     @onwheel="OnWheel"
+     @onkeydown="OnKeyDown"
+     @onkeyup="OnKeyUp"
+     @onpointerdown="OnPointerDown"
+     @onpointerup="OnPointerUp"
+     @onpointermove="OnPointerMove"
+     @onpointercancel="OnPointerCancel">
     
-    <canvas @ref="_htmlCanvas" @attributes="AdditionalAttributes"/>
-    
-    <input @ref="_inputElement"
-           class="overlay"
-           type="text"
-           oninput="@OnInput"/>
+    <canvas id="htmlCanvas" @ref="_htmlCanvas" @attributes="AdditionalAttributes"/>
+
+	<div id="nativeControlsContainer" @ref="_nativeControlsContainer" />
+
+    <input id="inputElement" @ref="_inputElement" type="text" @oninput="OnInput" 
+        onpaste="return false;"
+        oncopy="return false;" 
+        oncut="return false;"/>
 </div>
+
+<style>
+#container{
+    touch-action: none;
+}
+#htmlCanvas {
+    opacity: 1;
+    background-color: #ccc;
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    top: 0px;
+    left: 0px;
+    z-index: 500;
+}
+
+#nativeControlsContainer {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    top: 0px;
+    left: 0px;
+    z-index: 700;
+}
+
+#inputElement {
+    opacity: 0.0;
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    top: 0px;
+    left: 0px;
+    z-index: 1000;
+}
+
+</style>
diff --git a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
index 3649a884a6..b575bc6dbb 100644
--- a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
+++ b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Embedding;
+using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Input.TextInput;
@@ -18,14 +19,16 @@ namespace Avalonia.Web.Blazor
         private EmbeddableControlRoot _topLevel;
 
         // Interop
-        private SKHtmlCanvasInterop _interop = null!;
-        private SizeWatcherInterop _sizeWatcher = null!;
-        private DpiWatcherInterop _dpiWatcher = null!;
-        private SKHtmlCanvasInterop.GLInfo? _jsGlInfo = null!;
-        private InputHelperInterop _inputHelper = null!;
-        private InputHelperInterop _canvasHelper = null!;
+        private SKHtmlCanvasInterop? _interop = null;
+        private SizeWatcherInterop? _sizeWatcher = null;
+        private DpiWatcherInterop? _dpiWatcher = null;
+        private SKHtmlCanvasInterop.GLInfo? _jsGlInfo = null;
+        private InputHelperInterop? _inputHelper = null;
+        private InputHelperInterop? _canvasHelper = null;
+        private NativeControlHostInterop? _nativeControlHost = null;
         private ElementReference _htmlCanvas;
         private ElementReference _inputElement;
+        private ElementReference _nativeControlsContainer;
         private double _dpi = 1;
         private SKSize _canvasSize = new (100, 100);
 
@@ -49,89 +52,91 @@ namespace Avalonia.Web.Blazor
             }
         }
 
-        private void OnTouchStart(TouchEventArgs e)
+        internal INativeControlHostImpl GetNativeControlHostImpl()
         {
-            foreach (var touch in e.ChangedTouches)
-            {
-                _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchBegin, new Point(touch.ClientX, touch.ClientY),
-                    GetModifiers(e), touch.Identifier);
-            }
+            return _nativeControlHost ?? throw new InvalidOperationException("Blazor View wasn't initialized yet");
         }
-
-        private void OnTouchEnd(TouchEventArgs e)
+        
+        private void OnPointerCancel(Microsoft.AspNetCore.Components.Web.PointerEventArgs e)
         {
-            foreach (var touch in e.ChangedTouches)
+            if (e.PointerType == "touch")
             {
-                _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchEnd, new Point(touch.ClientX, touch.ClientY),
-                    GetModifiers(e), touch.Identifier);
+                _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchCancel, new Point(e.ClientX, e.ClientY),
+                    GetModifiers(e), e.PointerId);
             }
         }
 
-        private void OnTouchCancel(TouchEventArgs e)
+        private void OnPointerMove(Microsoft.AspNetCore.Components.Web.PointerEventArgs e)
         {
-            foreach (var touch in e.ChangedTouches)
+            if (e.PointerType == "touch")
             {
-                _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchCancel, new Point(touch.ClientX, touch.ClientY),
-                    GetModifiers(e), touch.Identifier);
+                _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchUpdate, new Point(e.ClientX, e.ClientY),
+                    GetModifiers(e), e.PointerId);
             }
-        }
-
-        private void OnTouchMove(TouchEventArgs e)
-        {
-            foreach (var touch in e.ChangedTouches)
+            else
             {
-                _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchUpdate, new Point(touch.ClientX, touch.ClientY),
-                    GetModifiers(e), touch.Identifier);
+                _topLevelImpl.RawMouseEvent(RawPointerEventType.Move, new Point(e.ClientX, e.ClientY), GetModifiers(e));
             }
         }
 
-        private void OnMouseMove(MouseEventArgs e)
+        private void OnPointerUp(Microsoft.AspNetCore.Components.Web.PointerEventArgs e)
         {
-            _topLevelImpl.RawMouseEvent(RawPointerEventType.Move, new Point(e.ClientX, e.ClientY), GetModifiers(e));
-        }
+            if (e.PointerType == "touch")
+            {
+                _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchEnd, new Point(e.ClientX, e.ClientY),
+                    GetModifiers(e), e.PointerId);
+            }
+            else
+            {
+                RawPointerEventType type = default;
 
-        private void OnMouseUp(MouseEventArgs e)
-        {
-            RawPointerEventType type = default;
+                switch (e.Button)
+                {
+                    case 0:
+                        type = RawPointerEventType.LeftButtonUp;
+                        break;
 
-            switch (e.Button)
-            {
-                case 0:
-                    type = RawPointerEventType.LeftButtonUp;
-                    break;
+                    case 1:
+                        type = RawPointerEventType.MiddleButtonUp;
+                        break;
 
-                case 1:
-                    type = RawPointerEventType.MiddleButtonUp;
-                    break;
+                    case 2:
+                        type = RawPointerEventType.RightButtonUp;
+                        break;
+                }
 
-                case 2:
-                    type = RawPointerEventType.RightButtonUp;
-                    break;
+                _topLevelImpl.RawMouseEvent(type, new Point(e.ClientX, e.ClientY), GetModifiers(e));
             }
-
-            _topLevelImpl.RawMouseEvent(type, new Point(e.ClientX, e.ClientY), GetModifiers(e));
         }
 
-        private void OnMouseDown(MouseEventArgs e)
+        private void OnPointerDown(Microsoft.AspNetCore.Components.Web.PointerEventArgs e)
         {
-            RawPointerEventType type = default;
-
-            switch (e.Button)
+            if (e.PointerType == "touch")
             {
-                case 0:
-                    type = RawPointerEventType.LeftButtonDown;
-                    break;
+                _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchBegin, new Point(e.ClientX, e.ClientY),
+                    GetModifiers(e), e.PointerId);
+            }
+            else
+            {
+                RawPointerEventType type = default;
 
-                case 1:
-                    type = RawPointerEventType.MiddleButtonDown;
-                    break;
+                switch (e.Button)
+                {
+                    case 0:
+                        type = RawPointerEventType.LeftButtonDown;
+                        break;
 
-                case 2:
-                    type = RawPointerEventType.RightButtonDown;
-                    break;
-            }
+                    case 1:
+                        type = RawPointerEventType.MiddleButtonDown;
+                        break;
 
-            _topLevelImpl.RawMouseEvent(type, new Point(e.ClientX, e.ClientY), GetModifiers(e));
+                    case 2:
+                        type = RawPointerEventType.RightButtonDown;
+                        break;
+                }
+
+                _topLevelImpl.RawMouseEvent(type, new Point(e.ClientX, e.ClientY), GetModifiers(e));
+            }
         }
 
         private void OnWheel(WheelEventArgs e)
@@ -165,23 +170,7 @@ namespace Avalonia.Web.Blazor
             return modifiers;
         }
 
-        private static RawInputModifiers GetModifiers(TouchEventArgs e)
-        {
-            var modifiers = RawInputModifiers.None;
-
-            if (e.CtrlKey)
-                modifiers |= RawInputModifiers.Control;
-            if (e.AltKey)
-                modifiers |= RawInputModifiers.Alt;
-            if (e.ShiftKey)
-                modifiers |= RawInputModifiers.Shift;
-            if (e.MetaKey)
-                modifiers |= RawInputModifiers.Meta;
-
-            return modifiers;
-        }
-
-        private static RawInputModifiers GetModifiers(MouseEventArgs e)
+        private static RawInputModifiers GetModifiers(Microsoft.AspNetCore.Components.Web.PointerEventArgs e)
         {
             var modifiers = RawInputModifiers.None;
 
@@ -224,12 +213,12 @@ namespace Avalonia.Web.Blazor
 
         private void OnKeyDown(KeyboardEventArgs e)
         {
-            _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyDown, e.Code, GetModifiers(e));
+            _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyDown, e.Code, e.Key, GetModifiers(e));
         }
 
         private void OnKeyUp(KeyboardEventArgs e)
         {
-            _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyUp, e.Code, GetModifiers(e));
+            _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyUp, e.Code, e.Key, GetModifiers(e));
         }
 
         private void OnInput(ChangeEventArgs e)
@@ -243,7 +232,7 @@ namespace Avalonia.Web.Blazor
                 }
             }
 
-            _inputHelper.Clear();
+            _inputHelper?.Clear();
         }
 
         [Parameter(CaptureUnmatchedValues = true)]
@@ -253,6 +242,8 @@ namespace Avalonia.Web.Blazor
         {
             if (firstRender)
             {
+                AvaloniaLocator.CurrentMutable.Bind<IJSInProcessRuntime>().ToConstant((IJSInProcessRuntime)Js);
+
                 _inputHelper = await InputHelperInterop.ImportAsync(Js, _inputElement);
                 _canvasHelper = await InputHelperInterop.ImportAsync(Js, _htmlCanvas);
 
@@ -264,6 +255,8 @@ namespace Avalonia.Web.Blazor
                     _canvasHelper.SetCursor(x); //windows
                 };
 
+                _nativeControlHost = await NativeControlHostInterop.ImportAsync(Js, _nativeControlsContainer);
+
                 Console.WriteLine("starting html canvas setup");
                 _interop = await SKHtmlCanvasInterop.ImportAsync(Js, _htmlCanvas, OnRenderFrame);
 
@@ -319,9 +312,9 @@ namespace Avalonia.Web.Blazor
 
         public void Dispose()
         {
-            _dpiWatcher.Unsubscribe(OnDpiChanged);
-            _sizeWatcher.Dispose();
-            _interop.Dispose();
+            _dpiWatcher?.Unsubscribe(OnDpiChanged);
+            _sizeWatcher?.Dispose();
+            _interop?.Dispose();
         }
 
         private void ForceBlit()
@@ -345,7 +338,7 @@ namespace Avalonia.Web.Blazor
             {
                 _dpi = newDpi;
 
-                _interop.SetCanvasSize((int)(_canvasSize.Width * _dpi), (int)(_canvasSize.Height * _dpi));
+                _interop!.SetCanvasSize((int)(_canvasSize.Width * _dpi), (int)(_canvasSize.Height * _dpi));
 
                 _topLevelImpl.SetClientSize(_canvasSize, _dpi);
 
@@ -359,7 +352,7 @@ namespace Avalonia.Web.Blazor
             {
                 _canvasSize = newSize;
 
-                _interop.SetCanvasSize((int)(_canvasSize.Width * _dpi), (int)(_canvasSize.Height * _dpi));
+                _interop!.SetCanvasSize((int)(_canvasSize.Width * _dpi), (int)(_canvasSize.Height * _dpi));
 
                 _topLevelImpl.SetClientSize(_canvasSize, _dpi);
 
@@ -367,10 +360,17 @@ namespace Avalonia.Web.Blazor
             }
         }
 
-        public void SetActive(bool active)
+        public void SetClient(ITextInputMethodClient? client)
         {
+            if (_inputHelper is null)
+            {
+                return;
+            }
+
             _inputHelper.Clear();
 
+            var active = client is { };
+            
             if (active)
             {
                 _inputHelper.Show();
@@ -386,13 +386,13 @@ namespace Avalonia.Web.Blazor
         {
         }
 
-        public void SetOptions(TextInputOptionsQueryEventArgs options)
+        public void SetOptions(TextInputOptions options)
         {
         }
 
         public void Reset()
         {
-            _inputHelper.Clear();
+            _inputHelper?.Clear();
         }
     }
 }
diff --git a/src/Web/Avalonia.Web.Blazor/ClipboardImpl.cs b/src/Web/Avalonia.Web.Blazor/ClipboardImpl.cs
new file mode 100644
index 0000000000..bafc07ca15
--- /dev/null
+++ b/src/Web/Avalonia.Web.Blazor/ClipboardImpl.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Input;
+using Avalonia.Input.Platform;
+using Microsoft.JSInterop;
+
+namespace Avalonia.Web.Blazor
+{
+    internal class ClipboardImpl : IClipboard
+    {
+        public async Task<string> GetTextAsync()
+        {
+            return await AvaloniaLocator.Current.GetRequiredService<IJSInProcessRuntime>().
+                InvokeAsync<string>("navigator.clipboard.readText");
+        }
+
+        public async Task SetTextAsync(string text)
+        {
+            await AvaloniaLocator.Current.GetRequiredService<IJSInProcessRuntime>().
+                InvokeAsync<string>("navigator.clipboard.writeText",text);
+        }
+
+        public async Task ClearAsync() => await SetTextAsync("");
+
+        public Task SetDataObjectAsync(IDataObject data) => Task.CompletedTask;
+
+        public Task<string[]> GetFormatsAsync() => Task.FromResult(Array.Empty<string>());
+
+        public Task<object> GetDataAsync(string format) => Task.FromResult<object>(new());
+    }
+}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/NativeControlHostImpl.cs b/src/Web/Avalonia.Web.Blazor/Interop/NativeControlHostImpl.cs
new file mode 100644
index 0000000000..48362b03c4
--- /dev/null
+++ b/src/Web/Avalonia.Web.Blazor/Interop/NativeControlHostImpl.cs
@@ -0,0 +1,152 @@
+#nullable enable
+using System.Diagnostics.CodeAnalysis;
+
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+
+namespace Avalonia.Web.Blazor.Interop
+{
+
+    internal class NativeControlHostInterop : JSModuleInterop, INativeControlHostImpl
+    {
+        private const string JsFilename = "./_content/Avalonia.Web.Blazor/NativeControlHost.js";
+        private const string CreateDefaultChildSymbol = "NativeControlHost.CreateDefaultChild";
+        private const string CreateAttachmentSymbol = "NativeControlHost.CreateAttachment";
+        private const string GetReferenceSymbol = "NativeControlHost.GetReference";
+
+        private readonly ElementReference hostElement;
+
+        public static async Task<NativeControlHostInterop> ImportAsync(IJSRuntime js, ElementReference element)
+        {
+            var interop = new NativeControlHostInterop(js, element);
+            await interop.ImportAsync();
+            return interop;
+        }
+
+        public NativeControlHostInterop(IJSRuntime js, ElementReference element)
+            : base(js, JsFilename)
+        {
+            hostElement = element;
+        }
+
+        public INativeControlHostDestroyableControlHandle CreateDefaultChild(IPlatformHandle parent)
+        {
+            var element = Invoke<IJSInProcessObjectReference>(CreateDefaultChildSymbol);
+            return new JSObjectControlHandle(element);
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(Func<IPlatformHandle, IPlatformHandle> create)
+        {
+            Attachment? a = null;
+            try
+            {
+                using var hostElementJsReference = Invoke<IJSInProcessObjectReference>(GetReferenceSymbol, hostElement);                
+                var child = create(new JSObjectControlHandle(hostElementJsReference));
+                var attachmenetReference = Invoke<IJSInProcessObjectReference>(CreateAttachmentSymbol);
+                // It has to be assigned to the variable before property setter is called so we dispose it on exception
+#pragma warning disable IDE0017 // Simplify object initialization
+                a = new Attachment(attachmenetReference, child);
+#pragma warning restore IDE0017 // Simplify object initialization
+                a.AttachedTo = this;
+                return a;
+            }
+            catch
+            {
+                a?.Dispose();
+                throw;
+            }
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(IPlatformHandle handle)
+        {
+            var attachmenetReference = Invoke<IJSInProcessObjectReference>(CreateAttachmentSymbol);
+            var a = new Attachment(attachmenetReference, handle);
+            a.AttachedTo = this;
+            return a;
+        }
+
+        public bool IsCompatibleWith(IPlatformHandle handle) => handle is JSObjectControlHandle;
+
+        class Attachment : INativeControlHostControlTopLevelAttachment
+        {
+            private const string InitializeWithChildHandleSymbol = "InitializeWithChildHandle";
+            private const string AttachToSymbol = "AttachTo";
+            private const string ShowInBoundsSymbol = "ShowInBounds";
+            private const string HideWithSizeSymbol = "HideWithSize";
+            private const string ReleaseChildSymbol = "ReleaseChild";
+
+            private IJSInProcessObjectReference? _native;
+            private NativeControlHostInterop? _attachedTo;
+
+            public Attachment(IJSInProcessObjectReference native, IPlatformHandle handle)
+            {
+                _native = native;
+                _native.InvokeVoid(InitializeWithChildHandleSymbol, ((JSObjectControlHandle)handle).Object);
+            }
+
+            public void Dispose()
+            {
+                if (_native != null)
+                {
+                    _native.InvokeVoid(ReleaseChildSymbol);
+                    _native.Dispose();
+                    _native = null;
+                }
+            }
+
+            public INativeControlHostImpl? AttachedTo
+            {
+                get => _attachedTo!;
+                set
+                {
+                    CheckDisposed();
+
+                    var host = (NativeControlHostInterop?)value;
+                    if (host == null)
+                    {
+                        _native.InvokeVoid(AttachToSymbol);
+                    }
+                    else
+                    {
+                        _native.InvokeVoid(AttachToSymbol, host.hostElement);
+                    }
+                    _attachedTo = host;
+                }
+            }
+
+            public bool IsCompatibleWith(INativeControlHostImpl host) => host is NativeControlHostInterop;
+
+            public void HideWithSize(Size size)
+            {
+                CheckDisposed();
+                if (_attachedTo == null)
+                    return;
+
+                _native.InvokeVoid(HideWithSizeSymbol, Math.Max(1, (float)size.Width), Math.Max(1, (float)size.Height));
+            }
+
+            public void ShowInBounds(Rect bounds)
+            {
+                CheckDisposed();
+
+                if (_attachedTo == null)
+                    throw new InvalidOperationException("Native control isn't attached to a toplevel");
+
+                bounds = new Rect(bounds.X, bounds.Y, Math.Max(1, bounds.Width),
+                    Math.Max(1, bounds.Height));
+
+                _native.InvokeVoid(ShowInBoundsSymbol, (float)bounds.X, (float)bounds.Y, (float)bounds.Width, (float)bounds.Height);
+            }
+
+            [MemberNotNull(nameof(_native))]
+            private void CheckDisposed()
+            {
+                if (_native == null)
+                    throw new ObjectDisposedException(nameof(Attachment));
+            }
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/NativeControlHost.ts b/src/Web/Avalonia.Web.Blazor/Interop/Typescript/NativeControlHost.ts
new file mode 100644
index 0000000000..baa9191845
--- /dev/null
+++ b/src/Web/Avalonia.Web.Blazor/Interop/Typescript/NativeControlHost.ts
@@ -0,0 +1,56 @@
+export class NativeControlHost {
+    public static CreateDefaultChild(parent: HTMLElement): HTMLElement {
+        return document.createElement("div");
+    }
+
+    // Used to convert ElementReference to JSObjectReference.
+    // Is there a better way?
+    public static GetReference(element: Element): Element {
+        return element;
+    }
+
+    public static CreateAttachment(): NativeControlHostTopLevelAttachment {
+        return new NativeControlHostTopLevelAttachment();
+    }
+}
+
+class NativeControlHostTopLevelAttachment
+{
+    _child: HTMLElement;
+    _host: HTMLElement;
+
+    InitializeWithChildHandle(child: HTMLElement) {
+        this._child = child;
+        this._child.style.position = "absolute";
+    }
+
+    AttachTo(host: HTMLElement): void {
+        if (this._host) {
+            this._host.removeChild(this._child);
+        }
+
+        this._host = host;
+
+        if (this._host) {
+            this._host.appendChild(this._child);
+        }
+    }
+
+    ShowInBounds(x: number, y: number, width: number, height: number): void {
+        this._child.style.top = y + "px";
+        this._child.style.left = x + "px";
+        this._child.style.width = width + "px";
+        this._child.style.height = height + "px";
+        this._child.style.display = "block";
+    }
+
+    HideWithSize(width: number, height: number): void {
+        this._child.style.width = width + "px";
+        this._child.style.height = height + "px";
+        this._child.style.display = "none";
+    }
+
+    ReleaseChild(): void {
+        this._child = null;
+    }
+}
diff --git a/src/Web/Avalonia.Web.Blazor/JSObjectControlHandle.cs b/src/Web/Avalonia.Web.Blazor/JSObjectControlHandle.cs
new file mode 100644
index 0000000000..4426c3fbd7
--- /dev/null
+++ b/src/Web/Avalonia.Web.Blazor/JSObjectControlHandle.cs
@@ -0,0 +1,35 @@
+#nullable enable
+using Avalonia.Controls.Platform;
+
+using Microsoft.JSInterop;
+
+namespace Avalonia.Web.Blazor
+{
+    public class JSObjectControlHandle : INativeControlHostDestroyableControlHandle
+    {
+        internal const string ElementReferenceDescriptor = "JSObjectReference";
+
+        public JSObjectControlHandle(IJSObjectReference reference)
+        {
+            Object = reference;
+        }
+
+        public IJSObjectReference Object { get; }
+
+        public IntPtr Handle => throw new NotSupportedException();
+
+        public string? HandleDescriptor => ElementReferenceDescriptor;
+
+        public void Destroy()
+        {
+            if (Object is IJSInProcessObjectReference inProcess)
+            {
+                inProcess.Dispose();
+            }
+            else
+            {
+                _ = Object.DisposeAsync();
+            }
+        }
+    }
+}
diff --git a/src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs b/src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs
index 209a635a7b..a8a1a970dc 100644
--- a/src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs
+++ b/src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs
@@ -13,19 +13,19 @@ using SkiaSharp;
 
 namespace Avalonia.Web.Blazor
 {
-    internal class RazorViewTopLevelImpl : ITopLevelImplWithTextInputMethod
+    internal class RazorViewTopLevelImpl : ITopLevelImplWithTextInputMethod, ITopLevelImplWithNativeControlHost
     {
         private Size _clientSize;
         private BlazorSkiaSurface? _currentSurface;
         private IInputRoot? _inputRoot;
         private readonly Stopwatch _sw = Stopwatch.StartNew();
-        private readonly ITextInputMethodImpl _textInputMethod;
+        private readonly AvaloniaView _avaloniaView;
         private readonly TouchDevice _touchDevice;
         private string _currentCursor = CssCursor.Default;
 
-        public RazorViewTopLevelImpl(ITextInputMethodImpl textInputMethod)
+        public RazorViewTopLevelImpl(AvaloniaView avaloniaView)
         {
-            _textInputMethod = textInputMethod;
+            _avaloniaView = avaloniaView;
             TransparencyLevel = WindowTransparencyLevel.None;
             AcrylicCompensationLevels = new AcrylicPlatformCompensationLevels(1, 1, 1);
             _touchDevice = new TouchDevice();
@@ -91,9 +91,16 @@ namespace Avalonia.Web.Blazor
             }
         }
 
-        public void RawKeyboardEvent(RawKeyEventType type, string key, RawInputModifiers modifiers)
+        public void RawKeyboardEvent(RawKeyEventType type, string code, string key, RawInputModifiers modifiers)
         {
-            if (Keycodes.KeyCodes.TryGetValue(key, out var avkey))
+            if (Keycodes.KeyCodes.TryGetValue(code, out var avkey))
+            {
+                if (_inputRoot is { })
+                {
+                    Input?.Invoke(new RawKeyEventArgs(KeyboardDevice, Timestamp, _inputRoot, type, avkey, modifiers));
+                }
+            }
+            else if (Keycodes.KeyCodes.TryGetValue(key, out avkey))
             {
                 if (_inputRoot is { })
                 {
@@ -175,6 +182,8 @@ namespace Avalonia.Web.Blazor
         public WindowTransparencyLevel TransparencyLevel { get; }
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; }
 
-        public ITextInputMethodImpl TextInputMethod => _textInputMethod;
+        public ITextInputMethodImpl TextInputMethod => _avaloniaView;
+
+        public INativeControlHostImpl? NativeControlHost => _avaloniaView.GetNativeControlHostImpl();
     }
 }
diff --git a/src/Web/Avalonia.Web.Blazor/WinStubs.cs b/src/Web/Avalonia.Web.Blazor/WinStubs.cs
index 7b2bff6bfd..a1fecef10e 100644
--- a/src/Web/Avalonia.Web.Blazor/WinStubs.cs
+++ b/src/Web/Avalonia.Web.Blazor/WinStubs.cs
@@ -8,21 +8,6 @@ using Avalonia.Platform;
 
 namespace Avalonia.Web.Blazor
 {
-    internal class ClipboardStub : IClipboard
-    {
-        public Task<string> GetTextAsync() => Task.FromResult("");
-
-        public Task SetTextAsync(string text) => Task.CompletedTask;
-
-        public Task ClearAsync() => Task.CompletedTask;
-
-        public Task SetDataObjectAsync(IDataObject data) => Task.CompletedTask;
-
-        public Task<string[]> GetFormatsAsync() => Task.FromResult(Array.Empty<string>());
-
-        public Task<object> GetDataAsync(string format) => Task.FromResult<object>(new ());
-    }
-
     internal class IconLoaderStub : IPlatformIconLoader
     {
         private class IconStub : IWindowIconImpl
@@ -55,5 +40,20 @@ namespace Avalonia.Web.Blazor
 
         public IReadOnlyList<Screen> AllScreens { get; } =
             new[] { new Screen(96, new PixelRect(0, 0, 4000, 4000), new PixelRect(0, 0, 4000, 4000), true) };
+
+        public Screen? ScreenFromPoint(PixelPoint point)
+        {
+            return ScreenHelper.ScreenFromPoint(point, AllScreens);
+        }
+
+        public Screen? ScreenFromRect(PixelRect rect)
+        {
+            return ScreenHelper.ScreenFromRect(rect, AllScreens);
+        }
+
+        public Screen? ScreenFromWindow(IWindowBaseImpl window)
+        {
+            return ScreenHelper.ScreenFromWindow(window, AllScreens);
+        }
     }
 }
diff --git a/src/Web/Avalonia.Web.Blazor/WindowingPlatform.cs b/src/Web/Avalonia.Web.Blazor/WindowingPlatform.cs
index ac970d067f..0575533152 100644
--- a/src/Web/Avalonia.Web.Blazor/WindowingPlatform.cs
+++ b/src/Web/Avalonia.Web.Blazor/WindowingPlatform.cs
@@ -34,7 +34,7 @@ namespace Avalonia.Web.Blazor
             var instance = new BlazorWindowingPlatform();
             s_keyboard = new KeyboardDevice();
             AvaloniaLocator.CurrentMutable
-                .Bind<IClipboard>().ToSingleton<ClipboardStub>()
+                .Bind<IClipboard>().ToSingleton<ClipboardImpl>()
                 .Bind<ICursorFactory>().ToSingleton<CssCursorFactory>()
                 .Bind<IKeyboardDevice>().ToConstant(s_keyboard)
                 .Bind<IPlatformSettings>().ToConstant(instance)
diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
index a1d8a60cb9..03b3ebec0d 100644
--- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
+++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
@@ -18,4 +18,15 @@
   <Import Project="..\..\..\build\SharpDX.props" />
   <Import Project="..\..\..\build\HarfBuzzSharp.props" />
   <Import Project="..\..\..\build\JetBrains.Annotations.props" />
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
+
+  <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Direct2D1.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Direct2D1.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  
 </Project>
diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index c32c58605f..04025f92e4 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -9,7 +9,7 @@ using Avalonia.Direct2D1.Media.Imaging;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using SharpDX.DirectWrite;
 using GlyphRun = Avalonia.Media.GlyphRun;
 using TextAlignment = Avalonia.Media.TextAlignment;
@@ -159,6 +159,34 @@ namespace Avalonia.Direct2D1
         public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children) => new GeometryGroupImpl(fillRule, children);
         public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2) => new CombinedGeometryImpl(combineMode, g1, g2);
 
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun, out Matrix scale)
+        {
+            if (glyphRun.GlyphTypeface.PlatformImpl is not GlyphTypefaceImpl glyphTypeface)
+            {
+                throw new InvalidOperationException("PlatformImpl can't be null.");
+            }
+
+            var pathGeometry = new SharpDX.Direct2D1.PathGeometry(Direct2D1Factory);
+
+            using (var sink = pathGeometry.Open())
+            {
+                var glyphs = new short[glyphRun.GlyphIndices.Count];
+
+                for (int i = 0; i < glyphRun.GlyphIndices.Count; i++)
+                {
+                    glyphs[i] = (short)glyphRun.GlyphIndices[i];
+                }
+
+                glyphTypeface.FontFace.GetGlyphRunOutline((float)glyphRun.FontRenderingEmSize, glyphs, null, null, false, !glyphRun.IsLeftToRight, sink);
+
+                sink.Close();
+            }
+
+            scale = Matrix.Identity;
+
+            return new StreamGeometryImpl(pathGeometry);
+        }      
+
         /// <inheritdoc />
         public IBitmapImpl LoadBitmap(string fileName)
         {
diff --git a/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs
index ad609a0810..602ea9b568 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs
@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public abstract class BrushImpl : IDisposable
     {
         public SharpDX.Direct2D1.Brush PlatformBrush { get; set; }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index b62a6fa5a6..a0f98bbbc9 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -5,17 +5,19 @@ using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using SharpDX;
 using SharpDX.Direct2D1;
 using SharpDX.Mathematics.Interop;
-using BitmapInterpolationMode = Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode;
+using BitmapInterpolationMode = Avalonia.Media.Imaging.BitmapInterpolationMode;
+using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
     /// <summary>
     /// Draws using Direct2D1.
     /// </summary>
+    [Unstable]
     public class DrawingContextImpl : IDrawingContextImpl
     {
         private readonly IVisualBrushRenderer _visualBrushRenderer;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index ec88347a17..c84c14daac 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -1,4 +1,5 @@
 using Avalonia.Logging;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
@@ -7,6 +8,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// The platform-specific interface for <see cref="Avalonia.Media.Geometry"/>.
     /// </summary>
+    [Unstable]
     public abstract class GeometryImpl : IGeometryImpl
     {
         private const float ContourApproximation = 0.0001f;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs
index 4f2ed22a25..4154b44702 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs
@@ -1,11 +1,13 @@
 using System;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using HarfBuzzSharp;
 using SharpDX.DirectWrite;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class GlyphTypefaceImpl : IGlyphTypefaceImpl
     {
         private bool _isDisposed;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
index 09b900b0c2..17dc359ed7 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
@@ -1,15 +1,17 @@
 using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.Rendering.Utilities;
 using Avalonia.Utilities;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public sealed class ImageBrushImpl : BrushImpl
     {
         private readonly OptionalDispose<Bitmap> _bitmap;
 
-        private readonly Visuals.Media.Imaging.BitmapInterpolationMode _bitmapInterpolationMode;
+        private readonly Avalonia.Media.Imaging.BitmapInterpolationMode _bitmapInterpolationMode;
 
         public ImageBrushImpl(
             ITileBrush brush,
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
index af6d5c5e7b..843efe2cc4 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
@@ -1,10 +1,12 @@
 using System;
 using System.IO;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public abstract class BitmapImpl : IBitmapImpl, IDisposable
     {
         public abstract Vector Dpi { get; }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
index 63676e30b5..2656ab4c58 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Avalonia.Metadata;
 using SharpDX.WIC;
 using Bitmap = SharpDX.Direct2D1.Bitmap;
 
@@ -8,6 +9,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A Direct2D Bitmap implementation that uses a GPU memory bitmap as its image.
     /// </summary>
+    [Unstable]
     public class D2DBitmapImpl : BitmapImpl
     {
         private readonly Bitmap _direct2DBitmap;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
index 9a0e2ec00c..357e472d34 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Utilities;
@@ -9,6 +10,7 @@ using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media.Imaging
 {
+    [Unstable]
     public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IDrawingContextLayerImpl, ILayerFactory
     {
         private readonly BitmapRenderTarget _renderTarget;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
index cac35aa4ae..1156246b29 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
@@ -5,31 +5,33 @@ using SharpDX.WIC;
 using APixelFormat = Avalonia.Platform.PixelFormat;
 using AlphaFormat = Avalonia.Platform.AlphaFormat;
 using D2DBitmap = SharpDX.Direct2D1.Bitmap;
+using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
     /// <summary>
     /// A WIC implementation of a <see cref="Avalonia.Media.Imaging.Bitmap"/>.
     /// </summary>
+    [Unstable]
     public class WicBitmapImpl : BitmapImpl
     {
         private readonly BitmapDecoder _decoder;
 
-        private static BitmapInterpolationMode ConvertInterpolationMode(Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode interpolationMode)
+        private static BitmapInterpolationMode ConvertInterpolationMode(Avalonia.Media.Imaging.BitmapInterpolationMode interpolationMode)
         {
             switch (interpolationMode)
             {
-                case Visuals.Media.Imaging.BitmapInterpolationMode.Default:
+                case Avalonia.Media.Imaging.BitmapInterpolationMode.Default:
                     return BitmapInterpolationMode.Fant;
 
-                case Visuals.Media.Imaging.BitmapInterpolationMode.LowQuality:
+                case Avalonia.Media.Imaging.BitmapInterpolationMode.LowQuality:
                     return BitmapInterpolationMode.NearestNeighbor;
 
-                case Visuals.Media.Imaging.BitmapInterpolationMode.MediumQuality:
+                case Avalonia.Media.Imaging.BitmapInterpolationMode.MediumQuality:
                     return BitmapInterpolationMode.Fant;
 
                 default:
-                case Visuals.Media.Imaging.BitmapInterpolationMode.HighQuality:
+                case Avalonia.Media.Imaging.BitmapInterpolationMode.HighQuality:
                     return BitmapInterpolationMode.HighQualityCubic;
 
             }
@@ -118,7 +120,7 @@ namespace Avalonia.Direct2D1.Media
             }
         }
 
-        public WicBitmapImpl(Stream stream, int decodeSize, bool horizontal, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode interpolationMode)
+        public WicBitmapImpl(Stream stream, int decodeSize, bool horizontal, Avalonia.Media.Imaging.BitmapInterpolationMode interpolationMode)
         {
             _decoder = new BitmapDecoder(Direct2D1Platform.ImagingFactory, stream, DecodeOptions.CacheOnLoad);
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
index 1265a7bdf0..8c9d01f37d 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
@@ -1,10 +1,12 @@
 using System;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class WicRenderTargetBitmapImpl : WicBitmapImpl, IDrawingContextLayerImpl
     {
         private readonly WicRenderTarget _renderTarget;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
index fef6a9aa82..885be132a4 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Direct2D1.Media.Imaging
     class WriteableWicBitmapImpl : WicBitmapImpl, IWriteableBitmapImpl
     {
         public WriteableWicBitmapImpl(Stream stream, int decodeSize, bool horizontal,
-            Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode interpolationMode)
+            Avalonia.Media.Imaging.BitmapInterpolationMode interpolationMode)
         : base(stream, decodeSize, horizontal, interpolationMode)
         {
         }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs
index 0e63d4cc03..5dfe683f59 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs
@@ -1,8 +1,10 @@
 using System.Linq;
 using Avalonia.Media;
+using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class LinearGradientBrushImpl : BrushImpl
     {
         public LinearGradientBrushImpl(
diff --git a/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs
index 1fca6d4e33..0069e47001 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs
@@ -1,8 +1,10 @@
 using System.Linq;
 using Avalonia.Media;
+using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class RadialGradientBrushImpl : BrushImpl
     {
         public RadialGradientBrushImpl(
diff --git a/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs
index fea1ca9157..b85494e2c1 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs
@@ -1,7 +1,9 @@
 using Avalonia.Media;
+using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class SolidColorBrushImpl : BrushImpl
     {
         public SolidColorBrushImpl(ISolidColorBrush brush, SharpDX.Direct2D1.RenderTarget target)
diff --git a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs
index e1f7aad1b2..ec8f82556d 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs
@@ -1,6 +1,7 @@
 using System;
 using Avalonia.Logging;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 using D2D = SharpDX.Direct2D1;
@@ -8,6 +9,7 @@ using SweepDirection = SharpDX.Direct2D1.SweepDirection;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class StreamGeometryContextImpl : IStreamGeometryContextImpl
     {
         private readonly GeometrySink _sink;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
index 2bc2b2db71..e1677c0ed1 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
@@ -1,3 +1,4 @@
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
@@ -6,6 +7,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A Direct2D implementation of a <see cref="Avalonia.Media.StreamGeometry"/>.
     /// </summary>
+    [Unstable]
     public class StreamGeometryImpl : GeometryImpl, IStreamGeometryImpl
     {
         /// <summary>
diff --git a/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
index 62cf031f86..6e32d32913 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
 using Avalonia.Platform;
@@ -11,33 +10,31 @@ using GlyphInfo = HarfBuzzSharp.GlyphInfo;
 
 namespace Avalonia.Direct2D1.Media
 {
-
-internal class TextShaperImpl : ITextShaperImpl
+    internal class TextShaperImpl : ITextShaperImpl
     {
-        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize,
-            CultureInfo culture, sbyte bidiLevel)
+        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options)
         {
+            var typeface = options.Typeface;
+            var fontRenderingEmSize = options.FontRenderingEmSize;
+            var bidiLevel = options.BidiLevel;
+            var culture = options.Culture;
+
             using (var buffer = new Buffer())
             {
-                buffer.AddUtf16(text.Buffer.Span, text.Start, text.Length);
+                buffer.AddUtf16(text.Buffer.Span, text.BufferOffset, text.Length);
 
                 MergeBreakPair(buffer);
-                
+
                 buffer.GuessSegmentProperties();
 
-                buffer.Direction = (bidiLevel & 1) == 0 ? Direction.LeftToRight : Direction.RightToLeft;
+                buffer.Direction = Direction.LeftToRight; //Always shape LeftToRight
 
-                buffer.Language = new Language(culture ?? CultureInfo.CurrentCulture);              
+                buffer.Language = new Language(culture ?? CultureInfo.CurrentCulture);
 
                 var font = ((GlyphTypefaceImpl)typeface.PlatformImpl).Font;
 
                 font.Shape(buffer);
 
-                if (buffer.Direction == Direction.RightToLeft)
-                {
-                    buffer.Reverse();
-                }
-
                 font.GetScale(out var scaleX, out _);
 
                 var textScale = fontRenderingEmSize / scaleX;
@@ -56,15 +53,22 @@ internal class TextShaperImpl : ITextShaperImpl
 
                     var glyphIndex = (ushort)sourceInfo.Codepoint;
 
-                    var glyphCluster = (int)sourceInfo.Cluster;
+                    var glyphCluster = (int)(sourceInfo.Cluster);
 
                     var glyphAdvance = GetGlyphAdvance(glyphPositions, i, textScale);
 
                     var glyphOffset = GetGlyphOffset(glyphPositions, i, textScale);
 
-                    var targetInfo =
-                        new Avalonia.Media.TextFormatting.GlyphInfo(glyphIndex, glyphCluster, glyphAdvance,
-                            glyphOffset);
+                    if (glyphIndex == 0 && text.Buffer.Span[glyphCluster] == '\t')
+                    {
+                        glyphIndex = typeface.GetGlyph(' ');
+
+                        glyphAdvance = options.IncrementalTabWidth > 0 ?
+                            options.IncrementalTabWidth :
+                            4 * typeface.GetGlyphAdvance(glyphIndex) * textScale;
+                    }
+
+                    var targetInfo = new Avalonia.Media.TextFormatting.GlyphInfo(glyphIndex, glyphCluster, glyphAdvance, glyphOffset);
 
                     shapedBuffer[i] = targetInfo;
                 }
@@ -78,7 +82,7 @@ internal class TextShaperImpl : ITextShaperImpl
             var length = buffer.Length;
 
             var glyphInfos = buffer.GetGlyphInfoSpan();
-            
+
             var second = glyphInfos[length - 1];
 
             if (!new Codepoint((int)second.Codepoint).IsBreakChar)
@@ -89,7 +93,7 @@ internal class TextShaperImpl : ITextShaperImpl
             if (length > 1 && glyphInfos[length - 2].Codepoint == '\r' && second.Codepoint == '\n')
             {
                 var first = glyphInfos[length - 2];
-                
+
                 first.Codepoint = '\u200C';
                 second.Codepoint = '\u200C';
                 second.Cluster = first.Cluster;
@@ -100,7 +104,7 @@ internal class TextShaperImpl : ITextShaperImpl
                     {
                         *p = first;
                     }
-                
+
                     fixed (GlyphInfo* p = &glyphInfos[length - 1])
                     {
                         *p = second;
@@ -135,7 +139,7 @@ internal class TextShaperImpl : ITextShaperImpl
         private static double GetGlyphAdvance(ReadOnlySpan<GlyphPosition> glyphPositions, int index, double textScale)
         {
             // Depends on direction of layout
-            // advanceBuffer[index] = buffer.GlyphPositions[index].YAdvance * textScale;
+            // glyphPositions[index].YAdvance * textScale;
             return glyphPositions[index].XAdvance * textScale;
         }
     }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
index fe274701bf..3ecdb49e46 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
@@ -1,8 +1,10 @@
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
+    [Unstable]
     public class TransformedGeometryImpl : GeometryImpl, ITransformedGeometryImpl
     {
         /// <summary>
diff --git a/src/Windows/Avalonia.Direct2D1/Properties/AssemblyInfo.cs b/src/Windows/Avalonia.Direct2D1/Properties/AssemblyInfo.cs
deleted file mode 100644
index 89fd6c2dd8..0000000000
--- a/src/Windows/Avalonia.Direct2D1/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Direct2D1.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
diff --git a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
index 9f49808422..cc8a40e2d4 100644
--- a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
+++ b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
@@ -18,4 +18,5 @@
   </ItemGroup>
 
   <Import Project="..\..\..\build\SharpDX.props" />
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs b/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
index 1085aa1b42..1ec0ee9e2e 100644
--- a/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
+++ b/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Win32.Automation
             return GetOrCreate(focus);
         }
 
-        public void FocusChanged(object sender, EventArgs e)
+        public void FocusChanged(object? sender, EventArgs e)
         {
             RaiseFocusChanged(GetOrCreate(Peer.GetFocus()));
         }
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index ba842757d7..55d02b5d31 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -16,5 +16,10 @@
     <MicroComIdl Include="WinRT\winrt.idl" CSharpInteropPath="WinRT\WinRT.Generated.cs" />
     <MicroComIdl Include="Win32Com\win32.idl" CSharpInteropPath="Win32Com\Win32.Generated.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />    
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
+  <PropertyGroup Label="Warnings">
+    <NoWarn Condition="'$(NoWarn)' == ''">CA1416</NoWarn>
+    <NoWarn Condition="'$(NoWarn)' != ''">$(NoWarn),CA1416</NoWarn>
+  </PropertyGroup>
 </Project>
diff --git a/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs b/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs
index 71e33554f1..3adefd965f 100644
--- a/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs
+++ b/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs
@@ -37,6 +37,24 @@ namespace Avalonia.Win32.Input
             IsComposing = false;
         }
 
+        public void ClearLanguageAndWindow()
+        {
+            if (HWND != IntPtr.Zero && _defaultImc != IntPtr.Zero)
+            {
+                ImmReleaseContext(HWND, _defaultImc);
+            }
+
+            _defaultImc = IntPtr.Zero;
+            HWND = IntPtr.Zero;
+            _parent = null;
+            _active = false;
+            _langId = 0;
+            _showCompositionWindow = false;
+            _showCandidateList = false;
+
+            IsComposing = false;
+        }
+
         //Dependant on CurrentThread. When Avalonia will support Multiple Dispatchers -
         //every Dispatcher should have their own InputMethod.
         public static Imm32InputMethod Current { get; } = new Imm32InputMethod();
@@ -74,12 +92,12 @@ namespace Avalonia.Win32.Input
             }
         }
 
-        public void SetActive(bool active)
+        public void SetClient(ITextInputMethodClient client)
         {
-            _active = active;
+            _active = client is { };
             Dispatcher.UIThread.Post(() =>
             {
-                if (active)
+                if (_active)
                 {
                     if (DefaultImc != IntPtr.Zero)
                     {
@@ -216,7 +234,7 @@ namespace Avalonia.Win32.Input
             ImmSetCompositionFont(himc, ref logFont);
         }
         
-        public void SetOptions(TextInputOptionsQueryEventArgs options)
+        public void SetOptions(TextInputOptions options)
         {
             // we're skipping this. not usable on windows
         }
diff --git a/src/Windows/Avalonia.Win32/Interop/Automation/ISelectionItemProvider.cs b/src/Windows/Avalonia.Win32/Interop/Automation/ISelectionItemProvider.cs
index 1de0cf0f9b..8d6677315c 100644
--- a/src/Windows/Avalonia.Win32/Interop/Automation/ISelectionItemProvider.cs
+++ b/src/Windows/Avalonia.Win32/Interop/Automation/ISelectionItemProvider.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Runtime.InteropServices;
 
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index f7838c9f46..b1e4d8ca01 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -765,6 +765,14 @@ namespace Avalonia.Win32.Interop
             DWMWA_CLOAK,
             DWMWA_CLOAKED,
             DWMWA_FREEZE_REPRESENTATION,
+            DWMWA_PASSIVE_UPDATE_MODE,
+            DWMWA_USE_HOSTBACKDROPBRUSH,
+            DWMWA_USE_IMMERSIVE_DARK_MODE = 20,
+            DWMWA_WINDOW_CORNER_PREFERENCE = 33,
+            DWMWA_BORDER_COLOR,
+            DWMWA_CAPTION_COLOR,
+            DWMWA_TEXT_COLOR,
+            DWMWA_VISIBLE_FRAME_BORDER_THICKNESS,
             DWMWA_LAST
         };
 
@@ -906,9 +914,9 @@ namespace Avalonia.Win32.Interop
         [DllImport("user32.dll")]
         public static extern bool EnumDisplayMonitors(IntPtr hdc, IntPtr lprcClip,
                                                       MonitorEnumDelegate lpfnEnum, IntPtr dwData);
-        
+
         public delegate bool MonitorEnumDelegate(IntPtr hMonitor, IntPtr hdcMonitor, ref Rect lprcMonitor, IntPtr dwData);
-        
+
         [DllImport("user32.dll", SetLastError = true)]
         public static extern IntPtr GetDC(IntPtr hWnd);
 
@@ -999,7 +1007,7 @@ namespace Avalonia.Win32.Interop
 
         public static uint GetWindowLong(IntPtr hWnd, int nIndex)
         {
-            if(IntPtr.Size == 4)
+            if (IntPtr.Size == 4)
             {
                 return GetWindowLong32b(hWnd, nIndex);
             }
@@ -1026,7 +1034,7 @@ namespace Avalonia.Win32.Interop
                 return (uint)SetWindowLong64b(hWnd, nIndex, new IntPtr((uint)value)).ToInt32();
             }
         }
-        
+
         public static IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr handle)
         {
             if (IntPtr.Size == 4)
@@ -1060,14 +1068,14 @@ namespace Avalonia.Win32.Interop
 
         [DllImport("user32.dll")]
         public static extern bool InvalidateRect(IntPtr hWnd, RECT* lpRect, bool bErase);
-        
-        
+
+
         [DllImport("user32.dll")]
         public static extern bool ValidateRect(IntPtr hWnd, IntPtr lpRect);
 
         [DllImport("user32.dll")]
         public static extern bool IsWindow(IntPtr hWnd);
-        
+
         [DllImport("user32.dll")]
         public static extern bool IsWindowEnabled(IntPtr hWnd);
 
@@ -1094,22 +1102,25 @@ namespace Avalonia.Win32.Interop
 
         [DllImport("user32")]
         public static extern IntPtr GetMessageExtraInfo();
-        
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode, EntryPoint = "RegisterClassExW")]
         public static extern ushort RegisterClassEx(ref WNDCLASSEX lpwcx);
 
         [DllImport("user32.dll")]
         public static extern void RegisterTouchWindow(IntPtr hWnd, int flags);
-        
+
         [DllImport("user32.dll")]
         public static extern bool ReleaseCapture();
 
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern uint RegisterWindowMessage(string lpString);
+
         [DllImport("user32.dll")]
         public static extern bool ScreenToClient(IntPtr hWnd, ref POINT lpPoint);
 
         [DllImport("user32.dll", SetLastError = true)]
         public static extern IntPtr GetActiveWindow();
-        
+
         [DllImport("user32.dll", SetLastError = true)]
         public static extern IntPtr SetActiveWindow(IntPtr hWnd);
 
@@ -1296,7 +1307,7 @@ namespace Avalonia.Win32.Interop
 
         [DllImport("kernel32.dll", SetLastError = true)]
         public static extern IntPtr LoadLibrary(string fileName);
-        
+
         [DllImport("kernel32.dll", SetLastError = true)]
         public static extern IntPtr LoadLibraryEx(string fileName, IntPtr hFile, int flags);
 
@@ -1340,7 +1351,7 @@ namespace Avalonia.Win32.Interop
 
         [DllImport("user32.dll")]
         public static extern IntPtr MonitorFromWindow(IntPtr hwnd, MONITOR dwFlags);
-        
+
         [DllImport("user32", EntryPoint = "GetMonitorInfoW", ExactSpelling = true, CharSet = CharSet.Unicode)]
         [return: MarshalAs(UnmanagedType.Bool)]
         public static extern bool GetMonitorInfo([In] IntPtr hMonitor, ref MONITORINFO lpmi);
@@ -1348,14 +1359,14 @@ namespace Avalonia.Win32.Interop
         [DllImport("user32")]
         public static extern unsafe bool GetTouchInputInfo(
             IntPtr hTouchInput,
-            uint        cInputs,
+            uint cInputs,
             TOUCHINPUT* pInputs,
-            int         cbSize
+            int cbSize
         );
-        
+
         [DllImport("user32")]
         public static extern bool CloseTouchInputHandle(IntPtr hTouchInput);
-        
+
         [return: MarshalAs(UnmanagedType.Bool)]
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode, EntryPoint = "PostMessageW")]
         public static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
@@ -1364,7 +1375,7 @@ namespace Avalonia.Win32.Interop
         public static extern int SetDIBitsToDevice(IntPtr hdc, int XDest, int YDest, uint
                 dwWidth, uint dwHeight, int XSrc, int YSrc, uint uStartScan, uint cScanLines,
             IntPtr lpvBits, [In] ref BITMAPINFOHEADER lpbmi, uint fuColorUse);
-        
+
         [DllImport("kernel32.dll", SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
         public static extern bool CloseHandle(IntPtr hObject);
@@ -1379,27 +1390,27 @@ namespace Avalonia.Win32.Interop
 
         [DllImport("gdi32.dll")]
         public static extern int ChoosePixelFormat(IntPtr hdc, ref PixelFormatDescriptor pfd);
-        
+
         [DllImport("gdi32.dll")]
         public static extern int DescribePixelFormat(IntPtr hdc, ref PixelFormatDescriptor pfd);
 
         [DllImport("gdi32.dll")]
         public static extern int SetPixelFormat(IntPtr hdc, int iPixelFormat, ref PixelFormatDescriptor pfd);
-        
-        
+
+
         [DllImport("gdi32.dll")]
         public static extern int DescribePixelFormat(IntPtr hdc, int iPixelFormat, int bytes, ref PixelFormatDescriptor pfd);
-        
+
         [DllImport("gdi32.dll")]
         public static extern bool SwapBuffers(IntPtr hdc);
 
         [DllImport("opengl32.dll")]
         public static extern IntPtr wglCreateContext(IntPtr hdc);
-        
+
         [DllImport("opengl32.dll")]
         public static extern bool wglDeleteContext(IntPtr context);
 
-        
+
         [DllImport("opengl32.dll")]
         public static extern bool wglMakeCurrent(IntPtr hdc, IntPtr context);
 
@@ -1420,9 +1431,9 @@ namespace Avalonia.Win32.Interop
             uint dwMaximumSizeLow,
             string lpName);
 
-        [DllImport("msvcrt.dll", EntryPoint="memcpy", SetLastError = false, CallingConvention=CallingConvention.Cdecl)]
-        public static extern IntPtr CopyMemory(IntPtr dest, IntPtr src, UIntPtr count); 
-        
+        [DllImport("msvcrt.dll", EntryPoint = "memcpy", SetLastError = false, CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr CopyMemory(IntPtr dest, IntPtr src, UIntPtr count);
+
         [DllImport("ole32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
         public static extern HRESULT RegisterDragDrop(IntPtr hwnd, IntPtr target);
 
@@ -1456,15 +1467,18 @@ namespace Avalonia.Win32.Interop
         [DllImport("dwmapi.dll")]
         public static extern int DwmGetWindowAttribute(IntPtr hwnd, int dwAttribute, out RECT pvAttribute, int cbAttribute);
 
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmSetWindowAttribute(IntPtr hwnd, int dwAttribute, void* pvAttribute, int cbAttribute);
+
         [DllImport("dwmapi.dll")]
         public static extern int DwmIsCompositionEnabled(out bool enabled);
 
         [DllImport("dwmapi.dll")]
         public static extern void DwmFlush();
-        
+
         [DllImport("dwmapi.dll")]
         public static extern bool DwmDefWindowProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam, ref IntPtr plResult);
-        
+
         [DllImport("dwmapi.dll")]
         public static extern void DwmEnableBlurBehindWindow(IntPtr hwnd, ref DWM_BLURBEHIND blurBehind);
         
@@ -1531,8 +1545,8 @@ namespace Avalonia.Win32.Interop
                 throw new Exception("RtlGetVersion failed!");
             }
         }
-        
-        [DllImport("kernel32", EntryPoint="WaitForMultipleObjectsEx", SetLastError = true, CharSet = CharSet.Auto)]
+
+        [DllImport("kernel32", EntryPoint = "WaitForMultipleObjectsEx", SetLastError = true, CharSet = CharSet.Auto)]
         private static extern int IntWaitForMultipleObjectsEx(int nCount, IntPtr[] pHandles, bool bWaitAll, int dwMilliseconds, bool bAlertable);
 
         public const int WAIT_FAILED = unchecked((int)0xFFFFFFFF);
@@ -1540,7 +1554,7 @@ namespace Avalonia.Win32.Interop
         internal static int WaitForMultipleObjectsEx(int nCount, IntPtr[] pHandles, bool bWaitAll, int dwMilliseconds, bool bAlertable)
         {
             int result = IntWaitForMultipleObjectsEx(nCount, pHandles, bWaitAll, dwMilliseconds, bAlertable);
-            if(result ==  WAIT_FAILED)
+            if (result == WAIT_FAILED)
             {
                 throw new Win32Exception();
             }
@@ -1688,7 +1702,7 @@ namespace Avalonia.Win32.Interop
             DrawLeftBorder = 0x20,
             DrawTopBorder = 0x40,
             DrawRightBorder = 0x80,
-            DrawBottomBorder = 0x100,            
+            DrawBottomBorder = 0x100,
         }
 
         [StructLayout(LayoutKind.Sequential)]
@@ -1756,9 +1770,9 @@ namespace Avalonia.Win32.Interop
             MDT_ANGULAR_DPI = 1,
             MDT_RAW_DPI = 2,
             MDT_DEFAULT = MDT_EFFECTIVE_DPI
-        } 
+        }
 
-        public enum ClipboardFormat 
+        public enum ClipboardFormat
         {
             /// <summary>
             /// Text format. Each line ends with a carriage return/linefeed (CR-LF) combination. A null character signals the end of the data. Use this format for ANSI text.
@@ -1809,7 +1823,7 @@ namespace Avalonia.Win32.Interop
             public int X;
             public int Y;
         }
-        
+
         public struct SIZE
         {
             public int X;
@@ -2010,7 +2024,7 @@ namespace Avalonia.Win32.Interop
             OFN_NOREADONLYRETURN = 0x00008000,
             OFN_OVERWRITEPROMPT = 0x00000002
         }
-        
+
         public enum HRESULT : uint
         {
             S_FALSE = 0x0001,
diff --git a/src/Windows/Avalonia.Win32/ScreenImpl.cs b/src/Windows/Avalonia.Win32/ScreenImpl.cs
index 442794f0f0..f3754cd58f 100644
--- a/src/Windows/Avalonia.Win32/ScreenImpl.cs
+++ b/src/Windows/Avalonia.Win32/ScreenImpl.cs
@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Win32.Interop;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
+    [Unstable]
     public class ScreenImpl : IScreenImpl
     {
         public int ScreenCount
@@ -70,5 +73,43 @@ namespace Avalonia.Win32
         {
             _allScreens = null;
         }
+
+        public Screen ScreenFromWindow(IWindowBaseImpl window)
+        {
+            var handle = window.Handle.Handle;
+
+            var monitor = MonitorFromWindow(handle, MONITOR.MONITOR_DEFAULTTONULL);
+
+            return FindScreenByHandle(monitor);
+        }
+
+        public Screen ScreenFromPoint(PixelPoint point)
+        {
+            var monitor = MonitorFromPoint(new POINT
+            {
+                X = point.X,
+                Y = point.Y
+            }, MONITOR.MONITOR_DEFAULTTONULL);
+
+            return FindScreenByHandle(monitor);
+        }
+
+        public Screen ScreenFromRect(PixelRect rect)
+        {
+            var monitor = MonitorFromRect(new RECT
+            {
+                left = rect.TopLeft.X,
+                top = rect.TopLeft.Y,
+                right = rect.TopRight.X,
+                bottom = rect.BottomRight.Y
+            }, MONITOR.MONITOR_DEFAULTTONULL);
+
+            return FindScreenByHandle(monitor);
+        }
+
+        private Screen FindScreenByHandle(IntPtr handle)
+        {
+            return AllScreens.Cast<WinScreen>().FirstOrDefault(m => m.Handle == handle);
+        }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/TrayIconImpl.cs b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
index 23395dd9b5..4d537a16a4 100644
--- a/src/Windows/Avalonia.Win32/TrayIconImpl.cs
+++ b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
@@ -5,6 +5,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.LogicalTree;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.Win32.Interop;
@@ -14,6 +15,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
+    [Unstable]
     public class TrayIconImpl : ITrayIconImpl
     {
         private readonly int _uniqueId;
@@ -24,6 +26,7 @@ namespace Avalonia.Win32
         private readonly Win32NativeToManagedMenuExporter _exporter;
         private static readonly Dictionary<int, TrayIconImpl> s_trayIcons = new Dictionary<int, TrayIconImpl>();
         private bool _disposedValue;
+        private static readonly uint WM_TASKBARCREATED = UnmanagedMethods.RegisterWindowMessage("TaskbarCreated");
 
         public TrayIconImpl()
         {
@@ -44,6 +47,18 @@ namespace Avalonia.Win32
             {
                 s_trayIcons[wParam.ToInt32()].WndProc(hWnd, msg, wParam, lParam);
             }
+
+            if (msg == WM_TASKBARCREATED)
+            {
+                foreach (var tray in s_trayIcons.Values)
+                {
+                    if (tray._iconAdded)
+                    {
+                        tray.UpdateIcon(true);
+                        tray.UpdateIcon();
+                    }
+                }
+            }
         }
 
         public void SetIcon(IWindowIconImpl? icon)
@@ -145,7 +160,7 @@ namespace Avalonia.Win32
         private enum CustomWindowsMessage : uint
         {
             WM_TRAYICON = WindowsMessage.WM_APP + 1024,
-            WM_TRAYMOUSE = WindowsMessage.WM_USER + 1024
+            WM_TRAYMOUSE = WindowsMessage.WM_USER + 1024,
         }
 
         private class TrayIconMenuFlyoutPresenter : MenuFlyoutPresenter, IStyleable
@@ -180,7 +195,7 @@ namespace Avalonia.Win32
                 ShowActivated = true;
             }
 
-            private void TrayPopupRoot_Deactivated(object sender, EventArgs e)
+            private void TrayPopupRoot_Deactivated(object? sender, EventArgs e)
             {
                 Close();
             }
@@ -217,8 +232,9 @@ namespace Avalonia.Win32
                 }
 
                 public IReadOnlyList<ManagedPopupPositionerScreenInfo> Screens =>
-                _hiddenWindow.Screens.All.Select(s => new ManagedPopupPositionerScreenInfo(
-                    s.Bounds.ToRect(1), s.Bounds.ToRect(1))).ToList();
+                    _hiddenWindow.Screens.All
+                        .Select(s => new ManagedPopupPositionerScreenInfo(s.Bounds.ToRect(1), s.Bounds.ToRect(1)))
+                        .ToArray();
 
                 public Rect ParentClientAreaScreenGeometry
                 {
diff --git a/src/Windows/Avalonia.Win32/Win32GlManager.cs b/src/Windows/Avalonia.Win32/Win32GlManager.cs
index 0376a41f8c..2a3f4a3384 100644
--- a/src/Windows/Avalonia.Win32/Win32GlManager.cs
+++ b/src/Windows/Avalonia.Win32/Win32GlManager.cs
@@ -24,9 +24,23 @@ namespace Avalonia.Win32
                 {
                     var egl = EglPlatformOpenGlInterface.TryCreate(() => new AngleWin32EglDisplay());
 
-                    if (egl != null && opts.UseWindowsUIComposition)
+                    if (egl != null)
                     {
-                        WinUICompositorConnection.TryCreateAndRegister(egl, opts.CompositionBackdropCornerRadius);
+                        if (opts.EglRendererBlacklist != null)
+                        {
+                            foreach (var item in opts.EglRendererBlacklist)
+                            {
+                                if (egl.PrimaryEglContext.GlInterface.Renderer.Contains(item))
+                                {
+                                    return null;
+                                }
+                            }
+                        }
+                        
+                        if (opts.UseWindowsUIComposition)
+                        {
+                            WinUICompositorConnection.TryCreateAndRegister(egl, opts.CompositionBackdropCornerRadius);
+                        }
                     }
 
                     return egl;
diff --git a/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs b/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs
index 2a1628ea7d..fd05e780bf 100644
--- a/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs
+++ b/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs
@@ -94,6 +94,10 @@ namespace Avalonia.Win32
                     IntPtr.Zero,
                     IntPtr.Zero,
                     IntPtr.Zero);
+
+                if (Handle == IntPtr.Zero)
+                    throw new InvalidOperationException("Unable to create child window for native control host. Application manifest with supported OS list might be required.");
+
                 if (layered)
                     UnmanagedMethods.SetLayeredWindowAttributes(Handle, 0, 255,
                         UnmanagedMethods.LayeredWindowFlags.LWA_ALPHA);
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index 5cfbab40e4..dc5e5324c4 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -56,6 +56,11 @@ namespace Avalonia
         /// GPU rendering will not be enabled if this is set to false.
         /// </remarks>
         public bool? AllowEglInitialization { get; set; }
+        
+        public IList<string> EglRendererBlacklist { get; set; } = new List<string>
+        {
+            "Microsoft Basic Render"
+        };
 
         /// <summary>
         /// Enables multitouch support. The default value is true.
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
index 57b0f71306..76af12e8ca 100644
--- a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
@@ -17,11 +17,11 @@ namespace Avalonia.Win32.WinRT.Composition
 {
     class WinUICompositorConnection : IRenderTimer
     {
+        public static readonly Version MinHostBackdropVersion = new Version(10, 0, 22000);
         private readonly float? _backdropCornerRadius;
         private readonly EglContext _syncContext;
         private readonly ICompositionBrush _micaBrush;
         private ICompositor _compositor;
-        private ICompositor2 _compositor2;
         private ICompositor5 _compositor5;
         private ICompositorInterop _compositorInterop;
         private AngleWin32EglDisplay _angle;
@@ -39,12 +39,11 @@ namespace Avalonia.Win32.WinRT.Composition
             _syncContext = _gl.PrimaryEglContext;
             _angle = (AngleWin32EglDisplay)_gl.Display;
             _compositor = NativeWinRTMethods.CreateInstance<ICompositor>("Windows.UI.Composition.Compositor");
-            _compositor2 = _compositor.QueryInterface<ICompositor2>();
             _compositor5 = _compositor.QueryInterface<ICompositor5>();
             _compositorInterop = _compositor.QueryInterface<ICompositorInterop>();
             _compositorDesktopInterop = _compositor.QueryInterface<ICompositorDesktopInterop>();
             using var device = MicroComRuntime.CreateProxyFor<IUnknown>(_angle.GetDirect3DDevice(), true);
-            
+
             _device = _compositorInterop.CreateGraphicsDevice(device);
             _blurBrush = CreateAcrylicBlurBackdropBrush();
             _micaBrush = CreateMicaBackdropBrush();
@@ -71,7 +70,7 @@ namespace Avalonia.Win32.WinRT.Composition
                     AvaloniaLocator.CurrentMutable.BindToSelf(connect);
                     AvaloniaLocator.CurrentMutable.Bind<IRenderTimer>().ToConstant(connect);
                     tcs.SetResult(true);
-                    
+
                 }
                 catch (Exception e)
                 {
@@ -99,7 +98,7 @@ namespace Avalonia.Win32.WinRT.Composition
             }
             public void Dispose()
             {
-                
+
             }
 
             public void Invoke(IAsyncAction asyncInfo, AsyncStatus asyncStatus)
@@ -118,12 +117,12 @@ namespace Avalonia.Win32.WinRT.Composition
             {
             }
         }
-        
+
         private void RunLoop()
         {
             {
                 var st = Stopwatch.StartNew();
-                using (var act = _compositor5.RequestCommitAsync()) 
+                using (var act = _compositor5.RequestCommitAsync())
                     act.SetCompleted(new RunLoopHandler(this));
                 while (true)
                 {
@@ -172,12 +171,12 @@ namespace Avalonia.Win32.WinRT.Composition
             using var sc = _syncContext.EnsureLocked();
             using var desktopTarget = _compositorDesktopInterop.CreateDesktopWindowTarget(hWnd, 0);
             using var target = desktopTarget.QueryInterface<ICompositionTarget>();
-            
+
             using var drawingSurface = _device.CreateDrawingSurface(new UnmanagedMethods.SIZE(), DirectXPixelFormat.B8G8R8A8UIntNormalized,
                 DirectXAlphaMode.Premultiplied);
             using var surface = drawingSurface.QueryInterface<ICompositionSurface>();
             using var surfaceInterop = drawingSurface.QueryInterface<ICompositionDrawingSurfaceInterop>();
-            
+
             using var surfaceBrush = _compositor.CreateSurfaceBrushWithSurface(surface);
             using var brush = surfaceBrush.QueryInterface<ICompositionBrush>();
 
@@ -190,7 +189,7 @@ namespace Avalonia.Win32.WinRT.Composition
             using var containerVisual2 = container.QueryInterface<IVisual2>();
             containerVisual2.SetRelativeSizeAdjustment(new Vector2(1, 1));
             using var containerChildren = container.Children;
-            
+
             target.SetRoot(containerVisual);
 
             using var blur = CreateBlurVisual(_blurBrush);
@@ -202,10 +201,10 @@ namespace Avalonia.Win32.WinRT.Composition
             }
 
             var compositionRoundedRectangleGeometry = ClipVisual(blur, mica);
-            
+
             containerChildren.InsertAtTop(blur);
             containerChildren.InsertAtTop(visual);
-            
+
             return new WinUICompositedWindow(_syncContext, _compositor, _pumpLock, target, surfaceInterop, visual,
                 blur, mica, compositionRoundedRectangleGeometry);
         }
@@ -234,10 +233,8 @@ namespace Avalonia.Win32.WinRT.Composition
             var blurEffect = new WinUIGaussianBlurEffect(backDropParameterAsSource);
             using var blurEffectFactory = _compositor.CreateEffectFactory(blurEffect);
             using var compositionEffectBrush = blurEffectFactory.CreateBrush();
-            using var backdrop = _compositor2.CreateBackdropBrush();
-            using var backdropBrush = backdrop.QueryInterface<ICompositionBrush>();
-            
-            
+            using var backdropBrush = CreateBackdropBrush();
+
             var saturateEffect = new SaturationEffect(blurEffect);
             using var satEffectFactory = _compositor.CreateEffectFactory(saturateEffect);
             using var sat = satEffectFactory.CreateBrush();
@@ -261,8 +258,8 @@ namespace Avalonia.Win32.WinRT.Composition
             foreach (var visual in containerVisuals)
             {
                 visual?.SetClip(geometricClipWithGeometry.QueryInterface<ICompositionClip>());
-        }
-        
+            }
+
             return roundedRectangleGeometry.CloneReference();
         }
 
@@ -271,8 +268,8 @@ namespace Avalonia.Win32.WinRT.Composition
             using var spriteVisual = _compositor.CreateSpriteVisual();
             using var visual = spriteVisual.QueryInterface<IVisual>();
             using var visual2 = spriteVisual.QueryInterface<IVisual2>();
-           
-            
+
+
             spriteVisual.SetBrush(compositionBrush);
             visual.SetIsVisible(0);
             visual2.SetRelativeSizeAdjustment(new Vector2(1.0f, 1.0f));
@@ -280,6 +277,29 @@ namespace Avalonia.Win32.WinRT.Composition
             return visual.CloneReference();
         }
 
+        private ICompositionBrush CreateBackdropBrush()
+        {
+            ICompositionBackdropBrush brush = null;
+            try
+            {
+                if (Win32Platform.WindowsVersion >= MinHostBackdropVersion)
+                {
+                    using var compositor3 = _compositor.QueryInterface<ICompositor3>();
+                    brush = compositor3.CreateHostBackdropBrush();
+                }
+                else
+                {
+                    using var compositor2 = _compositor.QueryInterface<ICompositor2>();
+                    brush = compositor2.CreateBackdropBrush();
+                }
+
+                return brush.QueryInterface<ICompositionBrush>();
+            }
+            finally
+            {
+                brush?.Dispose();
+            }
+        }
 
         public event Action<TimeSpan> Tick;
     }
diff --git a/src/Windows/Avalonia.Win32/WinRT/NativeWinRTMethods.cs b/src/Windows/Avalonia.Win32/WinRT/NativeWinRTMethods.cs
index 5026fbaaba..89cde01ff4 100644
--- a/src/Windows/Avalonia.Win32/WinRT/NativeWinRTMethods.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/NativeWinRTMethods.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Win32.WinRT
 
         [DllImport("api-ms-win-core-winrt-string-l1-1-0.dll", 
             CallingConvention = CallingConvention.StdCall, PreserveSig = false)]
-        internal static extern unsafe IntPtr WindowsDeleteString(IntPtr hString);
+        internal static extern unsafe void WindowsDeleteString(IntPtr hString);
         
         [DllImport("Windows.UI.Composition", EntryPoint = "DllGetActivationFactory",
             CallingConvention = CallingConvention.StdCall, PreserveSig = false)]
diff --git a/src/Windows/Avalonia.Win32/WinRT/winrt.idl b/src/Windows/Avalonia.Win32/WinRT/winrt.idl
index 18a9a26fca..851df9dae6 100644
--- a/src/Windows/Avalonia.Win32/WinRT/winrt.idl
+++ b/src/Windows/Avalonia.Win32/WinRT/winrt.idl
@@ -358,6 +358,12 @@ interface ICompositor2 : IInspectable
     [overload("CreateStepEasingFunction")] HRESULT CreateStepEasingFunctionWithStepCount([in] INT32 stepCount, [out] [retval] void** result);
 }
 
+[uuid(C9DD8EF0-6EB1-4E3C-A658-675D9C64D4AB)]
+interface ICompositor3 : IInspectable
+{
+    HRESULT CreateHostBackdropBrush([out][retval] ICompositionBackdropBrush** result);
+}
+
 [uuid(0D8FB190-F122-5B8D-9FDD-543B0D8EB7F3)]
 interface ICompositorWithBlurredWallpaperBackdropBrush : IInspectable
 {
diff --git a/src/Windows/Avalonia.Win32/WinScreen.cs b/src/Windows/Avalonia.Win32/WinScreen.cs
index 0cf9fe31db..f103cc3b66 100644
--- a/src/Windows/Avalonia.Win32/WinScreen.cs
+++ b/src/Windows/Avalonia.Win32/WinScreen.cs
@@ -9,9 +9,11 @@ namespace Avalonia.Win32
 
         public WinScreen(double pixelDensity, PixelRect bounds, PixelRect workingArea, bool primary, IntPtr hMonitor) : base(pixelDensity, bounds, workingArea, primary)
         {
-            this._hMonitor = hMonitor;
+            _hMonitor = hMonitor;
         }
 
+        public IntPtr Handle => _hMonitor;
+
         public override int GetHashCode()
         {
             return (int)_hMonitor;
@@ -19,7 +21,7 @@ namespace Avalonia.Win32
 
         public override bool Equals(object obj)
         {
-            return (obj is WinScreen screen) ? this._hMonitor == screen._hMonitor : base.Equals(obj);
+            return (obj is WinScreen screen) ? _hMonitor == screen._hMonitor : base.Equals(obj);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
index 64ab15bc30..cae8834550 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -82,6 +82,12 @@ namespace Avalonia.Win32
                 case WindowsMessage.WM_DESTROY:
                     {
                         UiaCoreProviderApi.UiaReturnRawElementProvider(_hwnd, IntPtr.Zero, IntPtr.Zero, null);
+                        
+                        // We need to release IMM context and state to avoid leaks.
+                        if (Imm32InputMethod.Current.HWND == _hwnd)
+                        {
+                            Imm32InputMethod.Current.ClearLanguageAndWindow();
+                        }
 
                         //Window doesn't exist anymore
                         _hwnd = IntPtr.Zero;
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
index 48f5f8f871..e864f32138 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
@@ -109,7 +109,7 @@ namespace Avalonia.Win32
 
                             if (_owner is Window window)
                             {
-                                var visual = window.Renderer.HitTestFirst(position, _owner as Window, x =>
+                                var visual = window.Renderer.HitTestFirst(position, _owner, x =>
                                 {
                                     if (x is IInputElement ie && (!ie.IsHitTestVisible || !ie.IsVisible))
                                     {
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index aae65a792b..8d836ef452 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -21,12 +21,14 @@ using Avalonia.Win32.OpenGl;
 using Avalonia.Win32.WinRT;
 using Avalonia.Win32.WinRT.Composition;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
+using Avalonia.Metadata;
 
 namespace Avalonia.Win32
 {
     /// <summary>
     /// Window implementation for Win32 platform.
     /// </summary>
+    [Unstable]
     public partial class WindowImpl : IWindowImpl, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo,
         ITopLevelImplWithNativeControlHost,
         ITopLevelImplWithTextInputMethod
@@ -86,7 +88,7 @@ namespace Avalonia.Win32
         private Size _minSize;
         private Size _maxSize;
         private POINT _maxTrackSize;
-        private WindowImpl _parent;        
+        private WindowImpl _parent;
         private ExtendClientAreaChromeHints _extendChromeHints = ExtendClientAreaChromeHints.Default;
         private bool _isCloseRequested;
         private bool _shown;
@@ -174,7 +176,7 @@ namespace Avalonia.Win32
         public Action<PixelPoint> PositionChanged { get; set; }
 
         public Action<WindowState> WindowStateChanged { get; set; }
-        
+
         public Action LostFocus { get; set; }
 
         public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
@@ -247,7 +249,7 @@ namespace Avalonia.Win32
         {
             get
             {
-                if(_isFullScreenActive)
+                if (_isFullScreenActive)
                 {
                     return WindowState.FullScreen;
                 }
@@ -270,7 +272,7 @@ namespace Avalonia.Win32
                     ShowWindow(value, value != WindowState.Minimized); // If the window is minimized, it shouldn't be activated
                 }
 
-                _showWindowState = value;                
+                _showWindowState = value;
             }
         }
 
@@ -278,7 +280,7 @@ namespace Avalonia.Win32
 
         protected IntPtr Hwnd => _hwnd;
 
-        public void SetTransparencyLevelHint (WindowTransparencyLevel transparencyLevel)
+        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
         {
             TransparencyLevel = EnableBlur(transparencyLevel);
         }
@@ -318,12 +320,12 @@ namespace Avalonia.Win32
             }
 
             var blurInfo = new DWM_BLURBEHIND(false);
-            
+
             if (transparencyLevel == WindowTransparencyLevel.Blur)
             {
                 blurInfo = new DWM_BLURBEHIND(true);
             }
-            
+
             DwmEnableBlurBehindWindow(_hwnd, ref blurInfo);
 
             if (transparencyLevel == WindowTransparencyLevel.Transparent)
@@ -379,13 +381,29 @@ namespace Avalonia.Win32
         {
             if (_isUsingComposition)
             {
-                _blurHost?.SetBlur(transparencyLevel switch
+                var effect = transparencyLevel switch
                 {
                     WindowTransparencyLevel.Mica => BlurEffect.Mica,
                     WindowTransparencyLevel.AcrylicBlur => BlurEffect.Acrylic,
                     WindowTransparencyLevel.Blur => BlurEffect.Acrylic,
                     _ => BlurEffect.None
-                });
+                };
+
+                if (Win32Platform.WindowsVersion >= WinUICompositorConnection.MinHostBackdropVersion)
+                {
+                    unsafe
+                    {
+                        int pvUseBackdropBrush = effect == BlurEffect.Acrylic ? 1 : 0;
+                        DwmSetWindowAttribute(_hwnd, (int)DwmWindowAttribute.DWMWA_USE_HOSTBACKDROPBRUSH, &pvUseBackdropBrush, sizeof(int));
+                    }
+                }
+
+                if (Win32Platform.WindowsVersion < WinUICompositorConnection.MinHostBackdropVersion && effect == BlurEffect.Mica)
+                {
+                    effect = BlurEffect.Acrylic;
+                }
+
+                _blurHost?.SetBlur(effect);
 
                 return transparencyLevel;
             }
@@ -417,7 +435,8 @@ namespace Avalonia.Win32
                         break;
 
                     case WindowTransparencyLevel.AcrylicBlur:
-                    case (WindowTransparencyLevel.AcrylicBlur + 1): // hack-force acrylic.
+                    case WindowTransparencyLevel.ForceAcrylicBlur: // hack-force acrylic.
+                    case WindowTransparencyLevel.Mica:
                         accent.AccentState = AccentState.ACCENT_ENABLE_ACRYLIC;
                         transparencyLevel = WindowTransparencyLevel.AcrylicBlur;
                         break;
@@ -442,7 +461,7 @@ namespace Avalonia.Win32
             }
         }
 
-        public IEnumerable<object> Surfaces => new object[] { Handle, _gl, _framebuffer };
+        public IEnumerable<object> Surfaces => new object[] { (IPlatformNativeSurfaceHandle)Handle, _gl, _framebuffer };
 
         public PixelPoint Position
         {
@@ -483,12 +502,12 @@ namespace Avalonia.Win32
             if (customRendererFactory != null)
                 return customRendererFactory.Create(root, loop);
 
-            return Win32Platform.UseDeferredRendering 
-                ?  _isUsingComposition 
+            return Win32Platform.UseDeferredRendering
+                ? _isUsingComposition
                     ? new DeferredRenderer(root, loop)
                     {
                         RenderOnlyOnRenderThread = true
-                    } 
+                    }
                     : (IRenderer)new DeferredRenderer(root, loop, rendererLock: _rendererLock)
                 : new ImmediateRenderer(root);
         }
@@ -543,7 +562,7 @@ namespace Avalonia.Win32
                 {
                     BeforeCloseCleanup(true);
                 }
-                
+
                 DestroyWindow(_hwnd);
                 _hwnd = IntPtr.Zero;
             }
@@ -609,7 +628,7 @@ namespace Avalonia.Win32
         public void SetParent(IWindowImpl parent)
         {
             _parent = (WindowImpl)parent;
-            
+
             var parentHwnd = _parent?._hwnd ?? IntPtr.Zero;
 
             if (parentHwnd == IntPtr.Zero && !_windowProperties.ShowInTaskbar)
@@ -723,7 +742,7 @@ namespace Avalonia.Win32
                 _isUsingComposition ? (int)WindowStyles.WS_EX_NOREDIRECTIONBITMAP : 0,
                 atom,
                 null,
-                (int)WindowStyles.WS_OVERLAPPEDWINDOW | (int) WindowStyles.WS_CLIPCHILDREN,
+                (int)WindowStyles.WS_OVERLAPPEDWINDOW | (int)WindowStyles.WS_CLIPCHILDREN,
                 CW_USEDEFAULT,
                 CW_USEDEFAULT,
                 CW_USEDEFAULT,
@@ -779,7 +798,7 @@ namespace Avalonia.Win32
             }
 
             if (ShCoreAvailable && Win32Platform.WindowsVersion > PlatformConstants.Windows8)
-			{
+            {
                 var monitor = MonitorFromWindow(
                     _hwnd,
                     MONITOR.MONITOR_DEFAULTTONEAREST);
@@ -862,14 +881,14 @@ namespace Avalonia.Win32
             }
 
             TaskBarList.MarkFullscreen(_hwnd, fullscreen);
-            
+
             ExtendClientArea();
         }
 
         private MARGINS UpdateExtendMargins()
         {
             RECT borderThickness = new RECT();
-            RECT borderCaptionThickness = new RECT();            
+            RECT borderCaptionThickness = new RECT();
 
             AdjustWindowRectEx(ref borderCaptionThickness, (uint)(GetStyle()), false, 0);
             AdjustWindowRectEx(ref borderThickness, (uint)(GetStyle() & ~WindowStyles.WS_CAPTION), false, 0);
@@ -892,7 +911,7 @@ namespace Avalonia.Win32
 
             if (_extendTitleBarHint != -1)
             {
-                borderCaptionThickness.top = (int)(_extendTitleBarHint * RenderScaling);                
+                borderCaptionThickness.top = (int)(_extendTitleBarHint * RenderScaling);
             }
 
             margins.cyTopHeight = _extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.SystemChrome) && !_extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.PreferSystemChrome) ? borderCaptionThickness.top : 1;
@@ -917,7 +936,7 @@ namespace Avalonia.Win32
             {
                 return;
             }
-            
+
             if (DwmIsCompositionEnabled(out bool compositionEnabled) < 0 || !compositionEnabled)
             {
                 _isClientAreaExtended = false;
@@ -945,11 +964,11 @@ namespace Avalonia.Win32
 
                 _offScreenMargin = new Thickness();
                 _extendedMargins = new Thickness();
-                
-                Resize(new Size(rcWindow.Width/ RenderScaling, rcWindow.Height / RenderScaling), PlatformResizeReason.Layout);
+
+                Resize(new Size(rcWindow.Width / RenderScaling, rcWindow.Height / RenderScaling), PlatformResizeReason.Layout);
             }
 
-            if(!_isClientAreaExtended || (_extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.SystemChrome) &&
+            if (!_isClientAreaExtended || (_extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.SystemChrome) &&
                 !_extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.PreferSystemChrome)))
             {
                 EnableCloseButton(_hwnd);
@@ -965,12 +984,12 @@ namespace Avalonia.Win32
         private void ShowWindow(WindowState state, bool activate)
         {
             _shown = true;
-            
+
             if (_isClientAreaExtended)
             {
                 ExtendClientArea();
             }
-            
+
             ShowWindowCommand? command;
 
             var newWindowProperties = _windowProperties;
@@ -988,7 +1007,7 @@ namespace Avalonia.Win32
 
                 case WindowState.Normal:
                     newWindowProperties.IsFullScreen = false;
-                    command = IsWindowVisible(_hwnd) ? ShowWindowCommand.Restore : 
+                    command = IsWindowVisible(_hwnd) ? ShowWindowCommand.Restore :
                         activate ? ShowWindowCommand.Normal : ShowWindowCommand.ShowNoActivate;
                     break;
 
@@ -1019,7 +1038,7 @@ namespace Avalonia.Win32
                 SetForegroundWindow(_hwnd);
             }
         }
-        
+
         private void BeforeCloseCleanup(bool isDisposing)
         {
             // Based on https://github.com/dotnet/wpf/blob/master/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs#L4270-L4337
@@ -1037,7 +1056,7 @@ namespace Avalonia.Win32
                     // Our window closed callback will set enabled state to a correct value after child window gets destroyed.
                     _parent.SetEnabled(true);
                 }
-                
+
                 // We also need to activate our parent window since again OS might try to activate a window behind if it is not set.
                 if (wasActive)
                 {
@@ -1064,7 +1083,7 @@ namespace Avalonia.Win32
                     SetWindowPos(_hwnd, WindowPosZOrder.HWND_NOTOPMOST, x, y, cx, cy, SetWindowPosFlags.SWP_SHOWWINDOW);
                 }
             }
-        }        
+        }
 
         private WindowStyles GetWindowStateStyles()
         {
@@ -1241,7 +1260,7 @@ namespace Avalonia.Win32
                         SetWindowPosFlags.SWP_NOZORDER | SetWindowPosFlags.SWP_NOACTIVATE |
                         SetWindowPosFlags.SWP_FRAMECHANGED);
                 }
-            }            
+            }
         }
 
         private const int MF_BYCOMMAND = 0x0;
@@ -1291,9 +1310,9 @@ namespace Avalonia.Win32
         public void SetExtendClientAreaToDecorationsHint(bool hint)
         {
             _isClientAreaExtended = hint;
-            
-            ExtendClientArea();            
-        }        
+
+            ExtendClientArea();
+        }
 
         public void SetExtendClientAreaChromeHints(ExtendClientAreaChromeHints hints)
         {
@@ -1301,7 +1320,7 @@ namespace Avalonia.Win32
 
             ExtendClientArea();
         }
-        
+
         /// <inheritdoc/>
         public void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight)
         {
@@ -1315,7 +1334,7 @@ namespace Avalonia.Win32
 
         /// <inheritdoc/>
         public Action<bool> ExtendClientAreaToDecorationsChanged { get; set; }
-        
+
         /// <inheritdoc/>
         public bool NeedsManagedDecorations => _isClientAreaExtended && _extendChromeHints.HasAllFlags(ExtendClientAreaChromeHints.PreferSystemChrome);
 
@@ -1354,7 +1373,7 @@ namespace Avalonia.Win32
         {
             private readonly WindowImpl _owner;
             private readonly PlatformResizeReason _restore;
-            
+
             public ResizeReasonScope(WindowImpl owner, PlatformResizeReason restore)
             {
                 _owner = owner;
@@ -1366,12 +1385,16 @@ namespace Avalonia.Win32
 
         public ITextInputMethodImpl TextInputMethod => Imm32InputMethod.Current;
 
-        private class WindowImplPlatformHandle : IPlatformHandle
+        private class WindowImplPlatformHandle : IPlatformNativeSurfaceHandle
         {
             private readonly WindowImpl _owner;
             public WindowImplPlatformHandle(WindowImpl owner) => _owner = owner;
             public IntPtr Handle => _owner.Hwnd;
             public string HandleDescriptor => PlatformConstants.WindowHandleType;
+
+            public PixelSize Size => PixelSize.FromSize(_owner.ClientSize, Scaling);
+
+            public double Scaling => _owner.RenderScaling;
         }
     }
 }
diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
index 39a0305b1e..ea3a79941d 100644
--- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
+++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
@@ -1,8 +1,6 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Xamarin.Legacy.Sdk" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-ios</TargetFrameworks>
-    <TargetFrameworks Condition="'$(MSBuildRuntimeType)' != 'Core'">$(TargetFrameworks);xamarin.ios10</TargetFrameworks>
+    <TargetFramework>net6.0-ios</TargetFramework>
     <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
   </PropertyGroup>
@@ -10,13 +8,6 @@
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="Xamarin.Legacy.Sdk" />
-
-  <!-- Workaround for https://github.com/dotnet/msbuild/issues/4584 -->
-  <Target Name="_RemoveNativeReferencesManifest" AfterTargets="BuiltProjectOutputGroup">
-    <ItemGroup>
-      <_BuiltProjectOutputGroupOutputIntermediate Remove="$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
-      <BuiltProjectOutputGroupOutput Remove="$(ProjectDir)$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
-    </ItemGroup>
-  </Target>
+  
+  <Import Project="..\..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/iOS/Avalonia.iOS/AvaloniaView.Text.cs b/src/iOS/Avalonia.iOS/AvaloniaView.Text.cs
index dc963726b0..d49ce5310c 100644
--- a/src/iOS/Avalonia.iOS/AvaloniaView.Text.cs
+++ b/src/iOS/Avalonia.iOS/AvaloniaView.Text.cs
@@ -1,32 +1,146 @@
-using Avalonia.Input;
-using Avalonia.Input.Raw;
 using Foundation;
 using ObjCRuntime;
+using Avalonia.Input.TextInput;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
 using UIKit;
 
-namespace Avalonia.iOS
+namespace Avalonia.iOS;
+
+#nullable enable
+
+[Adopts("UITextInputTraits")]
+[Adopts("UIKeyInput")]
+public partial class AvaloniaView : ITextInputMethodImpl
 {
-    [Adopts("UIKeyInput")]
-    public partial class AvaloniaView
+    private ITextInputMethodClient? _currentClient;
+
+    public override bool CanResignFirstResponder => true;
+    public override bool CanBecomeFirstResponder => true;
+
+    [Export("hasText")]
+    public bool HasText
     {
-        public override bool CanBecomeFirstResponder => true;
+        get
+        {
+            if (_currentClient is { } && _currentClient.SupportsSurroundingText &&
+                _currentClient.SurroundingText.Text.Length > 0)
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+
+    [Export("keyboardType")] public UIKeyboardType KeyboardType { get; private set; } = UIKeyboardType.Default;
 
-        [Export("hasText")] public bool HasText => false;
+    [Export("isSecureTextEntry")] public bool IsSecureEntry { get; private set; }
 
-        [Export("insertText:")]
-        public void InsertText(string text) =>
+    [Export("insertText:")]
+    public void InsertText(string text)
+    {
+        if (KeyboardDevice.Instance is { })
+        {
             _topLevelImpl.Input?.Invoke(new RawTextInputEventArgs(KeyboardDevice.Instance,
                 0, InputRoot, text));
+        }
+    }
 
-        [Export("deleteBackward")]
-        public void DeleteBackward()
+    [Export("deleteBackward")]
+    public void DeleteBackward()
+    {
+        if (KeyboardDevice.Instance is { })
         {
             // TODO: pass this through IME infrastructure instead of emulating a backspace press
             _topLevelImpl.Input?.Invoke(new RawKeyEventArgs(KeyboardDevice.Instance,
                 0, InputRoot, RawKeyEventType.KeyDown, Key.Back, RawInputModifiers.None));
-            
+
             _topLevelImpl.Input?.Invoke(new RawKeyEventArgs(KeyboardDevice.Instance,
                 0, InputRoot, RawKeyEventType.KeyUp, Key.Back, RawInputModifiers.None));
         }
     }
-}
\ No newline at end of file
+
+    void ITextInputMethodImpl.SetClient(ITextInputMethodClient? client)
+    {
+        _currentClient = client;
+
+        if (client is { })
+        {
+            BecomeFirstResponder();
+        }
+        else
+        {
+            ResignFirstResponder();
+        }
+    }
+
+    void ITextInputMethodImpl.SetCursorRect(Rect rect)
+    {
+
+    }
+
+    void ITextInputMethodImpl.SetOptions(TextInputOptions options)
+    {
+        IsSecureEntry = false;
+        
+        switch (options.ContentType)
+        {
+            case TextInputContentType.Normal:
+                KeyboardType = UIKeyboardType.Default;
+                break;
+            
+            case TextInputContentType.Alpha:
+                KeyboardType = UIKeyboardType.AsciiCapable;
+                break;
+            
+            case TextInputContentType.Digits:
+                KeyboardType = UIKeyboardType.PhonePad;
+                break;
+            
+            case TextInputContentType.Pin:
+                KeyboardType = UIKeyboardType.NumberPad;
+                IsSecureEntry = true;
+                break;
+            
+            case TextInputContentType.Number:
+                KeyboardType = UIKeyboardType.PhonePad;
+                break;
+            
+            case TextInputContentType.Email:
+                KeyboardType = UIKeyboardType.EmailAddress;
+                break;
+
+            case TextInputContentType.Url:
+                KeyboardType = UIKeyboardType.Url;
+                break;
+            
+            case TextInputContentType.Name:
+                KeyboardType = UIKeyboardType.NamePhonePad;
+                break;
+            
+            case TextInputContentType.Password:
+                KeyboardType = UIKeyboardType.Default;
+                IsSecureEntry = true;
+                break;
+            
+            case TextInputContentType.Social:
+                KeyboardType = UIKeyboardType.Twitter;
+                break;
+                
+            case TextInputContentType.Search:
+                KeyboardType = UIKeyboardType.WebSearch;
+                break;
+        }
+
+        if (options.IsSensitive)
+        {
+            IsSecureEntry = true;
+        }
+    }
+
+    void ITextInputMethodImpl.Reset()
+    {
+        ResignFirstResponder();
+    }
+}
diff --git a/src/iOS/Avalonia.iOS/AvaloniaView.cs b/src/iOS/Avalonia.iOS/AvaloniaView.cs
index 5bb2f64879..0a47b152ed 100644
--- a/src/iOS/Avalonia.iOS/AvaloniaView.cs
+++ b/src/iOS/Avalonia.iOS/AvaloniaView.cs
@@ -2,12 +2,13 @@ using System;
 using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Controls.Embedding;
+using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.Input.TextInput;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using CoreAnimation;
-using CoreGraphics;
 using Foundation;
 using ObjCRuntime;
 using OpenGLES;
@@ -42,7 +43,7 @@ namespace Avalonia.iOS
             MultipleTouchEnabled = true;
         }
 
-        internal class TopLevelImpl : ITopLevelImpl
+        internal class TopLevelImpl : ITopLevelImplWithTextInputMethod, ITopLevelImplWithNativeControlHost
         {
             private readonly AvaloniaView _view;
             public AvaloniaView View => _view;
@@ -50,6 +51,7 @@ namespace Avalonia.iOS
             public TopLevelImpl(AvaloniaView view)
             {
                 _view = view;
+                NativeControlHost = new NativeControlHostImpl(_view);
             }
 
             public void Dispose()
@@ -109,6 +111,9 @@ namespace Avalonia.iOS
 
             public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } =
                 new AcrylicPlatformCompensationLevels();
+
+            public ITextInputMethodImpl? TextInputMethod => _view;
+            public INativeControlHostImpl NativeControlHost { get; }
         }
 
         [Export("layerClass")]
diff --git a/src/iOS/Avalonia.iOS/NativeControlHostImpl.cs b/src/iOS/Avalonia.iOS/NativeControlHostImpl.cs
new file mode 100644
index 0000000000..f752936dc8
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/NativeControlHostImpl.cs
@@ -0,0 +1,160 @@
+#nullable enable
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+using CoreGraphics;
+using ObjCRuntime;
+using UIKit;
+
+namespace Avalonia.iOS
+{
+    internal class NativeControlHostImpl : INativeControlHostImpl
+    {
+        private readonly AvaloniaView _avaloniaView;
+
+        public NativeControlHostImpl(AvaloniaView avaloniaView)
+        {
+            _avaloniaView = avaloniaView;
+        }
+
+        public INativeControlHostDestroyableControlHandle CreateDefaultChild(IPlatformHandle parent)
+        {
+            return new UIViewControlHandle(new UIView());
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(Func<IPlatformHandle, IPlatformHandle> create)
+        {
+            var parent = new UIViewControlHandle(_avaloniaView);
+            NativeControlAttachment? attachment = null;
+            try
+            {
+                var child = create(parent);
+                // It has to be assigned to the variable before property setter is called so we dispose it on exception
+#pragma warning disable IDE0017 // Simplify object initialization
+                attachment = new NativeControlAttachment(child);
+#pragma warning restore IDE0017 // Simplify object initialization
+                attachment.AttachedTo = this;
+                return attachment;
+            }
+            catch
+            {
+                attachment?.Dispose();
+                throw;
+            }
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(IPlatformHandle handle)
+        {
+            return new NativeControlAttachment(handle)
+            {
+                AttachedTo = this
+            };
+        }
+
+        public bool IsCompatibleWith(IPlatformHandle handle) => handle.HandleDescriptor == UIViewControlHandle.UIViewDescriptor;
+
+        private class ViewHolder : UIView
+        {
+            public ViewHolder(IntPtr handle) : base(new NativeHandle(handle))
+            {
+                
+            }
+        }
+        
+        private class NativeControlAttachment : INativeControlHostControlTopLevelAttachment
+        {
+            // ReSharper disable once NotAccessedField.Local (keep GC reference)
+            private IPlatformHandle? _child;
+            private UIView? _view;
+            private NativeControlHostImpl? _attachedTo;
+
+            public NativeControlAttachment(IPlatformHandle child)
+            {
+                _child = child;
+                
+                _view = (child as UIViewControlHandle)?.View ?? new ViewHolder(child.Handle);
+            }
+
+            [MemberNotNull(nameof(_view))]
+            private void CheckDisposed()
+            {
+                if (_view == null)
+                    throw new ObjectDisposedException(nameof(NativeControlAttachment));
+            }
+
+            public void Dispose()
+            {
+                _view?.RemoveFromSuperview();
+                _child = null;
+                _attachedTo = null;
+                _view?.Dispose();
+                _view = null;
+            }
+
+            public INativeControlHostImpl? AttachedTo
+            {
+                get => _attachedTo;
+                set
+                {
+                    CheckDisposed();
+                    
+                    _attachedTo = (NativeControlHostImpl?)value;
+                    if (_attachedTo == null)
+                    {
+                        _view.RemoveFromSuperview();
+                    }
+                    else
+                    {
+                        _attachedTo._avaloniaView.AddSubview(_view);
+                    }
+                }
+            }
+
+            public bool IsCompatibleWith(INativeControlHostImpl host) => host is NativeControlHostImpl;
+
+            public void HideWithSize(Size size)
+            {
+                CheckDisposed();
+                if (_attachedTo == null)
+                    return;
+
+                _view.Hidden = true;
+                _view.Frame = new CGRect(0d, 0d, Math.Max(1d, size.Width), Math.Max(1d, size.Height));
+            }
+
+            public void ShowInBounds(Rect bounds)
+            {
+                CheckDisposed();
+                if (_attachedTo == null)
+                    throw new InvalidOperationException("The control isn't currently attached to a toplevel");
+
+                _view.Frame = new CGRect(bounds.X, bounds.Y, Math.Max(1d, bounds.Width), Math.Max(1d, bounds.Height));
+                _view.Hidden = false;
+            }
+        }
+    }
+
+    public class UIViewControlHandle : INativeControlHostDestroyableControlHandle
+    {
+        internal const string UIViewDescriptor = "UIView";
+
+        
+        public UIViewControlHandle(UIView view)
+        {
+            View = view;
+        }
+        
+        public UIView View { get; }
+        
+        public string HandleDescriptor => UIViewDescriptor;
+
+        IntPtr IPlatformHandle.Handle => View.Handle.Handle;
+
+        public void Destroy()
+        {
+            View.Dispose();
+        }
+    }
+}
diff --git a/src/iOS/Avalonia.iOS/Platform.cs b/src/iOS/Avalonia.iOS/Platform.cs
index f8815e9030..2738e502de 100644
--- a/src/iOS/Avalonia.iOS/Platform.cs
+++ b/src/iOS/Avalonia.iOS/Platform.cs
@@ -44,7 +44,6 @@ namespace Avalonia.iOS
             GlFeature ??= new EaglFeature();
             Timer ??= new DisplayLinkTimer();
             var keyboard = new KeyboardDevice();
-            var softKeyboard = new SoftKeyboardHelper();
             
             AvaloniaLocator.CurrentMutable
                 .Bind<IPlatformOpenGlInterface>().ToConstant(GlFeature)
@@ -58,12 +57,6 @@ namespace Avalonia.iOS
                 .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/SoftKeyboardHelper.cs b/src/iOS/Avalonia.iOS/SoftKeyboardHelper.cs
deleted file mode 100644
index b05ab280d2..0000000000
--- a/src/iOS/Avalonia.iOS/SoftKeyboardHelper.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-
-namespace Avalonia.iOS
-{
-    public class SoftKeyboardHelper
-    {
-        private AvaloniaView _oldView;
-        
-        public void UpdateKeyboard(IInputElement focusedElement)
-        {
-            if (_oldView?.IsFirstResponder == true)
-                _oldView?.ResignFirstResponder();
-            _oldView = null;
-            
-            //TODO: Raise a routed event to determine if any control wants to become the text input handler 
-            if (focusedElement is TextBox)
-            {
-                var view = ((focusedElement.VisualRoot as TopLevel)?.PlatformImpl as AvaloniaView.TopLevelImpl)?.View;
-                view?.BecomeFirstResponder();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/TouchHandler.cs b/src/iOS/Avalonia.iOS/TouchHandler.cs
index 43b19c85af..959a660d8a 100644
--- a/src/iOS/Avalonia.iOS/TouchHandler.cs
+++ b/src/iOS/Avalonia.iOS/TouchHandler.cs
@@ -41,7 +41,7 @@ namespace Avalonia.iOS
                         _ => RawPointerEventType.TouchUpdate
                     }, pt, RawInputModifiers.None, id);
 
-                _device.ProcessRawEvent(ev);
+                _tl.Input?.Invoke(ev);
                 
                 if (t.Phase == UITouchPhase.Cancelled || t.Phase == UITouchPhase.Ended)
                     _knownTouches.Remove(t);
@@ -49,4 +49,4 @@ namespace Avalonia.iOS
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
index a2d27fd579..1cf68c1605 100644
--- a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
+++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@@ -7,15 +7,9 @@
     <ProjectReference Include="..\..\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />
     <ProjectReference Include="..\..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\src\Markup\Avalonia.Markup.Xaml.Loader\IncludeXamlIlSre.props" />
diff --git a/src/tools/DevAnalyzers/DevAnalyzers.csproj b/src/tools/DevAnalyzers/DevAnalyzers.csproj
new file mode 100644
index 0000000000..53e3e74e76
--- /dev/null
+++ b/src/tools/DevAnalyzers/DevAnalyzers.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>10</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/tools/DevAnalyzers/GenericVirtualAnalyzer.cs b/src/tools/DevAnalyzers/GenericVirtualAnalyzer.cs
new file mode 100644
index 0000000000..8ecd9119f6
--- /dev/null
+++ b/src/tools/DevAnalyzers/GenericVirtualAnalyzer.cs
@@ -0,0 +1,40 @@
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace DevAnalyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class GenericVirtualAnalyzer : DiagnosticAnalyzer
+{
+    public const string DiagnosticId = "AVADEV1001";
+
+    private static readonly DiagnosticDescriptor Rule = new DiagnosticDescriptor(
+        DiagnosticId,
+        "Do not use generic virtual methods",
+        "Method '{0}' is a generic virtual method",
+        "Performance",
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        description: "Generic virtual methods affect JIT startup time adversly and should be avoided.");
+
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
+        context.EnableConcurrentExecution();
+        context.RegisterSymbolAction(AnalyzeMethod, SymbolKind.Method);
+    }
+
+    private static void AnalyzeMethod(SymbolAnalysisContext context)
+    {
+        var symbol = (IMethodSymbol)context.Symbol;
+
+        if (symbol.IsGenericMethod &&
+            (symbol.IsVirtual || symbol.ContainingType.TypeKind == TypeKind.Interface))
+        {
+            context.ReportDiagnostic(Diagnostic.Create(Rule, symbol.Locations[0], symbol.Name));
+        }
+    }
+}
diff --git a/src/tools/DevAnalyzers/GlobalSuppressions.cs b/src/tools/DevAnalyzers/GlobalSuppressions.cs
new file mode 100644
index 0000000000..9428b904b8
--- /dev/null
+++ b/src/tools/DevAnalyzers/GlobalSuppressions.cs
@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
diff --git a/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs b/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
deleted file mode 100644
index 1d5296bebd..0000000000
--- a/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
+++ /dev/null
@@ -1,515 +0,0 @@
-using System;
-using Avalonia.Animation.Animators;
-using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
-using Avalonia.Data;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.Styling;
-using Avalonia.UnitTests;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Animation.UnitTests
-{
-    public class AnimatableTests
-    {
-        [Fact]
-        public void Transition_Is_Not_Applied_When_Not_Attached_To_Visual_Tree()
-        {
-            var target = CreateTarget();
-            var control = new Control
-            {
-                Transitions = new Transitions { target.Object },
-            };
-
-            control.Opacity = 0.5;
-
-            target.Verify(x => x.Apply(
-                control,
-                It.IsAny<IClock>(),
-                1.0,
-                0.5),
-                Times.Never);
-        }
-
-        [Fact]
-        public void Transition_Is_Not_Applied_To_Initial_Style()
-        {
-            using (Start())
-            {
-                var target = CreateTarget();
-                var control = new Control
-                {
-                    Transitions = new Transitions { target.Object },
-                };
-
-                var root = new TestRoot
-                {
-                    Styles =
-                    {
-                        new Style(x => x.OfType<Control>())
-                        {
-                            Setters =
-                            {
-                                new Setter(Visual.OpacityProperty, 0.8),
-                            }
-                        }
-                    }
-                };
-
-                root.Child = control;
-
-                Assert.Equal(0.8, control.Opacity);
-
-                target.Verify(x => x.Apply(
-                    It.IsAny<Control>(),
-                    It.IsAny<IClock>(),
-                    It.IsAny<object>(),
-                    It.IsAny<object>()),
-                    Times.Never);
-            }
-        }
-
-        [Fact]
-        public void Transition_Is_Applied_When_Local_Value_Changes()
-        {
-            using var app = Start();
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            control.Opacity = 0.5;
-
-            target.Verify(x => x.Apply(
-                control,
-                It.IsAny<IClock>(),
-                1.0,
-                0.5));
-        }
-
-        [Fact]
-        public void Transition_Is_Not_Applied_When_Animated_Value_Changes()
-        {
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            control.SetValue(Visual.OpacityProperty, 0.5, BindingPriority.Animation);
-
-            target.Verify(x => x.Apply(
-                control,
-                It.IsAny<IClock>(),
-                1.0,
-                0.5),
-                Times.Never);
-        }
-
-
-        [Theory]
-        [InlineData(null)] //null value
-        [InlineData("stringValue")] //string value
-        public void Invalid_Values_In_Animation_Should_Not_Crash_Animations(object invalidValue)
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Layoutable.WidthProperty, 1d),
-                },
-                KeyTime = TimeSpan.FromSeconds(0)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Layoutable.WidthProperty, 2d),
-                },
-                KeyTime = TimeSpan.FromSeconds(2),
-            };
-
-            var keyframe3 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Layoutable.WidthProperty, invalidValue),
-                },
-                KeyTime = TimeSpan.FromSeconds(3),
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(3),
-                Children =
-                {
-                    keyframe1,
-                    keyframe2,
-                    keyframe3
-                },
-                IterationCount = new IterationCount(5),
-                PlaybackDirection = PlaybackDirection.Alternate,
-            };
-
-            var rect = new Rectangle()
-            {
-                Width = 11,
-            };
-
-            var originalValue = rect.Width;
-
-            var clock = new TestClock();
-            var animationRun = animation.RunAsync(rect, clock);
-
-            clock.Step(TimeSpan.Zero);
-            Assert.Equal(rect.Width, 1);
-            clock.Step(TimeSpan.FromSeconds(2));
-            Assert.Equal(rect.Width, 2);
-            clock.Step(TimeSpan.FromSeconds(3));
-            //here we have invalid value so value should be expected and set to initial original value
-            Assert.Equal(rect.Width, originalValue);
-        }
-
-        [Fact]
-        public void Transition_Is_Not_Applied_When_StyleTrigger_Changes_With_LocalValue_Present()
-        {
-            using var app = Start();
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            control.SetValue(Visual.OpacityProperty, 0.5);
-
-            target.Verify(x => x.Apply(
-                control,
-                It.IsAny<IClock>(),
-                1.0,
-                0.5));
-            target.Invocations.Clear();
-
-            control.SetValue(Visual.OpacityProperty, 0.8, BindingPriority.StyleTrigger);
-
-            target.Verify(x => x.Apply(
-                It.IsAny<Control>(),
-                It.IsAny<IClock>(),
-                It.IsAny<object>(),
-                It.IsAny<object>()),
-                Times.Never);
-        }
-
-        [Fact]
-        public void Transition_Is_Disposed_When_Local_Value_Changes()
-        {
-            using var app = Start();
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-            var sub = new Mock<IDisposable>();
-
-            target.Setup(x => x.Apply(control, It.IsAny<IClock>(), 1.0, 0.5)).Returns(sub.Object);
-
-            control.Opacity = 0.5;
-            sub.Invocations.Clear();
-            control.Opacity = 0.4;
-
-            sub.Verify(x => x.Dispose());
-        }
-
-        [Fact]
-        public void New_Transition_Is_Applied_When_Local_Value_Changes()
-        {
-            using var app = Start();
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            target.Setup(x => x.Property).Returns(Visual.OpacityProperty);
-            target.Setup(x => x.Apply(control, It.IsAny<IClock>(), 1.0, 0.5))
-                .Callback(() =>
-                {
-                    control.SetValue(Visual.OpacityProperty, 0.9, BindingPriority.Animation);
-                })
-                .Returns(Mock.Of<IDisposable>());
-
-            control.Opacity = 0.5;
-
-            Assert.Equal(0.9, control.Opacity);
-            target.Invocations.Clear();
-
-            control.Opacity = 0.4;
-
-            target.Verify(x => x.Apply(
-                control,
-                It.IsAny<IClock>(),
-                0.9,
-                0.4));
-        }
-
-        [Fact]
-        public void Transition_Is_Not_Applied_When_Removed_From_Visual_Tree()
-        {
-            using var app = Start();
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            control.Opacity = 0.5;
-
-            target.Verify(x => x.Apply(
-                control,
-                It.IsAny<IClock>(),
-                1.0,
-                0.5));
-            target.Invocations.Clear();
-
-            var root = (TestRoot)control.Parent;
-            root.Child = null;
-            control.Opacity = 0.8;
-
-            target.Verify(x => x.Apply(
-                It.IsAny<Control>(),
-                It.IsAny<IClock>(),
-                It.IsAny<object>(),
-                It.IsAny<object>()),
-                Times.Never);
-        }
-
-        [Fact]
-        public void Animation_Is_Cancelled_When_Transition_Removed()
-        {
-            using var app = Start();
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-            var sub = new Mock<IDisposable>();
-
-            target.Setup(x => x.Apply(
-                It.IsAny<Animatable>(),
-                It.IsAny<IClock>(),
-                It.IsAny<object>(),
-                It.IsAny<object>())).Returns(sub.Object);
-
-            control.Opacity = 0.5;
-            control.Transitions.RemoveAt(0);
-
-            sub.Verify(x => x.Dispose());
-        }
-
-        [Fact]
-        public void Animation_Is_Cancelled_When_New_Style_Activates()
-        {
-            using (Start())
-            {
-                var target = CreateTarget();
-                var control = CreateStyledControl(target.Object);
-                var sub = new Mock<IDisposable>();
-
-                target.Setup(x => x.Apply(
-                    control,
-                    It.IsAny<IClock>(),
-                    1.0,
-                    0.5)).Returns(sub.Object);
-
-                control.Opacity = 0.5;
-
-                target.Verify(x => x.Apply(
-                    control,
-                    It.IsAny<IClock>(),
-                    1.0,
-                    0.5),
-                    Times.Once);
-
-                control.Classes.Add("foo");
-
-                sub.Verify(x => x.Dispose());
-            }
-        }
-
-        [Fact]
-        public void Transition_From_Style_Trigger_Is_Applied()
-        {
-            using (Start())
-            {
-                var target = CreateTransition(Control.WidthProperty);
-                var control = CreateStyledControl(transition2: target.Object);
-                var sub = new Mock<IDisposable>();
-
-                control.Classes.Add("foo");
-                control.Width = 100;
-
-                target.Verify(x => x.Apply(
-                    control,
-                    It.IsAny<IClock>(),
-                    double.NaN,
-                    100.0),
-                    Times.Once);
-            }
-        }
-
-        [Fact]
-        public void Replacing_Transitions_During_Animation_Does_Not_Throw_KeyNotFound()
-        {
-            // Issue #4059
-            using (Start())
-            {
-                Border target;
-                var clock = new TestClock();
-                var root = new TestRoot
-                {
-                    Clock = clock,
-                    Styles =
-                    {
-                        new Style(x => x.OfType<Border>())
-                        {
-                            Setters =
-                            {
-                                new Setter(Border.TransitionsProperty,
-                                    new Transitions
-                                    {
-                                        new DoubleTransition
-                                        {
-                                            Property = Border.OpacityProperty,
-                                            Duration = TimeSpan.FromSeconds(1),
-                                        },
-                                    }),
-                            },
-                        },
-                        new Style(x => x.OfType<Border>().Class("foo"))
-                        {
-                            Setters =
-                            {
-                                new Setter(Border.TransitionsProperty,
-                                    new Transitions
-                                    {
-                                        new DoubleTransition
-                                        {
-                                            Property = Border.OpacityProperty,
-                                            Duration = TimeSpan.FromSeconds(1),
-                                        },
-                                    }),
-                                new Setter(Border.OpacityProperty, 0.0),
-                            },
-                        },
-                    },
-                    Child = target = new Border
-                    {
-                        Background = Brushes.Red,
-                    }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                target.Classes.Add("foo");
-                clock.Step(TimeSpan.FromSeconds(0));
-                clock.Step(TimeSpan.FromSeconds(0.5));
-
-                Assert.Equal(0.5, target.Opacity);
-
-                target.Classes.Remove("foo");
-            }
-        }
-
-        [Fact]
-        public void Transitions_Can_Be_Changed_To_Collection_That_Contains_The_Same_Transitions()
-        {
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            control.Transitions = new Transitions { target.Object };
-        }
-
-        [Fact]
-        public void Transitions_Can_Re_Set_During_Batch_Update()
-        {
-            var target = CreateTarget();
-            var control = CreateControl(target.Object);
-
-            // Assigning and then clearing Transitions ensures we have a transition state
-            // collection created.
-            control.Transitions = null;
-
-            control.BeginBatchUpdate();
-
-            // Setting opacity then Transitions means that we receive the Transitions change
-            // after the Opacity change when EndBatchUpdate is called.
-            control.Opacity = 0.5;
-            control.Transitions = new Transitions { target.Object };
-
-            // Which means that the transition state hasn't been initialized with the new
-            // Transitions when the Opacity change notification gets raised here.
-            control.EndBatchUpdate();
-        }
-
-        private static IDisposable Start()
-        {
-            var clock = new MockGlobalClock();
-            var services = TestServices.RealStyler.With(globalClock: clock);
-            return UnitTestApplication.Start(services);
-        }
-
-        private static Mock<ITransition> CreateTarget()
-        {
-            return CreateTransition(Visual.OpacityProperty);
-        }
-
-        private static Control CreateControl(ITransition transition)
-        {
-            var control = new Control
-            {
-                Transitions = new Transitions { transition },
-            };
-
-            var root = new TestRoot(control);
-            return control;
-        }
-
-        private static Control CreateStyledControl(
-            ITransition transition1 = null,
-            ITransition transition2 = null)
-        {
-            transition1 = transition1 ?? CreateTarget().Object;
-            transition2 = transition2 ?? CreateTransition(Control.WidthProperty).Object;
-
-            var control = new Control
-            {
-                Styles =
-                {
-                    new Style(x => x.OfType<Control>())
-                    {
-                        Setters =
-                        {
-                            new Setter
-                            {
-                                Property = Control.TransitionsProperty,
-                                Value = new Transitions { transition1 },
-                            }
-                        }
-                    },
-                    new Style(x => x.OfType<Control>().Class("foo"))
-                    {
-                        Setters =
-                        {
-                            new Setter
-                            {
-                                Property = Control.TransitionsProperty,
-                                Value = new Transitions { transition2 },
-                            }
-                        }
-                    }
-                }
-            };
-
-            var root = new TestRoot(control);
-            return control;
-        }
-
-        private static Mock<ITransition> CreateTransition(AvaloniaProperty property)
-        {
-            var target = new Mock<ITransition>();
-            var sub = new Mock<IDisposable>();
-
-            target.Setup(x => x.Property).Returns(property);
-            target.Setup(x => x.Apply(
-                It.IsAny<Animatable>(),
-                It.IsAny<IClock>(),
-                It.IsAny<object>(),
-                It.IsAny<object>())).Returns(sub.Object);
-
-            return target;
-        }
-    }
-}
diff --git a/tests/Avalonia.Animation.UnitTests/AnimationIterationTests.cs b/tests/Avalonia.Animation.UnitTests/AnimationIterationTests.cs
deleted file mode 100644
index 58bd7a42c3..0000000000
--- a/tests/Avalonia.Animation.UnitTests/AnimationIterationTests.cs
+++ /dev/null
@@ -1,448 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Animation;
-using Avalonia.Controls;
-using Avalonia.Styling;
-using Avalonia.UnitTests;
-using Avalonia.Data;
-using Xunit;
-using Avalonia.Animation.Easings;
-using System.Threading;
-using System.Reactive.Linq;
-
-namespace Avalonia.Animation.UnitTests
-{
-    public class AnimationIterationTests
-    {
-        [Fact]
-        public void Check_KeyTime_Correctly_Converted_To_Cue()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 100d),
-                },
-                KeyTime = TimeSpan.FromSeconds(0.5)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 0d),
-                },
-                KeyTime = TimeSpan.FromSeconds(0)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(1),
-                Children =
-                {
-                    keyframe2,
-                    keyframe1
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 100d
-            };
-
-            var clock = new TestClock();
-            var animationRun = animation.RunAsync(border, clock);
-
-            clock.Step(TimeSpan.Zero); 
-            Assert.Equal(border.Width, 0d);
-
-            clock.Step(TimeSpan.FromSeconds(1)); 
-            Assert.Equal(border.Width, 100d);
- 
-        }
-
-
-        [Fact]
-        public void Check_Initial_Inter_and_Trailing_Delay_Values()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 200d),
-                },
-                Cue = new Cue(1d)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 100d),
-                },
-                Cue = new Cue(0d)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(3),
-                Delay = TimeSpan.FromSeconds(3),
-                DelayBetweenIterations = TimeSpan.FromSeconds(3),
-                IterationCount = new IterationCount(2),
-                Children =
-                {
-                    keyframe2,
-                    keyframe1
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 100d
-            };
-
-            var clock = new TestClock();
-            var animationRun = animation.RunAsync(border, clock);
-
-            clock.Step(TimeSpan.Zero);
-
-            // Initial Delay.
-            clock.Step(TimeSpan.FromSeconds(1));
-            Assert.Equal(border.Width, 0d);
-
-            clock.Step(TimeSpan.FromSeconds(6));
-
-            // First Inter-Iteration delay.
-            clock.Step(TimeSpan.FromSeconds(8));
-            Assert.Equal(border.Width, 200d);
-
-            // Trailing Delay should be non-existent.
-            clock.Step(TimeSpan.FromSeconds(14));
-            Assert.True(animationRun.Status == TaskStatus.RanToCompletion);
-            Assert.Equal(border.Width, 100d);
-        }
-
-        [Fact]
-        public void Check_FillModes_Start_and_End_Values_if_Retained()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 0d),
-                },
-                Cue = new Cue(0.0d)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 300d),
-                },
-                Cue = new Cue(1.0d)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(0.05d),
-                Delay = TimeSpan.FromSeconds(0.05d),
-                Easing = new SineEaseInOut(),
-                FillMode = FillMode.Both,
-                Children =
-                {
-                    keyframe1,
-                    keyframe2
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 100d,
-            };
-
-            var clock = new TestClock();
-            var animationRun = animation.RunAsync(border, clock);
-
-            clock.Step(TimeSpan.FromSeconds(0d));
-            Assert.Equal(border.Width, 0d);
-
-            clock.Step(TimeSpan.FromSeconds(0.050d));
-            Assert.Equal(border.Width, 0d);
-
-            clock.Step(TimeSpan.FromSeconds(0.100d));
-            Assert.Equal(border.Width, 300d);
-        }
-
-        [Fact(Skip = "See #6111")]
-        public void Dispose_Subscription_Should_Stop_Animation()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 200d),
-                },
-                Cue = new Cue(1d)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 100d),
-                },
-                Cue = new Cue(0d)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(10),
-                Delay = TimeSpan.FromSeconds(0),
-                DelayBetweenIterations = TimeSpan.FromSeconds(0),
-                IterationCount = new IterationCount(1),
-                Children =
-                {
-                    keyframe2,
-                    keyframe1
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 50d
-            };
-            var propertyChangedCount = 0;
-            var animationCompletedCount = 0;
-            border.PropertyChanged += (sender, e) =>
-            {
-                if (e.Property == Control.WidthProperty)
-                {
-                    propertyChangedCount++;
-                }
-            };
-
-            var clock = new TestClock();
-            var disposable = animation.Apply(border, clock, Observable.Return(true), () => animationCompletedCount++);
-
-            Assert.Equal(0, propertyChangedCount);
-
-            clock.Step(TimeSpan.FromSeconds(0));
-            Assert.Equal(0, animationCompletedCount);
-            Assert.Equal(1, propertyChangedCount);
-
-            disposable.Dispose();
-
-            // Clock ticks should be ignored after Dispose
-            clock.Step(TimeSpan.FromSeconds(5));
-            clock.Step(TimeSpan.FromSeconds(6));
-            clock.Step(TimeSpan.FromSeconds(7));
-
-            // On animation disposing (cancellation) on completed is not invoked (is it expected?)
-            Assert.Equal(0, animationCompletedCount);
-            // Initial property changed before cancellation + animation value removal.
-            Assert.Equal(2, propertyChangedCount);
-        }
-
-        [Fact]
-        public void Do_Not_Run_Cancelled_Animation()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 200d),
-                },
-                Cue = new Cue(1d)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 100d),
-                },
-                Cue = new Cue(0d)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(10),
-                Delay = TimeSpan.FromSeconds(0),
-                DelayBetweenIterations = TimeSpan.FromSeconds(0),
-                IterationCount = new IterationCount(1),
-                Children =
-                {
-                    keyframe2,
-                    keyframe1
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 100d
-            };
-            var propertyChangedCount = 0;
-            border.PropertyChanged += (sender, e) =>
-            {
-                if (e.Property == Control.WidthProperty)
-                {
-                    propertyChangedCount++;
-                }
-            };
-
-            var clock = new TestClock();
-            var cancellationTokenSource = new CancellationTokenSource();
-            cancellationTokenSource.Cancel();
-            var animationRun = animation.RunAsync(border, clock, cancellationTokenSource.Token);
-
-            clock.Step(TimeSpan.FromSeconds(10));
-            Assert.Equal(0, propertyChangedCount);
-            Assert.True(animationRun.IsCompleted);
-        }
-
-        [Fact(Skip = "See #6111")]
-        public void Cancellation_Should_Stop_Animation()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 200d),
-                },
-                Cue = new Cue(1d)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 100d),
-                },
-                Cue = new Cue(0d)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(10),
-                Delay = TimeSpan.FromSeconds(0),
-                DelayBetweenIterations = TimeSpan.FromSeconds(0),
-                IterationCount = new IterationCount(1),
-                Children =
-                {
-                    keyframe2,
-                    keyframe1
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 50d
-            };
-            var propertyChangedCount = 0;
-            border.PropertyChanged += (sender, e) =>
-            {
-                if (e.Property == Control.WidthProperty)
-                {
-                    propertyChangedCount++;
-                }
-            };
-
-            var clock = new TestClock();
-            var cancellationTokenSource = new CancellationTokenSource();
-            var animationRun = animation.RunAsync(border, clock, cancellationTokenSource.Token);
-
-            Assert.Equal(0, propertyChangedCount);
-
-            clock.Step(TimeSpan.FromSeconds(0));
-            Assert.False(animationRun.IsCompleted);
-            Assert.Equal(1, propertyChangedCount);
-
-            cancellationTokenSource.Cancel();
-            clock.Step(TimeSpan.FromSeconds(1));
-            clock.Step(TimeSpan.FromSeconds(2));
-            clock.Step(TimeSpan.FromSeconds(3));
-            //Assert.Equal(2, propertyChangedCount);
-
-            animationRun.Wait();
-
-            clock.Step(TimeSpan.FromSeconds(6));
-            Assert.True(animationRun.IsCompleted);
-            Assert.Equal(2, propertyChangedCount);
-        }
-
-        [Fact]
-        public void Cancellation_Of_Completed_Animation_Does_Not_Fail()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 200d),
-                },
-                Cue = new Cue(1d)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(Border.WidthProperty, 100d),
-                },
-                Cue = new Cue(0d)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(10),
-                Delay = TimeSpan.FromSeconds(0),
-                DelayBetweenIterations = TimeSpan.FromSeconds(0),
-                IterationCount = new IterationCount(1),
-                Children =
-                {
-                    keyframe2,
-                    keyframe1
-                }
-            };
-
-            var border = new Border()
-            {
-                Height = 100d,
-                Width = 50d
-            };
-            var propertyChangedCount = 0;
-            border.PropertyChanged += (sender, e) =>
-            {
-                if (e.Property == Control.WidthProperty)
-                {
-                    propertyChangedCount++;
-                }
-            };
-
-            var clock = new TestClock();
-            var cancellationTokenSource = new CancellationTokenSource();
-            var animationRun = animation.RunAsync(border, clock, cancellationTokenSource.Token);
-
-            Assert.Equal(0, propertyChangedCount);
-
-            clock.Step(TimeSpan.FromSeconds(0));
-            Assert.False(animationRun.IsCompleted);
-            Assert.Equal(1, propertyChangedCount);
-
-            clock.Step(TimeSpan.FromSeconds(10));
-            Assert.True(animationRun.IsCompleted);
-            Assert.Equal(2, propertyChangedCount);
-
-            cancellationTokenSource.Cancel();
-            animationRun.Wait();
-        }
-    }
-}
diff --git a/tests/Avalonia.Animation.UnitTests/Avalonia.Animation.UnitTests.csproj b/tests/Avalonia.Animation.UnitTests/Avalonia.Animation.UnitTests.csproj
deleted file mode 100644
index e07ece5460..0000000000
--- a/tests/Avalonia.Animation.UnitTests/Avalonia.Animation.UnitTests.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\UnitTests.NetFX.props" />
-  <Import Project="..\..\build\Moq.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <Import Project="..\..\build\SharedVersion.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-</Project>
diff --git a/tests/Avalonia.Animation.UnitTests/BrushTransitionTests.cs b/tests/Avalonia.Animation.UnitTests/BrushTransitionTests.cs
deleted file mode 100644
index 1986bd2ee3..0000000000
--- a/tests/Avalonia.Animation.UnitTests/BrushTransitionTests.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Animation.UnitTests
-{
-    public class BrushTransitionTests
-    {
-        [Fact]
-        public void SolidColorBrush_Opacity_IsInteroplated()
-        {
-            Test(0, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 0 });
-            Test(0, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 1 });
-            Test(0.5, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 1 });
-            Test(0.5, new SolidColorBrush { Opacity = 0.5 }, new SolidColorBrush { Opacity = 0.5 });
-            Test(1, new SolidColorBrush { Opacity = 1 }, new SolidColorBrush { Opacity = 1 });
-            // TODO: investigate why this case fails.
-            //Test2(1, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 1 });
-        }
-
-        [Fact]
-        public void LinearGradientBrush_Opacity_IsInteroplated()
-        {
-            Test(0, new LinearGradientBrush { Opacity = 0 }, new LinearGradientBrush { Opacity = 0 });
-            Test(0, new LinearGradientBrush { Opacity = 0 }, new LinearGradientBrush { Opacity = 1 });
-            Test(0.5, new LinearGradientBrush { Opacity = 0 }, new LinearGradientBrush { Opacity = 1 });
-            Test(0.5, new LinearGradientBrush { Opacity = 0.5 }, new LinearGradientBrush { Opacity = 0.5 });
-            Test(1, new LinearGradientBrush { Opacity = 1 }, new LinearGradientBrush { Opacity = 1 });
-        }
-
-        private static void Test(double progress, IBrush oldBrush, IBrush newBrush)
-        {
-            var clock = new TestClock();
-            var border = new Border() { Background = oldBrush };
-            BrushTransition sut = new BrushTransition
-            {
-                Duration = TimeSpan.FromSeconds(1),
-                Property = Border.BackgroundProperty
-            };
-
-            sut.Apply(border, clock, oldBrush, newBrush);
-            clock.Pulse(TimeSpan.Zero);
-            clock.Pulse(sut.Duration * progress);
-
-            Assert.NotNull(border.Background);
-            Assert.Equal(oldBrush.Opacity + (newBrush.Opacity - oldBrush.Opacity) * progress, border.Background.Opacity);
-        }
-    }
-}
diff --git a/tests/Avalonia.Animation.UnitTests/KeySplineTests.cs b/tests/Avalonia.Animation.UnitTests/KeySplineTests.cs
deleted file mode 100644
index fa2ed61e65..0000000000
--- a/tests/Avalonia.Animation.UnitTests/KeySplineTests.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-using System;
-using Avalonia.Animation.Easings;
-using Avalonia.Controls.Shapes;
-using Avalonia.Media;
-using Avalonia.Styling;
-using Xunit;
-
-namespace Avalonia.Animation.UnitTests
-{
-    public class KeySplineTests
-    {
-        [Theory]
-        [InlineData("1,2 3,4")]
-        [InlineData("1 2 3 4")]
-        [InlineData("1 2,3 4")]
-        [InlineData("1,2,3,4")]
-        public void Can_Parse_KeySpline_Via_TypeConverter(string input)
-        {
-            var conv = new KeySplineTypeConverter();
-
-            var keySpline = (KeySpline)conv.ConvertFrom(input);
-
-            Assert.Equal(1, keySpline.ControlPointX1);
-            Assert.Equal(2, keySpline.ControlPointY1);
-            Assert.Equal(3, keySpline.ControlPointX2);
-            Assert.Equal(4, keySpline.ControlPointY2);
-        }
-
-        [Theory]
-        [InlineData("1,2F,3,4")] 
-        [InlineData("Foo,Bar,Fee,Buzz")] 
-        public void Can_Handle_Invalid_String_KeySpline_Via_TypeConverter(string input)
-        {
-            var conv = new KeySplineTypeConverter();
-
-            Assert.ThrowsAny<Exception>(() => (KeySpline)conv.ConvertFrom(input));
-        }
-
-        [Theory]
-        [InlineData(0.00)]
-        [InlineData(0.50)]
-        [InlineData(1.00)]
-        public void KeySpline_X_Values_In_Range_Do_Not_Throw(double input)
-        {
-            var keySpline = new KeySpline();
-            keySpline.ControlPointX1 = input; // no exception will be thrown -- test will fail if exception thrown
-            keySpline.ControlPointX2 = input; // no exception will be thrown -- test will fail if exception thrown
-        }
-
-        [Theory]
-        [InlineData(-0.01)]
-        [InlineData(1.01)]
-        public void KeySpline_X_Values_Cannot_Be_Out_Of_Range(double input)
-        {
-            var keySpline = new KeySpline();
-            Assert.Throws<ArgumentException>(() => keySpline.ControlPointX1 = input);
-            Assert.Throws<ArgumentException>(() => keySpline.ControlPointX2 = input);
-        }
-
-        [Fact]
-        public void SplineEasing_Can_Be_Mutated()
-        {
-            var easing = new SplineEasing();
-
-            Assert.Equal(0, easing.Ease(0));
-            Assert.Equal(1, easing.Ease(1));
-
-            easing.X1 = 0.25;
-            easing.Y1 = 0.5;
-            easing.X2 = 0.75;
-            easing.Y2 = 1.0;
-
-            Assert.NotEqual(0.5, easing.Ease(0.5));
-        }
-
-        /*
-          To get the test values for the KeySpline test, you can:
-          1) Grab the WPF sample for KeySpline animations from https://github.com/microsoft/WPF-Samples/tree/master/Animation/KeySplineAnimations
-          2) Add the following xaml somewhere:
-            <Button Content="Capture"
-                    Click="Button_Click"/>
-            <ScrollViewer VerticalScrollBarVisibility="Visible">
-                <TextBlock Name="CaptureData"
-                           Text="---"
-                           TextWrapping="Wrap" />
-            </ScrollViewer>
-          3) Add the following code to the code behind:
-            private void Button_Click(object sender, RoutedEventArgs e)
-            {
-                CaptureData.Text += string.Format("\n{0} | {1}", myTranslateTransform3D.OffsetX, (TimeSpan)ExampleStoryboard.GetCurrentTime(this));
-                CaptureData.Text +=
-                    "\nKeySpline=\"" + mySplineKeyFrame.KeySpline.ControlPoint1.X.ToString() + "," +
-                    mySplineKeyFrame.KeySpline.ControlPoint1.Y.ToString() + " " +
-                    mySplineKeyFrame.KeySpline.ControlPoint2.X.ToString() + "," +
-                    mySplineKeyFrame.KeySpline.ControlPoint2.Y.ToString() + "\"";
-                CaptureData.Text += "\n-----";
-            }
-          4) Run the app, mess with the slider values, then click the button to capture output values
-         **/
-
-        [Fact]
-        public void Check_KeySpline_Handled_properly()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(RotateTransform.AngleProperty, -2.5d),
-                },
-                KeyTime = TimeSpan.FromSeconds(0)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(RotateTransform.AngleProperty, 2.5d),
-                },
-                KeyTime = TimeSpan.FromSeconds(5),
-                KeySpline = new KeySpline(0.1123555056179775,
-                                          0.657303370786517,
-                                          0.8370786516853934,
-                                          0.499999999999999999)
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(5),
-                Children =
-                {
-                    keyframe1,
-                    keyframe2
-                },
-                IterationCount = new IterationCount(5),
-                PlaybackDirection = PlaybackDirection.Alternate
-            };
-
-            var rotateTransform = new RotateTransform(-2.5);
-            var rect = new Rectangle()
-            {
-                RenderTransform = rotateTransform
-            };
-
-            var clock = new TestClock();
-            var animationRun = animation.RunAsync(rect, clock);
-
-            // position is what you'd expect at end and beginning
-            clock.Step(TimeSpan.Zero);
-            Assert.Equal(rotateTransform.Angle, -2.5);
-            clock.Step(TimeSpan.FromSeconds(5));
-            Assert.Equal(rotateTransform.Angle, 2.5);
-
-            // test some points in between end and beginning
-            var tolerance = 0.01;
-            clock.Step(TimeSpan.Parse("00:00:10.0153932"));
-            var expected = -2.4122350198982545;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-
-            clock.Step(TimeSpan.Parse("00:00:11.2655407"));
-            expected = -0.37153223002125113;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-
-            clock.Step(TimeSpan.Parse("00:00:12.6158773"));
-            expected = 0.3967885416786294;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-
-            clock.Step(TimeSpan.Parse("00:00:14.6495256"));
-            expected = 1.8016358493761722;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-        }
-        
-        [Fact]
-        public void Check_KeySpline_Parsing_Is_Correct()
-        {
-            var keyframe1 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(RotateTransform.AngleProperty, -2.5d),
-                },
-                KeyTime = TimeSpan.FromSeconds(0)
-            };
-
-            var keyframe2 = new KeyFrame()
-            {
-                Setters =
-                {
-                    new Setter(RotateTransform.AngleProperty, 2.5d),
-                },
-                KeyTime = TimeSpan.FromSeconds(5),
-            };
-
-            var animation = new Animation()
-            {
-                Duration = TimeSpan.FromSeconds(5),
-                Children =
-                {
-                    keyframe1,
-                    keyframe2
-                },
-                IterationCount = new IterationCount(5),
-                PlaybackDirection = PlaybackDirection.Alternate,
-                Easing = Easing.Parse("0.1123555056179775,0.657303370786517,0.8370786516853934,0.499999999999999999")
-            };
-
-            var rotateTransform = new RotateTransform(-2.5);
-            var rect = new Rectangle()
-            {
-                RenderTransform = rotateTransform
-            };
-
-            var clock = new TestClock();
-            var animationRun = animation.RunAsync(rect, clock);
-
-            // position is what you'd expect at end and beginning
-            clock.Step(TimeSpan.Zero);
-            Assert.Equal(rotateTransform.Angle, -2.5);
-            clock.Step(TimeSpan.FromSeconds(5));
-            Assert.Equal(rotateTransform.Angle, 2.5);
-
-            // test some points in between end and beginning
-            var tolerance = 0.01;
-            clock.Step(TimeSpan.Parse("00:00:10.0153932"));
-            var expected = -2.4122350198982545;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-
-            clock.Step(TimeSpan.Parse("00:00:11.2655407"));
-            expected = -0.37153223002125113;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-
-            clock.Step(TimeSpan.Parse("00:00:12.6158773"));
-            expected = 0.3967885416786294;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-
-            clock.Step(TimeSpan.Parse("00:00:14.6495256"));
-            expected = 1.8016358493761722;
-            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
-        }
-    }
-}
diff --git a/tests/Avalonia.Animation.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Animation.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index b57cd55868..0000000000
--- a/tests/Avalonia.Animation.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using Xunit;
-
-[assembly: AssemblyTitle("Avalonia.Animation.UnitTests")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.Animation.UnitTests/TestClock.cs b/tests/Avalonia.Animation.UnitTests/TestClock.cs
deleted file mode 100644
index 4812880c03..0000000000
--- a/tests/Avalonia.Animation.UnitTests/TestClock.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Avalonia.Animation.UnitTests
-{
-    internal class TestClock : IClock, IDisposable
-    {
-        private TimeSpan _curTime;
-
-        private IObserver<TimeSpan> _observer;
-
-        public PlayState PlayState { get; set; } = PlayState.Run;
-
-        public void Dispose()
-        {
-            _observer?.OnCompleted();
-        }
-
-        public void Step(TimeSpan time)
-        {
-            _observer?.OnNext(time);
-        }
-
-        public void Pulse(TimeSpan time)
-        {
-            _curTime += time;
-            _observer?.OnNext(_curTime);
-        }
-
-        public IDisposable Subscribe(IObserver<TimeSpan> observer)
-        {
-            _observer = observer;
-            return this;
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs b/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs
deleted file mode 100644
index 640013dedd..0000000000
--- a/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Animation.UnitTests
-{
-    public class TransitionsTests
-    {
-        [Fact]
-        public void Check_Transitions_Interpolation_Negative_Bounds_Clamp()
-        {
-            var clock = new TestClock();
-
-            var border = new Border
-            {
-                Transitions = new Transitions
-                    {
-                        new DoubleTransition
-                        {
-                            Duration = TimeSpan.FromSeconds(1),
-                            Property = Border.OpacityProperty,
-                        }
-                    }
-            };
-
-            border.Opacity = 0;
-
-            clock.Pulse(TimeSpan.FromSeconds(0));
-            clock.Pulse(TimeSpan.FromSeconds(-0.5));
-
-            Assert.Equal(0, border.Opacity);
-
-        }
-
-        [Fact]
-        public void Check_Transitions_Interpolation_Positive_Bounds_Clamp()
-        {
-            var clock = new TestClock();
-
-            var border = new Border
-            {
-                Transitions = new Transitions
-                    {
-                        new DoubleTransition
-                        {
-                            Duration = TimeSpan.FromSeconds(1),
-                            Property = Border.OpacityProperty,
-                        }
-                    }
-            };
-
-            border.Opacity = 0;
-
-            clock.Pulse(TimeSpan.FromSeconds(0));
-            clock.Pulse(TimeSpan.FromMilliseconds(1001));
-
-            Assert.Equal(0, border.Opacity);
-
-        }
-
-        [Fact]
-        public void TransitionInstance_With_Zero_Duration_Is_Completed_On_First_Tick()
-        {
-            var clock = new TestClock();
-
-            int i = 0;
-            var inst = new TransitionInstance(clock, TimeSpan.Zero, TimeSpan.Zero).Subscribe(nextValue =>
-            {
-                switch (i++)
-                {
-                    case 0: Assert.Equal(0, nextValue); break;
-                    case 1: Assert.Equal(1d, nextValue); break;
-                }
-            });
-
-            clock.Pulse(TimeSpan.FromMilliseconds(10));
-
-        }
-
-        [Fact]
-        public void TransitionInstance_Properly_Calculates_Delay_And_Duration_Values()
-        {
-            var clock = new TestClock();
-
-            int i = -1;
-            var inst = new TransitionInstance(clock, TimeSpan.FromMilliseconds(30), TimeSpan.FromMilliseconds(70)).Subscribe(nextValue =>
-            {
-                switch (i++)
-                {
-                    case 0: Assert.Equal(0, nextValue); break;
-                    case 1: Assert.Equal(0, nextValue); break;
-                    case 2: Assert.Equal(0, nextValue); break;
-                    case 3: Assert.Equal(0, nextValue); break;
-                    case 4: Assert.Equal(Math.Round(10d / 70d, 4), Math.Round(nextValue, 4)); break;
-                    case 5: Assert.Equal(Math.Round(20d / 70d, 4), Math.Round(nextValue, 4)); break;
-                    case 6: Assert.Equal(Math.Round(30d / 70d, 4), Math.Round(nextValue, 4)); break;
-                    case 7: Assert.Equal(Math.Round(40d / 70d, 4), Math.Round(nextValue, 4)); break;
-                    case 8: Assert.Equal(Math.Round(50d / 70d, 4), Math.Round(nextValue, 4)); break;
-                    case 9: Assert.Equal(Math.Round(60d / 70d, 4), Math.Round(nextValue, 4)); break;
-                    case 10: Assert.Equal(1d, nextValue); break;
-                }
-            });
-
-            for (int z = 0; z <= 10; z++)
-            {
-                clock.Pulse(TimeSpan.FromMilliseconds(10));
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/AnimatableTests.cs b/tests/Avalonia.Base.UnitTests/Animation/AnimatableTests.cs
new file mode 100644
index 0000000000..f9ff8caab1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/AnimatableTests.cs
@@ -0,0 +1,515 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Data;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Animation
+{
+    public class AnimatableTests
+    {
+        [Fact]
+        public void Transition_Is_Not_Applied_When_Not_Attached_To_Visual_Tree()
+        {
+            var target = CreateTarget();
+            var control = new Control
+            {
+                Transitions = new Transitions { target.Object },
+            };
+
+            control.Opacity = 0.5;
+
+            target.Verify(x => x.Apply(
+                control,
+                It.IsAny<IClock>(),
+                1.0,
+                0.5),
+                Times.Never);
+        }
+
+        [Fact]
+        public void Transition_Is_Not_Applied_To_Initial_Style()
+        {
+            using (Start())
+            {
+                var target = CreateTarget();
+                var control = new Control
+                {
+                    Transitions = new Transitions { target.Object },
+                };
+
+                var root = new TestRoot
+                {
+                    Styles =
+                    {
+                        new Style(x => x.OfType<Control>())
+                        {
+                            Setters =
+                            {
+                                new Setter(Visual.OpacityProperty, 0.8),
+                            }
+                        }
+                    }
+                };
+
+                root.Child = control;
+
+                Assert.Equal(0.8, control.Opacity);
+
+                target.Verify(x => x.Apply(
+                    It.IsAny<Control>(),
+                    It.IsAny<IClock>(),
+                    It.IsAny<object>(),
+                    It.IsAny<object>()),
+                    Times.Never);
+            }
+        }
+
+        [Fact]
+        public void Transition_Is_Applied_When_Local_Value_Changes()
+        {
+            using var app = Start();
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            control.Opacity = 0.5;
+
+            target.Verify(x => x.Apply(
+                control,
+                It.IsAny<IClock>(),
+                1.0,
+                0.5));
+        }
+
+        [Fact]
+        public void Transition_Is_Not_Applied_When_Animated_Value_Changes()
+        {
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            control.SetValue(Visual.OpacityProperty, 0.5, BindingPriority.Animation);
+
+            target.Verify(x => x.Apply(
+                control,
+                It.IsAny<IClock>(),
+                1.0,
+                0.5),
+                Times.Never);
+        }
+
+
+        [Theory]
+        [InlineData(null)] //null value
+        [InlineData("stringValue")] //string value
+        public void Invalid_Values_In_Animation_Should_Not_Crash_Animations(object invalidValue)
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Layoutable.WidthProperty, 1d),
+                },
+                KeyTime = TimeSpan.FromSeconds(0)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Layoutable.WidthProperty, 2d),
+                },
+                KeyTime = TimeSpan.FromSeconds(2),
+            };
+
+            var keyframe3 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Layoutable.WidthProperty, invalidValue),
+                },
+                KeyTime = TimeSpan.FromSeconds(3),
+            };
+
+            var animation = new Avalonia.Animation.Animation()
+            {
+                Duration = TimeSpan.FromSeconds(3),
+                Children =
+                {
+                    keyframe1,
+                    keyframe2,
+                    keyframe3
+                },
+                IterationCount = new IterationCount(5),
+                PlaybackDirection = PlaybackDirection.Alternate,
+            };
+
+            var rect = new Rectangle()
+            {
+                Width = 11,
+            };
+
+            var originalValue = rect.Width;
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(rect, clock);
+
+            clock.Step(TimeSpan.Zero);
+            Assert.Equal(rect.Width, 1);
+            clock.Step(TimeSpan.FromSeconds(2));
+            Assert.Equal(rect.Width, 2);
+            clock.Step(TimeSpan.FromSeconds(3));
+            //here we have invalid value so value should be expected and set to initial original value
+            Assert.Equal(rect.Width, originalValue);
+        }
+
+        [Fact]
+        public void Transition_Is_Not_Applied_When_StyleTrigger_Changes_With_LocalValue_Present()
+        {
+            using var app = Start();
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            control.SetValue(Visual.OpacityProperty, 0.5);
+
+            target.Verify(x => x.Apply(
+                control,
+                It.IsAny<IClock>(),
+                1.0,
+                0.5));
+            target.Invocations.Clear();
+
+            control.SetValue(Visual.OpacityProperty, 0.8, BindingPriority.StyleTrigger);
+
+            target.Verify(x => x.Apply(
+                It.IsAny<Control>(),
+                It.IsAny<IClock>(),
+                It.IsAny<object>(),
+                It.IsAny<object>()),
+                Times.Never);
+        }
+
+        [Fact]
+        public void Transition_Is_Disposed_When_Local_Value_Changes()
+        {
+            using var app = Start();
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+            var sub = new Mock<IDisposable>();
+
+            target.Setup(x => x.Apply(control, It.IsAny<IClock>(), 1.0, 0.5)).Returns(sub.Object);
+
+            control.Opacity = 0.5;
+            sub.Invocations.Clear();
+            control.Opacity = 0.4;
+
+            sub.Verify(x => x.Dispose());
+        }
+
+        [Fact]
+        public void New_Transition_Is_Applied_When_Local_Value_Changes()
+        {
+            using var app = Start();
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            target.Setup(x => x.Property).Returns(Visual.OpacityProperty);
+            target.Setup(x => x.Apply(control, It.IsAny<IClock>(), 1.0, 0.5))
+                .Callback(() =>
+                {
+                    control.SetValue(Visual.OpacityProperty, 0.9, BindingPriority.Animation);
+                })
+                .Returns(Mock.Of<IDisposable>());
+
+            control.Opacity = 0.5;
+
+            Assert.Equal(0.9, control.Opacity);
+            target.Invocations.Clear();
+
+            control.Opacity = 0.4;
+
+            target.Verify(x => x.Apply(
+                control,
+                It.IsAny<IClock>(),
+                0.9,
+                0.4));
+        }
+
+        [Fact]
+        public void Transition_Is_Not_Applied_When_Removed_From_Visual_Tree()
+        {
+            using var app = Start();
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            control.Opacity = 0.5;
+
+            target.Verify(x => x.Apply(
+                control,
+                It.IsAny<IClock>(),
+                1.0,
+                0.5));
+            target.Invocations.Clear();
+
+            var root = (TestRoot)control.Parent;
+            root.Child = null;
+            control.Opacity = 0.8;
+
+            target.Verify(x => x.Apply(
+                It.IsAny<Control>(),
+                It.IsAny<IClock>(),
+                It.IsAny<object>(),
+                It.IsAny<object>()),
+                Times.Never);
+        }
+
+        [Fact]
+        public void Animation_Is_Cancelled_When_Transition_Removed()
+        {
+            using var app = Start();
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+            var sub = new Mock<IDisposable>();
+
+            target.Setup(x => x.Apply(
+                It.IsAny<Animatable>(),
+                It.IsAny<IClock>(),
+                It.IsAny<object>(),
+                It.IsAny<object>())).Returns(sub.Object);
+
+            control.Opacity = 0.5;
+            control.Transitions.RemoveAt(0);
+
+            sub.Verify(x => x.Dispose());
+        }
+
+        [Fact]
+        public void Animation_Is_Cancelled_When_New_Style_Activates()
+        {
+            using (Start())
+            {
+                var target = CreateTarget();
+                var control = CreateStyledControl(target.Object);
+                var sub = new Mock<IDisposable>();
+
+                target.Setup(x => x.Apply(
+                    control,
+                    It.IsAny<IClock>(),
+                    1.0,
+                    0.5)).Returns(sub.Object);
+
+                control.Opacity = 0.5;
+
+                target.Verify(x => x.Apply(
+                    control,
+                    It.IsAny<IClock>(),
+                    1.0,
+                    0.5),
+                    Times.Once);
+
+                control.Classes.Add("foo");
+
+                sub.Verify(x => x.Dispose());
+            }
+        }
+
+        [Fact]
+        public void Transition_From_Style_Trigger_Is_Applied()
+        {
+            using (Start())
+            {
+                var target = CreateTransition(Control.WidthProperty);
+                var control = CreateStyledControl(transition2: target.Object);
+                var sub = new Mock<IDisposable>();
+
+                control.Classes.Add("foo");
+                control.Width = 100;
+
+                target.Verify(x => x.Apply(
+                    control,
+                    It.IsAny<IClock>(),
+                    double.NaN,
+                    100.0),
+                    Times.Once);
+            }
+        }
+
+        [Fact]
+        public void Replacing_Transitions_During_Animation_Does_Not_Throw_KeyNotFound()
+        {
+            // Issue #4059
+            using (Start())
+            {
+                Border target;
+                var clock = new TestClock();
+                var root = new TestRoot
+                {
+                    Clock = clock,
+                    Styles =
+                    {
+                        new Style(x => x.OfType<Border>())
+                        {
+                            Setters =
+                            {
+                                new Setter(Border.TransitionsProperty,
+                                    new Transitions
+                                    {
+                                        new DoubleTransition
+                                        {
+                                            Property = Border.OpacityProperty,
+                                            Duration = TimeSpan.FromSeconds(1),
+                                        },
+                                    }),
+                            },
+                        },
+                        new Style(x => x.OfType<Border>().Class("foo"))
+                        {
+                            Setters =
+                            {
+                                new Setter(Border.TransitionsProperty,
+                                    new Transitions
+                                    {
+                                        new DoubleTransition
+                                        {
+                                            Property = Border.OpacityProperty,
+                                            Duration = TimeSpan.FromSeconds(1),
+                                        },
+                                    }),
+                                new Setter(Border.OpacityProperty, 0.0),
+                            },
+                        },
+                    },
+                    Child = target = new Border
+                    {
+                        Background = Brushes.Red,
+                    }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                target.Classes.Add("foo");
+                clock.Step(TimeSpan.FromSeconds(0));
+                clock.Step(TimeSpan.FromSeconds(0.5));
+
+                Assert.Equal(0.5, target.Opacity);
+
+                target.Classes.Remove("foo");
+            }
+        }
+
+        [Fact]
+        public void Transitions_Can_Be_Changed_To_Collection_That_Contains_The_Same_Transitions()
+        {
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            control.Transitions = new Transitions { target.Object };
+        }
+
+        [Fact]
+        public void Transitions_Can_Re_Set_During_Batch_Update()
+        {
+            var target = CreateTarget();
+            var control = CreateControl(target.Object);
+
+            // Assigning and then clearing Transitions ensures we have a transition state
+            // collection created.
+            control.Transitions = null;
+
+            control.BeginBatchUpdate();
+
+            // Setting opacity then Transitions means that we receive the Transitions change
+            // after the Opacity change when EndBatchUpdate is called.
+            control.Opacity = 0.5;
+            control.Transitions = new Transitions { target.Object };
+
+            // Which means that the transition state hasn't been initialized with the new
+            // Transitions when the Opacity change notification gets raised here.
+            control.EndBatchUpdate();
+        }
+
+        private static IDisposable Start()
+        {
+            var clock = new MockGlobalClock();
+            var services = TestServices.RealStyler.With(globalClock: clock);
+            return UnitTestApplication.Start(services);
+        }
+
+        private static Mock<ITransition> CreateTarget()
+        {
+            return CreateTransition(Visual.OpacityProperty);
+        }
+
+        private static Control CreateControl(ITransition transition)
+        {
+            var control = new Control
+            {
+                Transitions = new Transitions { transition },
+            };
+
+            var root = new TestRoot(control);
+            return control;
+        }
+
+        private static Control CreateStyledControl(
+            ITransition transition1 = null,
+            ITransition transition2 = null)
+        {
+            transition1 = transition1 ?? CreateTarget().Object;
+            transition2 = transition2 ?? CreateTransition(Control.WidthProperty).Object;
+
+            var control = new Control
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<Control>())
+                    {
+                        Setters =
+                        {
+                            new Setter
+                            {
+                                Property = Control.TransitionsProperty,
+                                Value = new Transitions { transition1 },
+                            }
+                        }
+                    },
+                    new Style(x => x.OfType<Control>().Class("foo"))
+                    {
+                        Setters =
+                        {
+                            new Setter
+                            {
+                                Property = Control.TransitionsProperty,
+                                Value = new Transitions { transition2 },
+                            }
+                        }
+                    }
+                }
+            };
+
+            var root = new TestRoot(control);
+            return control;
+        }
+
+        private static Mock<ITransition> CreateTransition(AvaloniaProperty property)
+        {
+            var target = new Mock<ITransition>();
+            var sub = new Mock<IDisposable>();
+
+            target.Setup(x => x.Property).Returns(property);
+            target.Setup(x => x.Apply(
+                It.IsAny<Animatable>(),
+                It.IsAny<IClock>(),
+                It.IsAny<object>(),
+                It.IsAny<object>())).Returns(sub.Object);
+
+            return target;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/AnimationIterationTests.cs b/tests/Avalonia.Base.UnitTests/Animation/AnimationIterationTests.cs
new file mode 100644
index 0000000000..ca24b95e65
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/AnimationIterationTests.cs
@@ -0,0 +1,450 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Avalonia.Data;
+using Xunit;
+using Avalonia.Animation.Easings;
+using System.Threading;
+using System.Reactive.Linq;
+
+namespace Avalonia.Base.UnitTests.Animation
+{
+    using Animation = Avalonia.Animation.Animation;
+
+    public class AnimationIterationTests
+    {
+        [Fact]
+        public void Check_KeyTime_Correctly_Converted_To_Cue()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 100d),
+                },
+                KeyTime = TimeSpan.FromSeconds(0.5)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 0d),
+                },
+                KeyTime = TimeSpan.FromSeconds(0)
+            };
+
+            var animation = new Avalonia.Animation.Animation()
+            {
+                Duration = TimeSpan.FromSeconds(1),
+                Children =
+                {
+                    keyframe2,
+                    keyframe1
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 100d
+            };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(border, clock);
+
+            clock.Step(TimeSpan.Zero); 
+            Assert.Equal(border.Width, 0d);
+
+            clock.Step(TimeSpan.FromSeconds(1)); 
+            Assert.Equal(border.Width, 100d);
+ 
+        }
+
+
+        [Fact]
+        public void Check_Initial_Inter_and_Trailing_Delay_Values()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 200d),
+                },
+                Cue = new Cue(1d)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 100d),
+                },
+                Cue = new Cue(0d)
+            };
+
+            var animation = new Avalonia.Animation.Animation()
+            {
+                Duration = TimeSpan.FromSeconds(3),
+                Delay = TimeSpan.FromSeconds(3),
+                DelayBetweenIterations = TimeSpan.FromSeconds(3),
+                IterationCount = new IterationCount(2),
+                Children =
+                {
+                    keyframe2,
+                    keyframe1
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 100d
+            };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(border, clock);
+
+            clock.Step(TimeSpan.Zero);
+
+            // Initial Delay.
+            clock.Step(TimeSpan.FromSeconds(1));
+            Assert.Equal(border.Width, 0d);
+
+            clock.Step(TimeSpan.FromSeconds(6));
+
+            // First Inter-Iteration delay.
+            clock.Step(TimeSpan.FromSeconds(8));
+            Assert.Equal(border.Width, 200d);
+
+            // Trailing Delay should be non-existent.
+            clock.Step(TimeSpan.FromSeconds(14));
+            Assert.True(animationRun.Status == TaskStatus.RanToCompletion);
+            Assert.Equal(border.Width, 100d);
+        }
+
+        [Fact]
+        public void Check_FillModes_Start_and_End_Values_if_Retained()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 0d),
+                },
+                Cue = new Cue(0.0d)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 300d),
+                },
+                Cue = new Cue(1.0d)
+            };
+
+            var animation = new Avalonia.Animation.Animation()
+            {
+                Duration = TimeSpan.FromSeconds(0.05d),
+                Delay = TimeSpan.FromSeconds(0.05d),
+                Easing = new SineEaseInOut(),
+                FillMode = FillMode.Both,
+                Children =
+                {
+                    keyframe1,
+                    keyframe2
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 100d,
+            };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(border, clock);
+
+            clock.Step(TimeSpan.FromSeconds(0d));
+            Assert.Equal(border.Width, 0d);
+
+            clock.Step(TimeSpan.FromSeconds(0.050d));
+            Assert.Equal(border.Width, 0d);
+
+            clock.Step(TimeSpan.FromSeconds(0.100d));
+            Assert.Equal(border.Width, 300d);
+        }
+
+        [Fact(Skip = "See #6111")]
+        public void Dispose_Subscription_Should_Stop_Animation()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 200d),
+                },
+                Cue = new Cue(1d)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 100d),
+                },
+                Cue = new Cue(0d)
+            };
+
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(10),
+                Delay = TimeSpan.FromSeconds(0),
+                DelayBetweenIterations = TimeSpan.FromSeconds(0),
+                IterationCount = new IterationCount(1),
+                Children =
+                {
+                    keyframe2,
+                    keyframe1
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 50d
+            };
+            var propertyChangedCount = 0;
+            var animationCompletedCount = 0;
+            border.PropertyChanged += (sender, e) =>
+            {
+                if (e.Property == Control.WidthProperty)
+                {
+                    propertyChangedCount++;
+                }
+            };
+
+            var clock = new TestClock();
+            var disposable = animation.Apply(border, clock, Observable.Return(true), () => animationCompletedCount++);
+
+            Assert.Equal(0, propertyChangedCount);
+
+            clock.Step(TimeSpan.FromSeconds(0));
+            Assert.Equal(0, animationCompletedCount);
+            Assert.Equal(1, propertyChangedCount);
+
+            disposable.Dispose();
+
+            // Clock ticks should be ignored after Dispose
+            clock.Step(TimeSpan.FromSeconds(5));
+            clock.Step(TimeSpan.FromSeconds(6));
+            clock.Step(TimeSpan.FromSeconds(7));
+
+            // On animation disposing (cancellation) on completed is not invoked (is it expected?)
+            Assert.Equal(0, animationCompletedCount);
+            // Initial property changed before cancellation + animation value removal.
+            Assert.Equal(2, propertyChangedCount);
+        }
+
+        [Fact]
+        public void Do_Not_Run_Cancelled_Animation()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 200d),
+                },
+                Cue = new Cue(1d)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 100d),
+                },
+                Cue = new Cue(0d)
+            };
+
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(10),
+                Delay = TimeSpan.FromSeconds(0),
+                DelayBetweenIterations = TimeSpan.FromSeconds(0),
+                IterationCount = new IterationCount(1),
+                Children =
+                {
+                    keyframe2,
+                    keyframe1
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 100d
+            };
+            var propertyChangedCount = 0;
+            border.PropertyChanged += (sender, e) =>
+            {
+                if (e.Property == Control.WidthProperty)
+                {
+                    propertyChangedCount++;
+                }
+            };
+
+            var clock = new TestClock();
+            var cancellationTokenSource = new CancellationTokenSource();
+            cancellationTokenSource.Cancel();
+            var animationRun = animation.RunAsync(border, clock, cancellationTokenSource.Token);
+
+            clock.Step(TimeSpan.FromSeconds(10));
+            Assert.Equal(0, propertyChangedCount);
+            Assert.True(animationRun.IsCompleted);
+        }
+
+        [Fact(Skip = "See #6111")]
+        public void Cancellation_Should_Stop_Animation()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 200d),
+                },
+                Cue = new Cue(1d)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 100d),
+                },
+                Cue = new Cue(0d)
+            };
+
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(10),
+                Delay = TimeSpan.FromSeconds(0),
+                DelayBetweenIterations = TimeSpan.FromSeconds(0),
+                IterationCount = new IterationCount(1),
+                Children =
+                {
+                    keyframe2,
+                    keyframe1
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 50d
+            };
+            var propertyChangedCount = 0;
+            border.PropertyChanged += (sender, e) =>
+            {
+                if (e.Property == Control.WidthProperty)
+                {
+                    propertyChangedCount++;
+                }
+            };
+
+            var clock = new TestClock();
+            var cancellationTokenSource = new CancellationTokenSource();
+            var animationRun = animation.RunAsync(border, clock, cancellationTokenSource.Token);
+
+            Assert.Equal(0, propertyChangedCount);
+
+            clock.Step(TimeSpan.FromSeconds(0));
+            Assert.False(animationRun.IsCompleted);
+            Assert.Equal(1, propertyChangedCount);
+
+            cancellationTokenSource.Cancel();
+            clock.Step(TimeSpan.FromSeconds(1));
+            clock.Step(TimeSpan.FromSeconds(2));
+            clock.Step(TimeSpan.FromSeconds(3));
+            //Assert.Equal(2, propertyChangedCount);
+
+            animationRun.Wait();
+
+            clock.Step(TimeSpan.FromSeconds(6));
+            Assert.True(animationRun.IsCompleted);
+            Assert.Equal(2, propertyChangedCount);
+        }
+
+        [Fact]
+        public void Cancellation_Of_Completed_Animation_Does_Not_Fail()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 200d),
+                },
+                Cue = new Cue(1d)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Border.WidthProperty, 100d),
+                },
+                Cue = new Cue(0d)
+            };
+
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(10),
+                Delay = TimeSpan.FromSeconds(0),
+                DelayBetweenIterations = TimeSpan.FromSeconds(0),
+                IterationCount = new IterationCount(1),
+                Children =
+                {
+                    keyframe2,
+                    keyframe1
+                }
+            };
+
+            var border = new Border()
+            {
+                Height = 100d,
+                Width = 50d
+            };
+            var propertyChangedCount = 0;
+            border.PropertyChanged += (sender, e) =>
+            {
+                if (e.Property == Control.WidthProperty)
+                {
+                    propertyChangedCount++;
+                }
+            };
+
+            var clock = new TestClock();
+            var cancellationTokenSource = new CancellationTokenSource();
+            var animationRun = animation.RunAsync(border, clock, cancellationTokenSource.Token);
+
+            Assert.Equal(0, propertyChangedCount);
+
+            clock.Step(TimeSpan.FromSeconds(0));
+            Assert.False(animationRun.IsCompleted);
+            Assert.Equal(1, propertyChangedCount);
+
+            clock.Step(TimeSpan.FromSeconds(10));
+            Assert.True(animationRun.IsCompleted);
+            Assert.Equal(2, propertyChangedCount);
+
+            cancellationTokenSource.Cancel();
+            animationRun.Wait();
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/BrushTransitionTests.cs b/tests/Avalonia.Base.UnitTests/Animation/BrushTransitionTests.cs
new file mode 100644
index 0000000000..acc32fd6a2
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/BrushTransitionTests.cs
@@ -0,0 +1,51 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Animation
+{
+    public class BrushTransitionTests
+    {
+        [Fact]
+        public void SolidColorBrush_Opacity_IsInteroplated()
+        {
+            Test(0, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 0 });
+            Test(0, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 1 });
+            Test(0.5, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 1 });
+            Test(0.5, new SolidColorBrush { Opacity = 0.5 }, new SolidColorBrush { Opacity = 0.5 });
+            Test(1, new SolidColorBrush { Opacity = 1 }, new SolidColorBrush { Opacity = 1 });
+            // TODO: investigate why this case fails.
+            //Test2(1, new SolidColorBrush { Opacity = 0 }, new SolidColorBrush { Opacity = 1 });
+        }
+
+        [Fact]
+        public void LinearGradientBrush_Opacity_IsInteroplated()
+        {
+            Test(0, new LinearGradientBrush { Opacity = 0 }, new LinearGradientBrush { Opacity = 0 });
+            Test(0, new LinearGradientBrush { Opacity = 0 }, new LinearGradientBrush { Opacity = 1 });
+            Test(0.5, new LinearGradientBrush { Opacity = 0 }, new LinearGradientBrush { Opacity = 1 });
+            Test(0.5, new LinearGradientBrush { Opacity = 0.5 }, new LinearGradientBrush { Opacity = 0.5 });
+            Test(1, new LinearGradientBrush { Opacity = 1 }, new LinearGradientBrush { Opacity = 1 });
+        }
+
+        private static void Test(double progress, IBrush oldBrush, IBrush newBrush)
+        {
+            var clock = new TestClock();
+            var border = new Border() { Background = oldBrush };
+            BrushTransition sut = new BrushTransition
+            {
+                Duration = TimeSpan.FromSeconds(1),
+                Property = Border.BackgroundProperty
+            };
+
+            sut.Apply(border, clock, oldBrush, newBrush);
+            clock.Pulse(TimeSpan.Zero);
+            clock.Pulse(sut.Duration * progress);
+
+            Assert.NotNull(border.Background);
+            Assert.Equal(oldBrush.Opacity + (newBrush.Opacity - oldBrush.Opacity) * progress, border.Background.Opacity);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/KeySplineTests.cs b/tests/Avalonia.Base.UnitTests/Animation/KeySplineTests.cs
new file mode 100644
index 0000000000..3cd12d92ec
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/KeySplineTests.cs
@@ -0,0 +1,241 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Animation.Easings;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Animation
+{
+    public class KeySplineTests
+    {
+        [Theory]
+        [InlineData("1,2 3,4")]
+        [InlineData("1 2 3 4")]
+        [InlineData("1 2,3 4")]
+        [InlineData("1,2,3,4")]
+        public void Can_Parse_KeySpline_Via_TypeConverter(string input)
+        {
+            var conv = new KeySplineTypeConverter();
+
+            var keySpline = (KeySpline)conv.ConvertFrom(input);
+
+            Assert.Equal(1, keySpline.ControlPointX1);
+            Assert.Equal(2, keySpline.ControlPointY1);
+            Assert.Equal(3, keySpline.ControlPointX2);
+            Assert.Equal(4, keySpline.ControlPointY2);
+        }
+
+        [Theory]
+        [InlineData("1,2F,3,4")] 
+        [InlineData("Foo,Bar,Fee,Buzz")] 
+        public void Can_Handle_Invalid_String_KeySpline_Via_TypeConverter(string input)
+        {
+            var conv = new KeySplineTypeConverter();
+
+            Assert.ThrowsAny<Exception>(() => (KeySpline)conv.ConvertFrom(input));
+        }
+
+        [Theory]
+        [InlineData(0.00)]
+        [InlineData(0.50)]
+        [InlineData(1.00)]
+        public void KeySpline_X_Values_In_Range_Do_Not_Throw(double input)
+        {
+            var keySpline = new KeySpline();
+            keySpline.ControlPointX1 = input; // no exception will be thrown -- test will fail if exception thrown
+            keySpline.ControlPointX2 = input; // no exception will be thrown -- test will fail if exception thrown
+        }
+
+        [Theory]
+        [InlineData(-0.01)]
+        [InlineData(1.01)]
+        public void KeySpline_X_Values_Cannot_Be_Out_Of_Range(double input)
+        {
+            var keySpline = new KeySpline();
+            Assert.Throws<ArgumentException>(() => keySpline.ControlPointX1 = input);
+            Assert.Throws<ArgumentException>(() => keySpline.ControlPointX2 = input);
+        }
+
+        [Fact]
+        public void SplineEasing_Can_Be_Mutated()
+        {
+            var easing = new SplineEasing();
+
+            Assert.Equal(0, easing.Ease(0));
+            Assert.Equal(1, easing.Ease(1));
+
+            easing.X1 = 0.25;
+            easing.Y1 = 0.5;
+            easing.X2 = 0.75;
+            easing.Y2 = 1.0;
+
+            Assert.NotEqual(0.5, easing.Ease(0.5));
+        }
+
+        /*
+          To get the test values for the KeySpline test, you can:
+          1) Grab the WPF sample for KeySpline animations from https://github.com/microsoft/WPF-Samples/tree/master/Animation/KeySplineAnimations
+          2) Add the following xaml somewhere:
+            <Button Content="Capture"
+                    Click="Button_Click"/>
+            <ScrollViewer VerticalScrollBarVisibility="Visible">
+                <TextBlock Name="CaptureData"
+                           Text="---"
+                           TextWrapping="Wrap" />
+            </ScrollViewer>
+          3) Add the following code to the code behind:
+            private void Button_Click(object sender, RoutedEventArgs e)
+            {
+                CaptureData.Text += string.Format("\n{0} | {1}", myTranslateTransform3D.OffsetX, (TimeSpan)ExampleStoryboard.GetCurrentTime(this));
+                CaptureData.Text +=
+                    "\nKeySpline=\"" + mySplineKeyFrame.KeySpline.ControlPoint1.X.ToString() + "," +
+                    mySplineKeyFrame.KeySpline.ControlPoint1.Y.ToString() + " " +
+                    mySplineKeyFrame.KeySpline.ControlPoint2.X.ToString() + "," +
+                    mySplineKeyFrame.KeySpline.ControlPoint2.Y.ToString() + "\"";
+                CaptureData.Text += "\n-----";
+            }
+          4) Run the app, mess with the slider values, then click the button to capture output values
+         **/
+
+        [Fact]
+        public void Check_KeySpline_Handled_properly()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(RotateTransform.AngleProperty, -2.5d),
+                },
+                KeyTime = TimeSpan.FromSeconds(0)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(RotateTransform.AngleProperty, 2.5d),
+                },
+                KeyTime = TimeSpan.FromSeconds(5),
+                KeySpline = new KeySpline(0.1123555056179775,
+                                          0.657303370786517,
+                                          0.8370786516853934,
+                                          0.499999999999999999)
+            };
+
+            var animation = new Avalonia.Animation.Animation()
+            {
+                Duration = TimeSpan.FromSeconds(5),
+                Children =
+                {
+                    keyframe1,
+                    keyframe2
+                },
+                IterationCount = new IterationCount(5),
+                PlaybackDirection = PlaybackDirection.Alternate
+            };
+
+            var rotateTransform = new RotateTransform(-2.5);
+            var rect = new Rectangle()
+            {
+                RenderTransform = rotateTransform
+            };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(rect, clock);
+
+            // position is what you'd expect at end and beginning
+            clock.Step(TimeSpan.Zero);
+            Assert.Equal(rotateTransform.Angle, -2.5);
+            clock.Step(TimeSpan.FromSeconds(5));
+            Assert.Equal(rotateTransform.Angle, 2.5);
+
+            // test some points in between end and beginning
+            var tolerance = 0.01;
+            clock.Step(TimeSpan.Parse("00:00:10.0153932"));
+            var expected = -2.4122350198982545;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+            clock.Step(TimeSpan.Parse("00:00:11.2655407"));
+            expected = -0.37153223002125113;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+            clock.Step(TimeSpan.Parse("00:00:12.6158773"));
+            expected = 0.3967885416786294;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+            clock.Step(TimeSpan.Parse("00:00:14.6495256"));
+            expected = 1.8016358493761722;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+        }
+        
+        [Fact]
+        public void Check_KeySpline_Parsing_Is_Correct()
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(RotateTransform.AngleProperty, -2.5d),
+                },
+                KeyTime = TimeSpan.FromSeconds(0)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(RotateTransform.AngleProperty, 2.5d),
+                },
+                KeyTime = TimeSpan.FromSeconds(5),
+            };
+
+            var animation = new Avalonia.Animation.Animation()
+            {
+                Duration = TimeSpan.FromSeconds(5),
+                Children =
+                {
+                    keyframe1,
+                    keyframe2
+                },
+                IterationCount = new IterationCount(5),
+                PlaybackDirection = PlaybackDirection.Alternate,
+                Easing = Easing.Parse("0.1123555056179775,0.657303370786517,0.8370786516853934,0.499999999999999999")
+            };
+
+            var rotateTransform = new RotateTransform(-2.5);
+            var rect = new Rectangle()
+            {
+                RenderTransform = rotateTransform
+            };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(rect, clock);
+
+            // position is what you'd expect at end and beginning
+            clock.Step(TimeSpan.Zero);
+            Assert.Equal(rotateTransform.Angle, -2.5);
+            clock.Step(TimeSpan.FromSeconds(5));
+            Assert.Equal(rotateTransform.Angle, 2.5);
+
+            // test some points in between end and beginning
+            var tolerance = 0.01;
+            clock.Step(TimeSpan.Parse("00:00:10.0153932"));
+            var expected = -2.4122350198982545;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+            clock.Step(TimeSpan.Parse("00:00:11.2655407"));
+            expected = -0.37153223002125113;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+            clock.Step(TimeSpan.Parse("00:00:12.6158773"));
+            expected = 0.3967885416786294;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+
+            clock.Step(TimeSpan.Parse("00:00:14.6495256"));
+            expected = 1.8016358493761722;
+            Assert.True(Math.Abs(rotateTransform.Angle - expected) <= tolerance);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/TestClock.cs b/tests/Avalonia.Base.UnitTests/Animation/TestClock.cs
new file mode 100644
index 0000000000..6604bd29a4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/TestClock.cs
@@ -0,0 +1,36 @@
+using System;
+using Avalonia.Animation;
+
+namespace Avalonia.Base.UnitTests.Animation
+{
+    internal class TestClock : IClock, IDisposable
+    {
+        private TimeSpan _curTime;
+
+        private IObserver<TimeSpan> _observer;
+
+        public PlayState PlayState { get; set; } = PlayState.Run;
+
+        public void Dispose()
+        {
+            _observer?.OnCompleted();
+        }
+
+        public void Step(TimeSpan time)
+        {
+            _observer?.OnNext(time);
+        }
+
+        public void Pulse(TimeSpan time)
+        {
+            _curTime += time;
+            _observer?.OnNext(_curTime);
+        }
+
+        public IDisposable Subscribe(IObserver<TimeSpan> observer)
+        {
+            _observer = observer;
+            return this;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Animation/TransitionsTests.cs b/tests/Avalonia.Base.UnitTests/Animation/TransitionsTests.cs
new file mode 100644
index 0000000000..65cf90b642
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Animation/TransitionsTests.cs
@@ -0,0 +1,111 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Animation
+{
+    public class TransitionsTests
+    {
+        [Fact]
+        public void Check_Transitions_Interpolation_Negative_Bounds_Clamp()
+        {
+            var clock = new TestClock();
+
+            var border = new Border
+            {
+                Transitions = new Transitions
+                    {
+                        new DoubleTransition
+                        {
+                            Duration = TimeSpan.FromSeconds(1),
+                            Property = Border.OpacityProperty,
+                        }
+                    }
+            };
+
+            border.Opacity = 0;
+
+            clock.Pulse(TimeSpan.FromSeconds(0));
+            clock.Pulse(TimeSpan.FromSeconds(-0.5));
+
+            Assert.Equal(0, border.Opacity);
+
+        }
+
+        [Fact]
+        public void Check_Transitions_Interpolation_Positive_Bounds_Clamp()
+        {
+            var clock = new TestClock();
+
+            var border = new Border
+            {
+                Transitions = new Transitions
+                    {
+                        new DoubleTransition
+                        {
+                            Duration = TimeSpan.FromSeconds(1),
+                            Property = Border.OpacityProperty,
+                        }
+                    }
+            };
+
+            border.Opacity = 0;
+
+            clock.Pulse(TimeSpan.FromSeconds(0));
+            clock.Pulse(TimeSpan.FromMilliseconds(1001));
+
+            Assert.Equal(0, border.Opacity);
+
+        }
+
+        [Fact]
+        public void TransitionInstance_With_Zero_Duration_Is_Completed_On_First_Tick()
+        {
+            var clock = new TestClock();
+
+            int i = 0;
+            var inst = new TransitionInstance(clock, TimeSpan.Zero, TimeSpan.Zero).Subscribe(nextValue =>
+            {
+                switch (i++)
+                {
+                    case 0: Assert.Equal(0, nextValue); break;
+                    case 1: Assert.Equal(1d, nextValue); break;
+                }
+            });
+
+            clock.Pulse(TimeSpan.FromMilliseconds(10));
+
+        }
+
+        [Fact]
+        public void TransitionInstance_Properly_Calculates_Delay_And_Duration_Values()
+        {
+            var clock = new TestClock();
+
+            int i = -1;
+            var inst = new TransitionInstance(clock, TimeSpan.FromMilliseconds(30), TimeSpan.FromMilliseconds(70)).Subscribe(nextValue =>
+            {
+                switch (i++)
+                {
+                    case 0: Assert.Equal(0, nextValue); break;
+                    case 1: Assert.Equal(0, nextValue); break;
+                    case 2: Assert.Equal(0, nextValue); break;
+                    case 3: Assert.Equal(0, nextValue); break;
+                    case 4: Assert.Equal(Math.Round(10d / 70d, 4), Math.Round(nextValue, 4)); break;
+                    case 5: Assert.Equal(Math.Round(20d / 70d, 4), Math.Round(nextValue, 4)); break;
+                    case 6: Assert.Equal(Math.Round(30d / 70d, 4), Math.Round(nextValue, 4)); break;
+                    case 7: Assert.Equal(Math.Round(40d / 70d, 4), Math.Round(nextValue, 4)); break;
+                    case 8: Assert.Equal(Math.Round(50d / 70d, 4), Math.Round(nextValue, 4)); break;
+                    case 9: Assert.Equal(Math.Round(60d / 70d, 4), Math.Round(nextValue, 4)); break;
+                    case 10: Assert.Equal(1d, nextValue); break;
+                }
+            });
+
+            for (int z = 0; z <= 10; z++)
+            {
+                clock.Pulse(TimeSpan.FromMilliseconds(10));
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/AssetLoaderTests.cs b/tests/Avalonia.Base.UnitTests/AssetLoaderTests.cs
new file mode 100644
index 0000000000..28fb19e119
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/AssetLoaderTests.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Reflection;
+using Avalonia.Platform;
+using Avalonia.Platform.Internal;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests;
+
+public class AssetLoaderTests : IDisposable
+{
+    public class MockAssembly : Assembly {}
+
+    private const string AssemblyNameWithWhitespace = "Awesome Library";
+
+    private const string AssemblyNameWithNonAscii = "Какое-то-название";
+
+    public AssetLoaderTests()
+    {
+        var resolver = Mock.Of<IAssemblyDescriptorResolver>();
+
+        var descriptor = CreateAssemblyDescriptor(AssemblyNameWithWhitespace);
+        Mock.Get(resolver).Setup(x => x.GetAssembly(AssemblyNameWithWhitespace)).Returns(descriptor);
+
+        descriptor = CreateAssemblyDescriptor(AssemblyNameWithNonAscii);
+        Mock.Get(resolver).Setup(x => x.GetAssembly(AssemblyNameWithNonAscii)).Returns(descriptor);
+
+        AssetLoader.SetAssemblyDescriptorResolver(resolver);
+    }
+
+    [Fact]
+    public void AssemblyName_With_Whitespace_Should_Load_Resm()
+    {
+        var uri = new Uri($"resm:Avalonia.Base.UnitTests.Assets.something?assembly={AssemblyNameWithWhitespace}");
+        var loader = new AssetLoader();
+
+        var assemblyActual = loader.GetAssembly(uri, null);
+
+        Assert.Equal(AssemblyNameWithWhitespace, assemblyActual?.FullName);
+    }
+
+    [Fact(Skip = "RegisterResUriParsers breaks this test. See https://github.com/AvaloniaUI/Avalonia/issues/2555.")]
+    public void AssemblyName_With_Non_ASCII_Should_Load_Avares()
+    {
+        var uri = new Uri($"avares://{AssemblyNameWithNonAscii}/Assets/something");
+        var loader = new AssetLoader();
+
+        var assemblyActual = loader.GetAssembly(uri, null);
+
+        Assert.Equal(AssemblyNameWithNonAscii, assemblyActual?.FullName);
+    }
+
+    private static IAssemblyDescriptor CreateAssemblyDescriptor(string assemblyName)
+    {
+        var assembly = Mock.Of<MockAssembly>();
+        Mock.Get(assembly).Setup(x => x.GetName()).Returns(new AssemblyName(assemblyName));
+        Mock.Get(assembly).Setup(x => x.FullName).Returns(assemblyName);
+
+        var descriptor = Mock.Of<IAssemblyDescriptor>();
+        Mock.Get(descriptor).Setup(x => x.Assembly).Returns(assembly);
+        return descriptor;
+    }
+
+    public void Dispose()
+    {
+        AssetLoader.SetAssemblyDescriptorResolver(new AssemblyDescriptorResolver());
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
index 9628d16a6c..602e5e4496 100644
--- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
+++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
@@ -12,6 +12,11 @@
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
   <Import Project="..\..\build\SharedVersion.props" />
+  <ItemGroup>
+    <EmbeddedResource Include="..\Avalonia.RenderTests\**\*.ttf" />
+    <EmbeddedResource Remove="..\Avalonia.RenderTests\Assets\NotoColorEmoji.ttf" />
+    <EmbeddedResource Include="Media\TextFormatting\BreakPairTable.txt" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml.Loader\Avalonia.Markup.Xaml.Loader.csproj" />
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 7c4c5c96a5..6b4a6f89df 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -11,6 +11,7 @@ using Avalonia.Logging;
 using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
+using Avalonia.Utilities;
 using Microsoft.Reactive.Testing;
 using Moq;
 using Xunit;
@@ -785,7 +786,7 @@ namespace Avalonia.Base.UnitTests
 
             target.Bind(Class1.DoubleValueProperty, new Binding(nameof(source.Value), BindingMode.TwoWay) { Source = source });
 
-            Assert.False(source.SetterCalled);
+            Assert.False(source.ValueSetterCalled);
         }
 
         [Fact]
@@ -796,7 +797,7 @@ namespace Avalonia.Base.UnitTests
 
             target.Bind(Class1.DoubleValueProperty, new Binding("[0]", BindingMode.TwoWay) { Source = source });
 
-            Assert.False(source.SetterCalled);
+            Assert.False(source.ValueSetterCalled);
         }
 
         [Fact]
@@ -829,6 +830,59 @@ namespace Avalonia.Base.UnitTests
             subscription.Dispose();
         }
 
+        [Fact]
+        public void TwoWay_Binding_Should_Not_Call_Setter_On_Creation_With_Value()
+        {
+            var target = new Class1();
+            var source = new TestTwoWayBindingViewModel() { Value = 1 };
+            source.ResetSetterCalled();
+
+            target.Bind(Class1.DoubleValueProperty, new Binding(nameof(source.Value), BindingMode.TwoWay) { Source = source });
+
+            Assert.False(source.ValueSetterCalled);
+        }
+
+        [Fact]
+        public void TwoWay_Binding_Should_Not_Call_Setter_On_Creation_Indexer_With_Value()
+        {
+            var target = new Class1();
+            var source = new TestTwoWayBindingViewModel() { [0] = 1 };
+            source.ResetSetterCalled();
+
+            target.Bind(Class1.DoubleValueProperty, new Binding("[0]", BindingMode.TwoWay) { Source = source });
+
+            Assert.False(source.ValueSetterCalled);
+        }
+
+
+        [Fact]
+        public void Disposing_a_TwoWay_Binding_Should_Set_Default_Value_On_Binding_Target_But_Not_On_Source()
+        {
+            var target = new Class3();
+
+            // Create a source class which has a Value set to -1 and a Minimum set to -2
+            var source = new TestTwoWayBindingViewModel() { Value = -1, Minimum = -2 };
+
+            // Reset the setter counter
+            source.ResetSetterCalled();
+
+            // 1. bind the minimum
+            var disposable_1 = target.Bind(Class3.MinimumProperty, new Binding("Minimum", BindingMode.TwoWay) { Source = source });
+            // 2. Bind the value
+            var disposable_2 = target.Bind(Class3.ValueProperty, new Binding("Value", BindingMode.TwoWay) { Source = source });
+
+            // Dispose the minimum binding
+            disposable_1.Dispose();
+            // Dispose the value binding
+            disposable_2.Dispose();
+
+
+            // The value setter should be called here as we have disposed minimum fist and the default value of minimum is 0, so this should be changed.
+            Assert.True(source.ValueSetterCalled);
+            // The minimum value should not be changed in the source.
+            Assert.False(source.MinimumSetterCalled);
+        }
+
         /// <summary>
         /// Returns an observable that returns a single value but does not complete.
         /// </summary>
@@ -864,6 +918,56 @@ namespace Avalonia.Base.UnitTests
                 AvaloniaProperty.Register<Class2, string>("Bar", "bardefault");
         }
 
+        private class Class3 : AvaloniaObject 
+        {
+            static Class3()
+            {
+                MinimumProperty.Changed.Subscribe(x => OnMinimumChanged(x));
+            }
+
+            private static void OnMinimumChanged(AvaloniaPropertyChangedEventArgs<double> e)
+            {
+                if (e.Sender is Class3 s)
+                {
+                    s.SetValue(ValueProperty, MathUtilities.Clamp(s.Value, e.NewValue.Value, double.PositiveInfinity));
+                }
+            }
+
+            /// <summary>
+            /// Defines the <see cref="Value"/> property.
+            /// </summary>
+            public static readonly StyledProperty<double> ValueProperty =
+                AvaloniaProperty.Register<Class3, double>(nameof(Value), 0);
+
+            /// <summary>
+            /// Gets or sets the Value property
+            /// </summary>
+            public double Value
+            {
+                get { return GetValue(ValueProperty); }
+                set { SetValue(ValueProperty, value); }
+            }
+
+
+            /// <summary>
+            /// Defines the <see cref="Minimum"/> property.
+            /// </summary>
+            public static readonly StyledProperty<double> MinimumProperty =
+                AvaloniaProperty.Register<Class3, double>(nameof(Minimum), 0);
+
+            /// <summary>
+            /// Gets or sets the minimum property
+            /// </summary>
+            public double Minimum
+            {
+                get { return GetValue(MinimumProperty); }
+                set { SetValue(MinimumProperty, value); }
+            }
+
+
+        }
+
+
         private class TestOneTimeBinding : IBinding
         {
             private IObservable<object> _source;
@@ -928,7 +1032,18 @@ namespace Avalonia.Base.UnitTests
                 set
                 {
                     _value = value;
-                    SetterCalled = true;
+                    ValueSetterCalled = true;
+                }
+            }
+
+            private double _minimum;
+            public double Minimum
+            {
+                get => _minimum;
+                set
+                {
+                    _minimum = value;
+                    MinimumSetterCalled = true;
                 }
             }
 
@@ -938,11 +1053,18 @@ namespace Avalonia.Base.UnitTests
                 set
                 {
                     _value = value;
-                    SetterCalled = true;
+                    ValueSetterCalled = true;
                 }
             }
 
-            public bool SetterCalled { get; private set; }
+            public bool ValueSetterCalled { get; private set; }
+            public bool MinimumSetterCalled { get; private set; }
+
+            public void ResetSetterCalled()
+            {
+                ValueSetterCalled = false;
+                MinimumSetterCalled = false;
+            }
         }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs
index 65f03b3eca..d48e58136a 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs
@@ -52,14 +52,14 @@ namespace Avalonia.Base.UnitTests
             source.OnNext(BindingValue<int>.DataValidationError(new Exception()));
             source.OnNext(7);
 
-            var result = target.Notifications.Cast<BindingValue<int>>().ToList();
+            var result = target.Notifications;
             Assert.Equal(4, result.Count);
-            Assert.Equal(BindingValueType.Value, result[0].Type);
-            Assert.Equal(6, result[0].Value);
-            Assert.Equal(BindingValueType.BindingError, result[1].Type);
-            Assert.Equal(BindingValueType.DataValidationError, result[2].Type);
-            Assert.Equal(BindingValueType.Value, result[3].Type);
-            Assert.Equal(7, result[3].Value);
+            Assert.Equal(BindingValueType.Value, result[0].type);
+            Assert.Equal(6, result[0].value);
+            Assert.Equal(BindingValueType.BindingError, result[1].type);
+            Assert.Equal(BindingValueType.DataValidationError, result[2].type);
+            Assert.Equal(BindingValueType.Value, result[3].type);
+            Assert.Equal(7, result[3].value);
         }
 
         [Fact]
@@ -72,8 +72,7 @@ namespace Avalonia.Base.UnitTests
             target.Bind(Class1.NonValidatedDirectProperty, source);
             source.OnNext(1);
 
-            var result = target.Notifications.Cast<BindingValue<int>>().ToList();
-            Assert.Equal(1, result.Count);
+            Assert.Equal(1, target.Notifications.Count);
         }
 
         [Fact]
@@ -154,13 +153,14 @@ namespace Avalonia.Base.UnitTests
                 set { SetAndRaise(ValidatedDirectStringProperty, ref _directString, value); }
             }
 
-            public IList<object> Notifications { get; } = new List<object>();
+            public List<(BindingValueType type, object value)> Notifications { get; } = new();
 
-            protected override void UpdateDataValidation<T>(
-                AvaloniaProperty<T> property,
-                BindingValue<T> value)
+            protected override void UpdateDataValidation(
+                AvaloniaProperty property,
+                BindingValueType state,
+                Exception error)
             {
-                Notifications.Add(value);
+                Notifications.Add((state, GetValue(property)));
             }
         }
 
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_OnPropertyChanged.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_OnPropertyChanged.cs
index e8fc3f9f40..7f4dcace71 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_OnPropertyChanged.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_OnPropertyChanged.cs
@@ -109,25 +109,26 @@ namespace Avalonia.Base.UnitTests
             public List<AvaloniaPropertyChangedEventArgs> Changes { get; }
             public List<AvaloniaPropertyChangedEventArgs> CoreChanges { get; }
 
-            protected override void OnPropertyChangedCore<T>(AvaloniaPropertyChangedEventArgs<T> change)
+            protected override void OnPropertyChangedCore(AvaloniaPropertyChangedEventArgs change)
             {
                 CoreChanges.Add(Clone(change));
                 base.OnPropertyChangedCore(change);
             }
 
-            protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+            protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
             {
                 Changes.Add(Clone(change));
                 base.OnPropertyChanged(change);
             }
 
-            private static AvaloniaPropertyChangedEventArgs<T> Clone<T>(AvaloniaPropertyChangedEventArgs<T> change)
+            private static AvaloniaPropertyChangedEventArgs Clone(AvaloniaPropertyChangedEventArgs change)
             {
-                var result = new AvaloniaPropertyChangedEventArgs<T>(
+                var e = (AvaloniaPropertyChangedEventArgs<string>)change;
+                var result = new AvaloniaPropertyChangedEventArgs<string>(
                     change.Sender,
-                    change.Property,
-                    change.OldValue,
-                    change.NewValue,
+                    e.Property,
+                    e.OldValue,
+                    e.NewValue,
                     change.Priority);
 
                 if (!change.IsEffectiveValueChange)
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
index 7f4db23268..0d62f20f7e 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using System.Reactive.Linq;
 using Xunit;
@@ -56,7 +57,7 @@ namespace Avalonia.Base.UnitTests
                 .Select(x => x.Name)
                 .ToArray();
 
-            Assert.Equal(new[] { "Attached" }, names);
+            Assert.Contains("Attached", names);
         }
 
         [Fact]
@@ -66,7 +67,7 @@ namespace Avalonia.Base.UnitTests
                 .Select(x => x.Name)
                 .ToArray();
 
-            Assert.Equal(new[] { "Attached" }, names);
+            Assert.Contains("Attached", names);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
index 1adb6988a2..f3f39b465b 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Data;
+using Avalonia.Styling;
 using Avalonia.Utilities;
 using Xunit;
 
@@ -146,46 +147,46 @@ namespace Avalonia.Base.UnitTests
                 OverrideMetadata(typeof(T), metadata);
             }
 
-            public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> vistor, ref TData data)
-            {
-                throw new NotImplementedException();
-            }
-
             internal override IDisposable RouteBind(
-                IAvaloniaObject o,
+                AvaloniaObject o,
                 IObservable<BindingValue<object>> source,
                 BindingPriority priority)
             {
                 throw new NotImplementedException();
             }
 
-            internal override void RouteClearValue(IAvaloniaObject o)
+            internal override void RouteClearValue(AvaloniaObject o)
             {
                 throw new NotImplementedException();
             }
 
-            internal override object RouteGetValue(IAvaloniaObject o)
+            internal override object RouteGetValue(AvaloniaObject o)
             {
                 throw new NotImplementedException();
             }
 
-            internal override object RouteGetBaseValue(IAvaloniaObject o, BindingPriority maxPriority)
+            internal override object RouteGetBaseValue(AvaloniaObject o, BindingPriority maxPriority)
             {
                 throw new NotImplementedException();
             }
 
-            internal override void RouteInheritanceParentChanged(AvaloniaObject o, IAvaloniaObject oldParent)
+            internal override void RouteInheritanceParentChanged(AvaloniaObject o, AvaloniaObject oldParent)
             {
                 throw new NotImplementedException();
             }
 
             internal override IDisposable RouteSetValue(
-                IAvaloniaObject o,
+                AvaloniaObject o,
                 object value,
                 BindingPriority priority)
             {
                 throw new NotImplementedException();
             }
+
+            internal override ISetterInstance CreateSetterInstance(IStyleable target, object value)
+            {
+                throw new NotImplementedException();
+            }
         }
 
         private class Class1 : AvaloniaObject
diff --git a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs
index f5ae4cc1e0..b59f272b0c 100644
--- a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs
@@ -146,6 +146,23 @@ namespace Avalonia.Base.UnitTests.Collections
             Assert.True(raised);
         }
 
+        [Fact]
+        public void AddRange_IEnumerable_Should_Raise_Count_PropertyChanged()
+        {
+            var target = new AvaloniaList<int>(new[] { 1, 2, 3, 4, 5 });
+            var raised = false;
+
+            target.PropertyChanged += (s, e) => {
+                Assert.Equal(e.PropertyName, nameof(target.Count));
+                Assert.Equal(target.Count, 7);
+                raised = true;
+            };
+
+            target.AddRange(Enumerable.Range(6, 2));
+
+            Assert.True(raised);
+        }
+
         [Fact]
         public void AddRange_Items_Should_Raise_Correct_CollectionChanged()
         {
diff --git a/tests/Avalonia.Base.UnitTests/CornerRadiusTests.cs b/tests/Avalonia.Base.UnitTests/CornerRadiusTests.cs
new file mode 100644
index 0000000000..edfbd5acd9
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/CornerRadiusTests.cs
@@ -0,0 +1,39 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class CornerRadiusTests
+    {
+        [Fact]
+        public void Parse_Parses_Single_Uniform_Radius()
+        {
+            var result = CornerRadius.Parse("3.4");
+
+            Assert.Equal(new CornerRadius(3.4), result);
+        }
+
+        [Fact]
+        public void Parse_Parses_Top_Bottom()
+        {
+            var result = CornerRadius.Parse("1.1,2.2");
+
+            Assert.Equal(new CornerRadius(1.1, 2.2), result);
+        }
+
+        [Fact]
+        public void Parse_Parses_TopLeft_TopRight_BottomRight_BottomLeft()
+        {
+            var result = CornerRadius.Parse("1.1,2.2,3.3,4.4");
+
+            Assert.Equal(new CornerRadius(1.1, 2.2, 3.3, 4.4), result);
+        }
+
+        [Fact]
+        public void Parse_Accepts_Spaces()
+        {
+            var result = CornerRadius.Parse("1.1 2.2 3.3 4.4");
+
+            Assert.Equal(new CornerRadius(1.1, 2.2, 3.3, 4.4), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs
index 1d9524a191..574ecd2ca4 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs
@@ -7,7 +7,7 @@ using Avalonia.Data.Core.Plugins;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data.Plugins
+namespace Avalonia.Base.UnitTests.Data.Core.Plugins
 {
     public class DataAnnotationsValidationPluginTests : IClassFixture<InvariantCultureFixture>
     {
diff --git a/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs b/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
index f522acf9ce..7cf84d767a 100644
--- a/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
@@ -7,7 +7,7 @@ using Avalonia.Data.Converters;
 using Avalonia.Layout;
 using Xunit;
 
-namespace Avalonia.Base.UnitTests.Data.Converters
+namespace Avalonia.Base.UnitTests.Data
 {
     public class DefaultValueConverterTests
     {
diff --git a/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs b/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs
new file mode 100644
index 0000000000..57ec00cb58
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs
@@ -0,0 +1,205 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class GesturesTests
+    {
+        private MouseTestHelper _mouse = new MouseTestHelper();
+        
+        [Fact]
+        public void Tapped_Should_Follow_Pointer_Pressed_Released()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var result = new List<string>();
+
+            AddHandlers(decorator, border, result, false);
+
+            _mouse.Click(border);
+
+            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt" }, result);
+        }
+
+        [Fact]
+        public void Tapped_Should_Be_Raised_Even_When_Pressed_Released_Handled()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var result = new List<string>();
+
+            AddHandlers(decorator, border, result, true);
+
+            _mouse.Click(border);
+
+            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt" }, result);
+        }
+
+        [Fact]
+        public void Tapped_Should_Not_Be_Raised_For_Middle_Button()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var raised = false;
+
+            decorator.AddHandler(Gestures.TappedEvent, (s, e) => raised = true);
+
+            _mouse.Click(border, MouseButton.Middle);
+
+            Assert.False(raised);
+        }
+
+        [Fact]
+        public void Tapped_Should_Not_Be_Raised_For_Right_Button()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var raised = false;
+
+            decorator.AddHandler(Gestures.TappedEvent, (s, e) => raised = true);
+
+            _mouse.Click(border, MouseButton.Right);
+
+            Assert.False(raised);
+        }
+
+        [Fact]
+        public void RightTapped_Should_Be_Raised_For_Right_Button()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var raised = false;
+
+            decorator.AddHandler(Gestures.RightTappedEvent, (s, e) => raised = true);
+
+            _mouse.Click(border, MouseButton.Right);
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void DoubleTapped_Should_Follow_Pointer_Pressed_Released_Pressed()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var result = new List<string>();
+
+            AddHandlers(decorator, border, result, false);
+
+            _mouse.Click(border);
+            _mouse.Down(border, clickCount: 2);
+
+            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt", "bp", "dp", "bdt", "ddt" }, result);
+        }
+
+        [Fact]
+        public void DoubleTapped_Should_Be_Raised_Even_When_Pressed_Released_Handled()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var result = new List<string>();
+
+            AddHandlers(decorator, border, result, true);
+
+            _mouse.Click(border);
+            _mouse.Down(border, clickCount: 2);
+
+            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt", "bp", "dp", "bdt", "ddt" }, result);
+        }
+
+        [Fact]
+        public void DoubleTapped_Should_Not_Be_Raised_For_Middle_Button()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var raised = false;
+
+            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => raised = true);
+
+            _mouse.Click(border, MouseButton.Middle);
+            _mouse.Down(border, MouseButton.Middle, clickCount: 2);
+
+            Assert.False(raised);
+        }
+
+        [Fact]
+        public void DoubleTapped_Should_Not_Be_Raised_For_Right_Button()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var raised = false;
+
+            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => raised = true);
+
+            _mouse.Click(border, MouseButton.Right);
+            _mouse.Down(border, MouseButton.Right, clickCount: 2);
+
+            Assert.False(raised);
+        }
+
+        private void AddHandlers(
+            Decorator decorator,
+            Border border,
+            IList<string> result,
+            bool markHandled)
+        {
+            decorator.AddHandler(Border.PointerPressedEvent, (s, e) =>
+            {
+                result.Add("dp");
+
+                if (markHandled)
+                {
+                    e.Handled = true;
+                }
+            });
+
+            decorator.AddHandler(Border.PointerReleasedEvent, (s, e) =>
+            {
+                result.Add("dr");
+
+                if (markHandled)
+                {
+                    e.Handled = true;
+                }
+            });
+
+            border.AddHandler(Border.PointerPressedEvent, (s, e) => result.Add("bp"));
+            border.AddHandler(Border.PointerReleasedEvent, (s, e) => result.Add("br"));
+
+            decorator.AddHandler(Gestures.TappedEvent, (s, e) => result.Add("dt"));
+            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => result.Add("ddt"));
+            border.AddHandler(Gestures.TappedEvent, (s, e) => result.Add("bt"));
+            border.AddHandler(Gestures.DoubleTappedEvent, (s, e) => result.Add("bdt"));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/InputElement_Enabled.cs b/tests/Avalonia.Base.UnitTests/Input/InputElement_Enabled.cs
new file mode 100644
index 0000000000..1c001d4b3a
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/InputElement_Enabled.cs
@@ -0,0 +1,98 @@
+using Avalonia.Controls;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class InputElement_Enabled
+    {
+        [Fact]
+        public void IsEffectivelyEnabled_Follows_IsEnabled()
+        {
+            var target = new Decorator();
+
+            Assert.True(target.IsEnabled);
+            Assert.True(target.IsEffectivelyEnabled);
+
+            target.IsEnabled = false;
+
+            Assert.False(target.IsEnabled);
+            Assert.False(target.IsEffectivelyEnabled);
+        }
+
+        [Fact]
+        public void IsEffectivelyEnabled_Follows_Ancestor_IsEnabled()
+        {
+            Decorator child;
+            Decorator grandchild;
+            var target = new Decorator
+            {
+                Child = child = new Decorator
+                {
+                    Child = grandchild = new Decorator(),
+                }
+            };
+
+            Assert.True(target.IsEnabled);
+            Assert.True(target.IsEffectivelyEnabled);
+            Assert.True(child.IsEnabled);
+            Assert.True(child.IsEffectivelyEnabled);
+            Assert.True(grandchild.IsEnabled);
+            Assert.True(grandchild.IsEffectivelyEnabled);
+
+            target.IsEnabled = false;
+
+            Assert.False(target.IsEnabled);
+            Assert.False(target.IsEffectivelyEnabled);
+            Assert.True(child.IsEnabled);
+            Assert.False(child.IsEffectivelyEnabled);
+            Assert.True(grandchild.IsEnabled);
+            Assert.False(grandchild.IsEffectivelyEnabled);
+        }
+
+        [Fact]
+        public void Disabled_Pseudoclass_Follows_IsEffectivelyEnabled()
+        {
+            Decorator child;
+            var target = new Decorator
+            {
+                Child = child = new Decorator()
+            };
+
+            Assert.DoesNotContain(":disabled", child.Classes);
+
+            target.IsEnabled = false;
+
+            Assert.Contains(":disabled", child.Classes);
+        }
+
+        [Fact]
+        public void IsEffectivelyEnabled_Respects_IsEnabledCore()
+        {
+            Decorator child;
+            var target = new TestControl
+            {
+                Child = child = new Decorator()
+            };
+
+            target.ShouldEnable = false;
+
+            Assert.True(target.IsEnabled);
+            Assert.False(target.IsEffectivelyEnabled);
+            Assert.True(child.IsEnabled);
+            Assert.False(child.IsEffectivelyEnabled);
+        }
+
+        private class TestControl : Decorator
+        {
+            private bool _shouldEnable;
+
+            public bool ShouldEnable
+            {
+                get => _shouldEnable;
+                set { _shouldEnable = value; UpdateIsEffectivelyEnabled(); }
+            }
+
+            protected override bool IsEnabledCore => IsEnabled && _shouldEnable; 
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs b/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs
new file mode 100644
index 0000000000..2d8ee62ef2
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs
@@ -0,0 +1,342 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class InputElement_Focus
+    {
+        [Fact]
+        public void Focus_Should_Set_FocusManager_Current()
+        {
+            Button target;
+
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var root = new TestRoot
+                {
+                    Child = target = new Button()
+                };
+
+                target.Focus();
+
+                Assert.Same(target, FocusManager.Instance.Current);
+            }
+        }
+
+        [Fact]
+        public void Focus_Should_Be_Cleared_When_Control_Is_Removed_From_VisualTree()
+        {
+            Button target;
+
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var root = new TestRoot
+                {
+                    Child = target = new Button()
+                };
+
+                target.Focus();
+                root.Child = null;
+
+                Assert.Null(FocusManager.Instance.Current);
+            }
+        }
+
+        [Fact]
+        public void Focus_Pseudoclass_Should_Be_Applied_On_Focus()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Decorator();
+                var target2 = new Decorator();
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            target1,
+                            target2
+                        }
+                    }
+                };
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+
+
+                FocusManager.Instance?.Focus(target1);
+                Assert.True(target1.IsFocused);
+                Assert.True(target1.Classes.Contains(":focus"));
+                Assert.False(target2.IsFocused);
+                Assert.False(target2.Classes.Contains(":focus"));
+
+                FocusManager.Instance?.Focus(target2, NavigationMethod.Tab);
+                Assert.False(target1.IsFocused);
+                Assert.False(target1.Classes.Contains(":focus"));
+                Assert.True(target2.IsFocused);
+                Assert.True(target2.Classes.Contains(":focus"));
+            }
+        }
+
+        [Fact]
+        public void Control_FocusVsisible_Pseudoclass_Should_Be_Applied_On_Tab_And_DirectionalFocus()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Decorator();
+                var target2 = new Decorator();
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            target1,
+                            target2
+                        }
+                    }
+                };
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+
+                FocusManager.Instance?.Focus(target1);
+                Assert.True(target1.IsFocused);
+                Assert.False(target1.Classes.Contains(":focus-visible"));
+                Assert.False(target2.IsFocused);
+                Assert.False(target2.Classes.Contains(":focus-visible"));
+
+                FocusManager.Instance?.Focus(target2, NavigationMethod.Tab);
+                Assert.False(target1.IsFocused);
+                Assert.False(target1.Classes.Contains(":focus-visible"));
+                Assert.True(target2.IsFocused);
+                Assert.True(target2.Classes.Contains(":focus-visible"));
+
+                FocusManager.Instance?.Focus(target1, NavigationMethod.Directional);
+                Assert.True(target1.IsFocused);
+                Assert.True(target1.Classes.Contains(":focus-visible"));
+                Assert.False(target2.IsFocused);
+                Assert.False(target2.Classes.Contains(":focus-visible"));
+            }
+        }
+        
+        [Fact]
+        public void Control_FocusWithin_PseudoClass_Should_Be_Applied()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Decorator();
+                var target2 = new Decorator();
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            target1,
+                            target2
+                        }
+                    }
+                };
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+
+                FocusManager.Instance?.Focus(target1);
+                Assert.True(target1.IsFocused);
+                Assert.True(target1.Classes.Contains(":focus-within"));
+                Assert.True(target1.IsKeyboardFocusWithin);
+                Assert.True(root.Child.Classes.Contains(":focus-within"));
+                Assert.True(root.Child.IsKeyboardFocusWithin);
+                Assert.True(root.Classes.Contains(":focus-within"));
+                Assert.True(root.IsKeyboardFocusWithin);
+            }
+        }
+        
+        [Fact]
+        public void Control_FocusWithin_PseudoClass_Should_Be_Applied_and_Removed()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Decorator();
+                var target2 = new Decorator();
+                var panel1 = new Panel { Children = { target1 } };
+                var panel2 = new Panel { Children = { target2 } };
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            panel1,
+                            panel2
+                        }
+                    }
+                };
+                
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+
+                FocusManager.Instance?.Focus(target1);
+                Assert.True(target1.IsFocused);
+                Assert.True(target1.Classes.Contains(":focus-within"));
+                Assert.True(target1.IsKeyboardFocusWithin);
+                Assert.True(panel1.Classes.Contains(":focus-within"));
+                Assert.True(panel1.IsKeyboardFocusWithin);
+                Assert.True(root.Child.Classes.Contains(":focus-within"));
+                Assert.True(root.Child.IsKeyboardFocusWithin);
+                Assert.True(root.Classes.Contains(":focus-within"));
+                Assert.True(root.IsKeyboardFocusWithin);
+                
+                FocusManager.Instance?.Focus(target2);
+                
+                Assert.False(target1.IsFocused);
+                Assert.False(target1.Classes.Contains(":focus-within"));
+                Assert.False(target1.IsKeyboardFocusWithin);
+                Assert.False(panel1.Classes.Contains(":focus-within"));
+                Assert.False(panel1.IsKeyboardFocusWithin);
+                Assert.True(root.Child.Classes.Contains(":focus-within"));
+                Assert.True(root.Child.IsKeyboardFocusWithin);
+                Assert.True(root.Classes.Contains(":focus-within"));
+                Assert.True(root.IsKeyboardFocusWithin);
+                
+                Assert.True(target2.IsFocused);
+                Assert.True(target2.Classes.Contains(":focus-within"));
+                Assert.True(target2.IsKeyboardFocusWithin);
+                Assert.True(panel2.Classes.Contains(":focus-within"));
+                Assert.True(panel2.IsKeyboardFocusWithin);
+            }
+        }
+        
+        [Fact]
+        public void Control_FocusWithin_Pseudoclass_Should_Be_Removed_When_Removed_From_Tree()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Decorator();
+                var target2 = new Decorator();
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            target1,
+                            target2
+                        }
+                    }
+                };
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+
+                FocusManager.Instance?.Focus(target1);
+                Assert.True(target1.IsFocused);
+                Assert.True(target1.Classes.Contains(":focus-within"));
+                Assert.True(target1.IsKeyboardFocusWithin);
+                Assert.True(root.Child.Classes.Contains(":focus-within"));
+                Assert.True(root.Child.IsKeyboardFocusWithin);
+                Assert.True(root.Classes.Contains(":focus-within"));
+                Assert.True(root.IsKeyboardFocusWithin);
+
+                Assert.Equal(KeyboardDevice.Instance.FocusedElement, target1);
+                
+                root.Child = null;
+                
+                Assert.Null(KeyboardDevice.Instance.FocusedElement);
+                
+                Assert.False(target1.IsFocused);
+                Assert.False(target1.Classes.Contains(":focus-within"));
+                Assert.False(target1.IsKeyboardFocusWithin);
+                Assert.False(root.Classes.Contains(":focus-within"));
+                Assert.False(root.IsKeyboardFocusWithin);
+            }
+        }
+        
+        [Fact]
+        public void Control_FocusWithin_Pseudoclass_Should_Be_Removed_Focus_Moves_To_Different_Root()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Decorator();
+                var target2 = new Decorator();
+                
+                var root1 = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            target1,
+                        }
+                    }
+                };
+                
+                var root2 = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            target2,
+                        }
+                    }
+                };
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+
+                FocusManager.Instance?.Focus(target1);
+                Assert.True(target1.IsFocused);
+                Assert.True(target1.Classes.Contains(":focus-within"));
+                Assert.True(target1.IsKeyboardFocusWithin);
+                Assert.True(root1.Child.Classes.Contains(":focus-within"));
+                Assert.True(root1.Child.IsKeyboardFocusWithin);
+                Assert.True(root1.Classes.Contains(":focus-within"));
+                Assert.True(root1.IsKeyboardFocusWithin);
+
+                Assert.Equal(KeyboardDevice.Instance.FocusedElement, target1);
+                
+                FocusManager.Instance?.Focus(target2);
+                
+                Assert.False(target1.IsFocused);
+                Assert.False(target1.Classes.Contains(":focus-within"));
+                Assert.False(target1.IsKeyboardFocusWithin);
+                Assert.False(root1.Child.Classes.Contains(":focus-within"));
+                Assert.False(root1.Child.IsKeyboardFocusWithin);
+                Assert.False(root1.Classes.Contains(":focus-within"));
+                Assert.False(root1.IsKeyboardFocusWithin);
+                
+                Assert.True(target2.IsFocused);
+                Assert.True(target2.Classes.Contains(":focus-within"));
+                Assert.True(target2.IsKeyboardFocusWithin);
+                Assert.True(root2.Child.Classes.Contains(":focus-within"));
+                Assert.True(root2.Child.IsKeyboardFocusWithin);
+                Assert.True(root2.Classes.Contains(":focus-within"));
+                Assert.True(root2.IsKeyboardFocusWithin);
+            }
+        }
+
+        [Fact]
+        public void Can_Clear_Focus()
+        {
+            Button target;
+
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var root = new TestRoot
+                {
+                    Child = target = new Button()
+                };
+
+                target.Focus();
+                FocusManager.Instance.Focus(null);
+
+                Assert.Null(FocusManager.Instance.Current);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/KeyGestureTests.cs b/tests/Avalonia.Base.UnitTests/Input/KeyGestureTests.cs
new file mode 100644
index 0000000000..33cd94ec98
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/KeyGestureTests.cs
@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using Avalonia.Input;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class KeyGestureTests
+    {
+        public static readonly IEnumerable<object[]> ParseData = new object[][]
+        {
+            new object[]{"Ctrl+A", new KeyGesture(Key.A, KeyModifiers.Control)},
+            new object[]{"  \tShift\t+Alt +B", new KeyGesture(Key.B, KeyModifiers.Shift | KeyModifiers.Alt) },
+            new object[]{"Control++", new KeyGesture(Key.OemPlus, KeyModifiers.Control) },
+            new object[]{ "Shift+⌘+A", new KeyGesture(Key.A, KeyModifiers.Meta | KeyModifiers.Shift) },
+            new object[]{ "Shift+Cmd+A", new KeyGesture(Key.A, KeyModifiers.Meta | KeyModifiers.Shift) },
+        };
+
+        public static readonly IEnumerable<object[]> ToStringData = new object[][]
+        {
+            new object[]{new KeyGesture(Key.A), "A"},
+            new object[]{new KeyGesture(Key.A, KeyModifiers.Control), "Ctrl+A"},
+            new object[]{new KeyGesture(Key.A, KeyModifiers.Control | KeyModifiers.Shift), "Ctrl+Shift+A"},
+            new object[]{new KeyGesture(Key.A, KeyModifiers.Alt | KeyModifiers.Shift), "Shift+Alt+A"},
+            new object[]{new KeyGesture(Key.A, KeyModifiers.Control | KeyModifiers.Alt | KeyModifiers.Shift), "Ctrl+Shift+Alt+A"},
+            new object[]{new KeyGesture(Key.A, KeyModifiers.Meta | KeyModifiers.Shift), "Shift+Cmd+A"},
+        };
+
+        [Theory]
+        [MemberData(nameof(ParseData))]
+        public void Key_Gesture_Is_Able_To_Parse_Sample_Data(string text, KeyGesture gesture)
+        {
+            Assert.Equal(gesture, KeyGesture.Parse(text));
+        }
+
+        [Theory]
+        [InlineData(Key.OemMinus, Key.Subtract)]
+        [InlineData(Key.OemPlus, Key.Add)]
+        [InlineData(Key.OemPeriod, Key.Decimal)]
+        public void Key_Gesture_Matches_NumPad_To_Regular_Digit(Key gestureKey, Key pressedKey)
+        {
+            var keyGesture = new KeyGesture(gestureKey);
+
+            Assert.True(keyGesture.Matches(new KeyEventArgs
+            {
+                Key = pressedKey
+            }));
+        }
+
+        [Theory]
+        [MemberData(nameof(ToStringData))]
+        public void ToString_Produces_Correct_Results(KeyGesture gesture, string expected)
+        {
+            Assert.Equal(expected, gesture.ToString());
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/KeyboardDeviceTests.cs b/tests/Avalonia.Base.UnitTests/Input/KeyboardDeviceTests.cs
new file mode 100644
index 0000000000..07bfa0d2e6
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/KeyboardDeviceTests.cs
@@ -0,0 +1,159 @@
+using System;
+using System.Windows.Input;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class KeyboardDeviceTests
+    {
+        [Fact]
+        public void Keypresses_Should_Be_Sent_To_Root_If_No_Focused_Element()
+        {
+            var target = new KeyboardDevice();
+            var root = new Mock<IInputRoot>();
+
+            target.ProcessRawEvent(
+                new RawKeyEventArgs(
+                    target,
+                    0,
+                    root.Object,
+                    RawKeyEventType.KeyDown,
+                    Key.A,
+                    RawInputModifiers.None));
+
+            root.Verify(x => x.RaiseEvent(It.IsAny<KeyEventArgs>()));
+        }
+
+        [Fact]
+        public void Keypresses_Should_Be_Sent_To_Focused_Element()
+        {
+            var target = new KeyboardDevice();
+            var focused = new Mock<IInputElement>();
+            var root = Mock.Of<IInputRoot>();
+
+            target.SetFocusedElement(
+                focused.Object,
+                NavigationMethod.Unspecified,
+                KeyModifiers.None);
+
+            target.ProcessRawEvent(
+                new RawKeyEventArgs(
+                    target,
+                    0,
+                    root,
+                    RawKeyEventType.KeyDown,
+                    Key.A,
+                    RawInputModifiers.None));
+
+            focused.Verify(x => x.RaiseEvent(It.IsAny<KeyEventArgs>()));
+        }
+
+        [Fact]
+        public void TextInput_Should_Be_Sent_To_Root_If_No_Focused_Element()
+        {
+            var target = new KeyboardDevice();
+            var root = new Mock<IInputRoot>();
+
+            target.ProcessRawEvent(
+                new RawTextInputEventArgs(
+                    target,
+                    0,
+                    root.Object,
+                    "Foo"));
+
+            root.Verify(x => x.RaiseEvent(It.IsAny<TextInputEventArgs>()));
+        }
+
+        [Fact]
+        public void TextInput_Should_Be_Sent_To_Focused_Element()
+        {
+            var target = new KeyboardDevice();
+            var focused = new Mock<IInputElement>();
+            var root = Mock.Of<IInputRoot>();
+
+            target.SetFocusedElement(
+                focused.Object,
+                NavigationMethod.Unspecified,
+                KeyModifiers.None);
+
+            target.ProcessRawEvent(
+                new RawTextInputEventArgs(
+                    target,
+                    0,
+                    root,
+                    "Foo"));
+
+            focused.Verify(x => x.RaiseEvent(It.IsAny<TextInputEventArgs>()));
+        }
+
+        [Fact]
+        public void Can_Change_KeyBindings_In_Keybinding_Event_Handler()
+        {
+            var target = new KeyboardDevice();
+            var button = new Button();
+            var root = new TestRoot(button);
+            var raised = 0;
+
+            button.KeyBindings.Add(new KeyBinding
+            {
+                Gesture = new KeyGesture(Key.O, KeyModifiers.Control),
+                Command = new DelegateCommand(() =>
+                {
+                    button.KeyBindings.Clear();
+                    ++raised;
+                }),
+            });
+
+            target.SetFocusedElement(button, NavigationMethod.Pointer, 0);
+            target.ProcessRawEvent(
+                new RawKeyEventArgs(
+                    target,
+                    0,
+                    root,
+                    RawKeyEventType.KeyDown,
+                    Key.O,
+                    RawInputModifiers.Control));
+
+            Assert.Equal(1, raised);
+        }
+
+        private class DelegateCommand : ICommand
+        {
+            private readonly Action _action;
+            public DelegateCommand(Action action) => _action = action;
+            public event EventHandler CanExecuteChanged { add { } remove { } }
+            public bool CanExecute(object parameter) => true;
+            public void Execute(object parameter) => _action();
+        }
+
+        [Fact]
+        public void Control_Focus_Should_Be_Set_Before_FocusedElement_Raises_PropertyChanged()
+        {
+            var target = new KeyboardDevice();
+            var focused = new Mock<IInputElement>();
+            var root = Mock.Of<IInputRoot>();
+            var raised = 0;
+
+            target.PropertyChanged += (s, e) =>
+            {
+                if (e.PropertyName == nameof(target.FocusedElement))
+                {
+                    focused.Verify(x => x.RaiseEvent(It.IsAny<GotFocusEventArgs>()));
+                    ++raised;
+                }
+            };
+
+            target.SetFocusedElement(
+                focused.Object,
+                NavigationMethod.Unspecified,
+                KeyModifiers.None);
+
+            Assert.Equal(1, raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_Custom.cs b/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_Custom.cs
new file mode 100644
index 0000000000..830f7223ec
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_Custom.cs
@@ -0,0 +1,214 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class KeyboardNavigationTests_Custom
+    {
+        [Fact]
+        public void Tab_Should_Custom_Navigate_Within_Children()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    (current = new Button { Content = "Button 1" }),
+                    new Button { Content = "Button 2" },
+                    (next = new Button { Content = "Button 3" }),
+                },
+                NextControl = next,
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Same(next, result);
+        }
+
+        [Fact]
+        public void Right_Should_Custom_Navigate_Within_Children()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    (current = new Button { Content = "Button 1" }),
+                    new Button { Content = "Button 2" },
+                    (next = new Button { Content = "Button 3" }),
+                },
+                NextControl = next,
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Right);
+
+            Assert.Same(next, result);
+        }
+
+        [Fact]
+        public void Tab_Should_Custom_Navigate_From_Outside()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    new Button { Content = "Button 1" },
+                    new Button { Content = "Button 2" },
+                    (next = new Button { Content = "Button 3" }),
+                },
+                NextControl = next,
+            };
+
+            var root = new StackPanel
+            {
+                Children =
+                {
+                    (current = new Button { Content = "Outside" }),
+                    target,
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Same(next, result);
+        }
+
+        [Fact]
+        public void Tab_Should_Custom_Navigate_From_Outside_When_Wrapping()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    new Button { Content = "Button 1" },
+                    new Button { Content = "Button 2" },
+                    (next = new Button { Content = "Button 3" }),
+                },
+                NextControl = next,
+            };
+
+            var root = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    target,
+                    (current = new Button { Content = "Outside" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Same(next, result);
+        }
+
+        [Fact]
+        public void ShiftTab_Should_Custom_Navigate_From_Outside()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    new Button { Content = "Button 1" },
+                    new Button { Content = "Button 2" },
+                    (next = new Button { Content = "Button 3" }),
+                },
+                NextControl = next,
+            };
+
+            var root = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (current = new Button { Content = "Outside" }),
+                    target,
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Same(next, result);
+        }
+
+        [Fact]
+        public void ShiftTab_Should_Navigate_Outside_When_Null_Returned_As_Next()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    new Button { Content = "Button 1" },
+                    (current = new Button { Content = "Button 2" }),
+                    new Button { Content = "Button 3" },
+                },
+            };
+
+            var root = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    target,
+                    (next = new Button { Content = "Outside" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Same(next, result);
+        }
+
+        [Fact]
+        public void Tab_Should_Navigate_Outside_When_Null_Returned_As_Next()
+        {
+            Button current;
+            Button next;
+            var target = new CustomNavigatingStackPanel
+            {
+                Children =
+                {
+                    new Button { Content = "Button 1" },
+                    (current = new Button { Content = "Button 2" }),
+                    new Button { Content = "Button 3" },
+                },
+            };
+
+            var root = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    target,
+                    (next = new Button { Content = "Outside" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Same(next, result);
+        }
+
+        private class CustomNavigatingStackPanel : StackPanel, ICustomKeyboardNavigation
+        {
+            public bool CustomNavigates { get; set; } = true;
+            public IInputElement NextControl { get; set; }
+
+            public (bool handled, IInputElement next) GetNext(IInputElement element, NavigationDirection direction)
+            {
+                return (CustomNavigates, NextControl);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_Tab.cs b/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_Tab.cs
new file mode 100644
index 0000000000..7fd8cb345d
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_Tab.cs
@@ -0,0 +1,1257 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class KeyboardNavigationTests_Tab
+    {
+        [Fact]
+        public void Next_Continue_Returns_Next_Control_In_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Continue_Returns_First_Control_In_Next_Sibling_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Skips_Unfocusable_Siblings()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    (current = new Button { Name = "Button3" }),
+                                }
+                            },
+                            new TextBlock { Name = "TextBlock" },
+                            (next = new Button { Name = "Button4" }),
+                        }
+                    },
+                    new Button { Name = "Button5" },
+                    new Button { Name = "Button6" },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Continue_Doesnt_Enter_Panel_With_TabNavigation_None()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (next = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
+                        Children =
+                        {
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    new Button { Name = "Button4" },
+                                    new Button { Name = "Button5" },
+                                    new Button { Name = "Button6" },
+                                }
+                            },
+                        }
+                    }
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Continue_Returns_Next_Sibling()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
+                        }
+                    },
+                    (next = new Button { Name = "Button4" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Skips_Non_TabStop_Siblings()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
+                            new Button { Name="Button4", [KeyboardNavigation.IsTabStopProperty] = false }
+                        }
+                    },
+                    (next = new Button { Name = "Button5" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Continue_Returns_First_Control_In_Next_Uncle_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    new Button { Name = "Button1" },
+                                    new Button { Name = "Button2" },
+                                    (current = new Button { Name = "Button3" }),
+                                }
+                            },
+                        },
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Continue_Returns_Child_Of_Top_Level()
+        {
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (next = new Button { Name = "Button1" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(top, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Continue_Wraps()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    (next = new Button { Name = "Button1" }),
+                                    new Button { Name = "Button2" },
+                                    new Button { Name = "Button3" },
+                                }
+                            },
+                        },
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            (current = new Button { Name = "Button6" }),
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Cycle_Returns_Next_Control_In_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Cycle_Wraps_To_First()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                        Children =
+                        {
+                            (next = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Contained_Returns_Next_Control_In_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Contained_Stops_At_End()
+        {
+            Button current;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Next_Once_Moves_To_Next_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_Once_Moves_To_Active_Element()
+        {
+            StackPanel container;
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (container = new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (next = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
+                        }
+                    }),
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            (current = new Button { Name = "Button6" }),
+                        }
+                    },
+                }
+            };
+
+            KeyboardNavigation.SetTabOnceActiveElement(container, next);
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_None_Moves_To_Next_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Next_None_Skips_Container()
+        {
+            StackPanel container;
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (container = new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            new Button { Name = "Button3" },
+                        }
+                    }),
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            (current = new Button { Name = "Button6" }),
+                        }
+                    },
+                }
+            };
+
+            KeyboardNavigation.SetTabOnceActiveElement(container, next);
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Continue_Returns_Previous_Control_In_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (next = new Button { Name = "Button2" }),
+                            (current = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Continue_Returns_Last_Control_In_Previous_Sibling_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (current = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Continue_Returns_Last_Child_Of_Sibling()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    (current = new Button { Name = "Button4" }),
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Continue_Returns_Last_Control_In_Previous_Nephew_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    new Button { Name = "Button1" },
+                                    new Button { Name = "Button2" },
+                                    (next = new Button { Name = "Button3" }),
+                                }
+                            },
+                        },
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (current = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Continue_Wraps()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    (current = new Button { Name = "Button1" }),
+                                    new Button { Name = "Button2" },
+                                    new Button { Name = "Button3" },
+                                }
+                            },
+                        },
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            (next = new Button { Name = "Button6" }),
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Continue_Returns_Parent()
+        {
+            Button current;
+
+            var top = new Decorator
+            {
+                Focusable = true,
+                Child = current = new Button
+                {
+                    Name = "Button",
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(top, result);
+        }
+
+        [Fact]
+        public void Previous_Cycle_Returns_Previous_Control_In_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                        Children =
+                        {
+                            (next = new Button { Name = "Button1" }),
+                            (current = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Cycle_Wraps_To_Last()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                        Children =
+                        {
+                            (current = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Contained_Returns_Previous_Control_In_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
+                        Children =
+                        {
+                            (next = new Button { Name = "Button1" }),
+                            (current = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Contained_Stops_At_Beginning()
+        {
+            Button current;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
+                        Children =
+                        {
+                            (current = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            new Button { Name = "Button3" },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Previous_Once_Moves_To_Previous_Container()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (next = new Button { Name = "Button3" }),
+                        }
+                    },
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
+                        Children =
+                        {
+                            new Button { Name = "Button4" },
+                            (current = new Button { Name = "Button5" }),
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Once_Moves_To_Active_Element()
+        {
+            StackPanel container;
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (container = new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            (next = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
+                        }
+                    }),
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (current = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            KeyboardNavigation.SetTabOnceActiveElement(container, next);
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Once_Moves_To_First_Element()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
+                        Children =
+                        {
+                            (next = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            new Button { Name = "Button3" },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            (current = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
+                        }
+                    },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Equal(next, result);
+        }
+
+        [Fact]
+        public void Previous_Contained_Doesnt_Select_Child_Control()
+        {
+            Decorator current;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
+                Children =
+                {
+                    (current = new Decorator
+                    {
+                        Focusable = true,
+                        Child = new Button(),
+                    })
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Respects_TabIndex_Moving_Forwards()
+        {
+            Button start;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1", TabIndex = 5 },
+                            (start = new Button { Name = "Button2", TabIndex = 2 }),
+                            new Button { Name = "Button3", TabIndex = 1 },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4", TabIndex = 3  },
+                            new Button { Name = "Button5", TabIndex = 6  },
+                            new Button { Name = "Button6", TabIndex = 4  },
+                        }
+                    },
+                }
+            };
+
+            var result = new List<string>();
+            var current = (IInputElement)start;
+
+            do
+            {
+                result.Add(((IControl)current).Name);
+                current = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+            } while (current is object && current != start);
+
+            Assert.Equal(new[]
+            {
+                "Button2", "Button4", "Button6", "Button1", "Button5", "Button3"
+            }, result);
+        }
+
+        [Fact]
+        public void Respects_TabIndex_Moving_Backwards()
+        {
+            Button start;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1", TabIndex = 5 },
+                            (start = new Button { Name = "Button2", TabIndex = 2 }),
+                            new Button { Name = "Button3", TabIndex = 1 },
+                        }
+                    },
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button4", TabIndex = 3  },
+                            new Button { Name = "Button5", TabIndex = 6  },
+                            new Button { Name = "Button6", TabIndex = 4  },
+                        }
+                    },
+                }
+            };
+
+            var result = new List<string>();
+            var current = (IInputElement)start;
+
+            do
+            {
+                result.Add(((IControl)current).Name);
+                current = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
+            } while (current is object && current != start);
+
+            Assert.Equal(new[]
+            {
+                "Button2", "Button3", "Button5", "Button1", "Button6", "Button4"
+            }, result);
+        }
+
+        [Fact]
+        public void Cannot_Focus_Child_Of_Disabled_Control()
+        {
+            Button start;
+            Button expected;
+
+            var top = new StackPanel
+            {
+                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
+                Children =
+                {
+                    (start = new Button { Name = "Button1" }),
+                    new Border
+                    {
+                        IsEnabled = false,
+                        Child = new Button { Name = "Button2" },
+                    },
+                    (expected = new Button { Name = "Button3" }),
+                }
+            };
+
+            var current = (IInputElement)start;
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Same(expected, result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs b/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs
new file mode 100644
index 0000000000..88abb4a6fa
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Media;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class MouseDeviceTests
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        [Fact]
+        public void Capture_Is_Transferred_To_Parent_When_Control_Removed()
+        {
+            Canvas control;
+            var root = new TestRoot
+            {
+                Child = control = new Canvas(),
+            };
+            var target = new MouseDevice();
+
+            target.Capture(control);
+            Assert.Same(control, target.Captured);
+
+            root.Child = null;
+
+            Assert.Same(root, target.Captured);
+        }
+#pragma warning restore CS0618 // Type or member is obsolete
+
+        [Fact]
+        public void GetPosition_Should_Respect_Control_RenderTransform()
+        {
+            var renderer = new Mock<IRenderer>();
+
+            using (TestApplication(renderer.Object))
+            {
+                var inputManager = InputManager.Instance;
+
+                var root = new TestRoot
+                {
+                    MouseDevice = new MouseDevice(),
+                    Child = new Border
+                    {
+                        Background = Brushes.Black,
+                        RenderTransform = new TranslateTransform(10, 0),
+                    }
+                };
+
+                SendMouseMove(inputManager, root, new Point(11, 11));
+
+#pragma warning disable CS0618 // Type or member is obsolete
+                var result = root.MouseDevice.GetPosition(root.Child);
+#pragma warning restore CS0618 // Type or member is obsolete
+                Assert.Equal(new Point(1, 11), result);
+            }
+        }
+
+        private void SendMouseMove(IInputManager inputManager, TestRoot root, Point p = new Point())
+        {
+            inputManager.ProcessInput(new RawPointerEventArgs(
+                root.MouseDevice,
+                0,
+                root,
+                RawPointerEventType.Move,
+                p,
+                RawInputModifiers.None));
+        }
+
+        private IDisposable TestApplication(IRenderer renderer)
+        {
+            return UnitTestApplication.Start(
+                new TestServices(inputManager: new InputManager()));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/PointerOverTests.cs b/tests/Avalonia.Base.UnitTests/Input/PointerOverTests.cs
new file mode 100644
index 0000000000..87df65a080
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/PointerOverTests.cs
@@ -0,0 +1,534 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+
+using Moq;
+
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class PointerOverTests
+    {
+        // https://github.com/AvaloniaUI/Avalonia/issues/2821
+        [Fact]
+        public void Close_Should_Remove_PointerOver()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var device = CreatePointerDeviceMock().Object;
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            Canvas canvas;
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas())
+                }
+            });
+
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.True(canvas.IsPointerOver);
+
+            impl.Object.Closed!();
+
+            Assert.False(canvas.IsPointerOver);
+        }
+
+        [Fact]
+        public void MouseMove_Should_Update_IsPointerOver()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var device = CreatePointerDeviceMock().Object;
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            Canvas canvas;
+            Border border;
+            Decorator decorator;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas()),
+                    (border = new Border
+                    {
+                        Child = decorator = new Decorator(),
+                    })
+                }
+            });
+
+            SetHit(renderer, decorator);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.True(decorator.IsPointerOver);
+            Assert.True(border.IsPointerOver);
+            Assert.False(canvas.IsPointerOver);
+            Assert.True(root.IsPointerOver);
+
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.False(decorator.IsPointerOver);
+            Assert.False(border.IsPointerOver);
+            Assert.True(canvas.IsPointerOver);
+            Assert.True(root.IsPointerOver);
+        }
+
+
+        [Fact]
+        public void TouchMove_Should_Not_Set_IsPointerOver()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var device = CreatePointerDeviceMock(pointerType: PointerType.Touch).Object;
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            Canvas canvas;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas())
+                }
+            });
+
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.False(canvas.IsPointerOver);
+            Assert.False(root.IsPointerOver);
+        }
+
+        [Fact]
+        public void HitTest_Should_Be_Ignored_If_Element_Captured()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var pointer = new Mock<IPointer>();
+            var device = CreatePointerDeviceMock(pointer.Object).Object;
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            Canvas canvas;
+            Border border;
+            Decorator decorator;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas()),
+                    (border = new Border
+                    {
+                        Child = decorator = new Decorator(),
+                    })
+                }
+            });
+
+            SetHit(renderer, canvas);
+            pointer.SetupGet(p => p.Captured).Returns(decorator);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.True(decorator.IsPointerOver);
+            Assert.True(border.IsPointerOver);
+            Assert.False(canvas.IsPointerOver);
+            Assert.True(root.IsPointerOver);
+        }
+
+        [Fact]
+        public void IsPointerOver_Should_Be_Updated_When_Child_Sets_Handled_True()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var device = CreatePointerDeviceMock().Object;
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            Canvas canvas;
+            Border border;
+            Decorator decorator;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas()),
+                    (border = new Border
+                    {
+                        Child = decorator = new Decorator(),
+                    })
+                }
+            });
+
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.False(decorator.IsPointerOver);
+            Assert.False(border.IsPointerOver);
+            Assert.True(canvas.IsPointerOver);
+            Assert.True(root.IsPointerOver);
+
+            // Ensure that e.Handled is reset between controls.
+            root.PointerMoved += (s, e) => e.Handled = true;
+            decorator.PointerEnter += (s, e) => e.Handled = true;
+
+            SetHit(renderer, decorator);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
+
+            Assert.True(decorator.IsPointerOver);
+            Assert.True(border.IsPointerOver);
+            Assert.False(canvas.IsPointerOver);
+            Assert.True(root.IsPointerOver);
+        }
+
+        [Fact]
+        public void Pointer_Enter_Move_Leave_Should_Be_Followed()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var deviceMock = CreatePointerDeviceMock();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+            var result = new List<(object?, string)>();
+
+            void HandleEvent(object? sender, PointerEventArgs e)
+            {
+                result.Add((sender, e.RoutedEvent!.Name));
+            }
+
+            Canvas canvas;
+            Border border;
+            Decorator decorator;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas()),
+                    (border = new Border
+                    {
+                        Child = decorator = new Decorator(),
+                    })
+                }
+            });
+
+            AddEnterLeaveHandlers(HandleEvent, canvas, decorator);
+
+            // Enter decorator
+            SetHit(renderer, decorator);
+            SetMove(deviceMock, root, decorator);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root));
+
+            // Leave decorator
+            SetHit(renderer, canvas);
+            SetMove(deviceMock, root, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root));
+
+            Assert.Equal(
+                new[]
+                {
+                        ((object?)decorator, "PointerEnter"),
+                        (decorator, "PointerMoved"),
+                        (decorator, "PointerLeave"),
+                        (canvas, "PointerEnter"),
+                        (canvas, "PointerMoved")
+                },
+                result);
+        }
+
+        [Fact]
+        public void PointerEnter_Leave_Should_Be_Raised_In_Correct_Order()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var deviceMock = CreatePointerDeviceMock();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+            var result = new List<(object?, string)>();
+
+            void HandleEvent(object? sender, PointerEventArgs e)
+            {
+                result.Add((sender, e.RoutedEvent!.Name));
+            }
+
+            Canvas canvas;
+            Border border;
+            Decorator decorator;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas()),
+                    (border = new Border
+                    {
+                        Child = decorator = new Decorator(),
+                    })
+                }
+            });
+
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root));
+
+            AddEnterLeaveHandlers(HandleEvent, root, canvas, border, decorator);
+
+            SetHit(renderer, decorator);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root));
+
+            Assert.Equal(
+                new[]
+                {
+                    ((object?)canvas, "PointerLeave"),
+                    (decorator, "PointerEnter"),
+                    (border, "PointerEnter"),
+                },
+                result);
+        }
+
+        // https://github.com/AvaloniaUI/Avalonia/issues/7896
+        [Fact]
+        public void PointerEnter_Leave_Should_Set_Correct_Position()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var expectedPosition = new Point(15, 15);
+            var renderer = new Mock<IRenderer>();
+            var deviceMock = CreatePointerDeviceMock();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+            var result = new List<(object?, string, Point)>();
+
+            void HandleEvent(object? sender, PointerEventArgs e)
+            {
+                result.Add((sender, e.RoutedEvent!.Name, e.GetPosition(null)));
+            }
+
+            Canvas canvas;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas())
+                }
+            });
+
+            AddEnterLeaveHandlers(HandleEvent, root, canvas);
+
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root, expectedPosition));
+
+            SetHit(renderer, null);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root, expectedPosition));
+
+            Assert.Equal(
+                new[]
+                {
+                    ((object?)canvas, "PointerEnter", expectedPosition),
+                    (root, "PointerEnter", expectedPosition),
+                    (canvas, "PointerLeave", expectedPosition),
+                    (root, "PointerLeave", expectedPosition)
+                },
+                result);
+        }
+
+        [Fact]
+        public void Render_Invalidation_Should_Affect_PointerOver()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var deviceMock = CreatePointerDeviceMock();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            var invalidateRect = new Rect(0, 0, 15, 15);
+
+            Canvas canvas;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas())
+                }
+            });
+
+            // Let input know about latest device.
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root));
+            Assert.True(canvas.IsPointerOver);
+
+            SetHit(renderer, canvas);
+            renderer.Raise(r => r.SceneInvalidated += null, new SceneInvalidatedEventArgs((IRenderRoot)root, invalidateRect));
+            Assert.True(canvas.IsPointerOver);
+
+            // Raise SceneInvalidated again, but now hide element from the hittest.
+            SetHit(renderer, null);
+            renderer.Raise(r => r.SceneInvalidated += null, new SceneInvalidatedEventArgs((IRenderRoot)root, invalidateRect));
+            Assert.False(canvas.IsPointerOver);
+        }
+
+        // https://github.com/AvaloniaUI/Avalonia/issues/7748
+        [Fact]
+        public void LeaveWindow_Should_Reset_PointerOver()
+        {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var deviceMock = CreatePointerDeviceMock();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
+            var lastClientPosition = new Point(1, 5);
+            var invalidateRect = new Rect(0, 0, 15, 15);
+            var result = new List<(object?, string, Point)>();
+
+            void HandleEvent(object? sender, PointerEventArgs e)
+            {
+                result.Add((sender, e.RoutedEvent!.Name, e.GetPosition(null)));
+            }
+
+            Canvas canvas;
+
+            var root = CreateInputRoot(impl.Object, new Panel
+            {
+                Children =
+                {
+                    (canvas = new Canvas())
+                }
+            });
+
+            AddEnterLeaveHandlers(HandleEvent, root, canvas);
+
+            // Init pointer over.
+            SetHit(renderer, canvas);
+            impl.Object.Input!(CreateRawPointerMovedArgs(deviceMock.Object, root, lastClientPosition));
+            Assert.True(canvas.IsPointerOver);
+
+            // Send LeaveWindow.
+            impl.Object.Input!(new RawPointerEventArgs(deviceMock.Object, 0, root, RawPointerEventType.LeaveWindow, new Point(), default));
+            Assert.False(canvas.IsPointerOver);
+
+            Assert.Equal(
+                new[]
+                {
+                    ((object?)canvas, "PointerEnter", lastClientPosition),
+                    (root, "PointerEnter", lastClientPosition),
+                    (canvas, "PointerLeave", lastClientPosition),
+                    (root, "PointerLeave", lastClientPosition),
+                },
+                result);
+        }
+
+        private static void AddEnterLeaveHandlers(
+            EventHandler<PointerEventArgs> handler,
+            params IInputElement[] controls)
+        {
+            foreach (var c in controls)
+            {
+                c.PointerEnter += handler;
+                c.PointerLeave += handler;
+                c.PointerMoved += handler;
+            }
+        }
+
+        private static void SetHit(Mock<IRenderer> renderer, IControl? hit)
+        {
+            renderer.Setup(x => x.HitTest(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
+                .Returns(hit is null ? Array.Empty<IControl>() : new[] { hit });
+
+            renderer.Setup(x => x.HitTestFirst(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
+                .Returns(hit);
+        }
+
+        private static void SetMove(Mock<IPointerDevice> deviceMock, IInputRoot root, IInputElement element)
+        {
+            deviceMock.Setup(d => d.ProcessRawEvent(It.IsAny<RawPointerEventArgs>()))
+                .Callback(() => element.RaiseEvent(CreatePointerMovedArgs(root, element)));
+        }
+
+        private static Mock<IWindowImpl> CreateTopLevelImplMock(IRenderer renderer)
+        {
+            var impl = new Mock<IWindowImpl>();
+            impl.DefaultValue = DefaultValue.Mock;
+            impl.SetupAllProperties();
+            impl.SetupGet(r => r.RenderScaling).Returns(1);
+            impl.Setup(r => r.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer);
+            impl.Setup(r => r.PointToScreen(It.IsAny<Point>())).Returns<Point>(p => new PixelPoint((int)p.X, (int)p.Y));
+            impl.Setup(r => r.PointToClient(It.IsAny<PixelPoint>())).Returns<PixelPoint>(p => new Point(p.X, p.Y));
+            return impl;
+        }
+
+        private static IInputRoot CreateInputRoot(IWindowImpl impl, IControl child)
+        {
+            var root = new Window(impl)
+            {
+                Width = 100,
+                Height = 100,
+                Content = child,
+                Template = new FuncControlTemplate<Window>((w, _) => new ContentPresenter
+                {
+                    Content = w.Content
+                })
+            };
+            root.Show();
+            return root;
+        }
+
+        private static IInputRoot CreateInputRoot(IRenderer renderer, IControl child)
+        {
+            return CreateInputRoot(CreateTopLevelImplMock(renderer).Object, child);
+        }
+
+        private static RawPointerEventArgs CreateRawPointerMovedArgs(
+            IPointerDevice pointerDevice,
+            IInputRoot root,
+            Point? positition = null)
+        {
+            return new RawPointerEventArgs(pointerDevice, 0, root, RawPointerEventType.Move,
+                positition ?? default, default);
+        }
+
+        private static PointerEventArgs CreatePointerMovedArgs(
+            IInputRoot root, IInputElement? source, Point? positition = null)
+        {
+            return new PointerEventArgs(InputElement.PointerMovedEvent, source, new Mock<IPointer>().Object, root,
+                positition ?? default, default, PointerPointProperties.None, KeyModifiers.None);
+        }
+
+        private static Mock<IPointerDevice> CreatePointerDeviceMock(
+            IPointer? pointer = null,
+            PointerType pointerType = PointerType.Mouse)
+        {
+            if (pointer is null)
+            {
+                var pointerMock = new Mock<IPointer>();
+                pointerMock.SetupGet(p => p.Type).Returns(pointerType);
+                pointer = pointerMock.Object;
+            }
+
+            var pointerDevice = new Mock<IPointerDevice>();
+            pointerDevice.Setup(d => d.TryGetPointer(It.IsAny<RawPointerEventArgs>()))
+                .Returns(pointer);
+
+            return pointerDevice;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Input/PointerTests.cs b/tests/Avalonia.Base.UnitTests/Input/PointerTests.cs
new file mode 100644
index 0000000000..e25ef0a9b8
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/PointerTests.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input
+{
+    public class PointerTests
+    {
+        [Fact]
+        public void On_Capture_Transfer_PointerCaptureLost_Should_Propagate_Up_To_The_Common_Parent()
+        {
+            Border initialParent, initialCapture, newParent, newCapture;
+            var el = new StackPanel
+            {
+                Children =
+                {
+                    (initialParent = new Border { Child = initialCapture = new Border() }),
+                    (newParent = new Border { Child = newCapture = new Border() })
+                }
+            };
+            var receivers = new List<object>();
+            var root = new TestRoot(el);
+            foreach (InputElement d in root.GetSelfAndVisualDescendants())
+                d.PointerCaptureLost += (s, e) => receivers.Add(s);
+            var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
+            
+            pointer.Capture(initialCapture);
+            pointer.Capture(newCapture);
+            Assert.True(receivers.SequenceEqual(new[] { initialCapture, initialParent }));
+            
+            receivers.Clear();
+            pointer.Capture(null);
+            Assert.True(receivers.SequenceEqual(new object[] { newCapture, newParent, el, root }));
+        }
+    }
+}
diff --git a/tests/Avalonia.Input.UnitTests/TouchDeviceTests.cs b/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
similarity index 100%
rename from tests/Avalonia.Input.UnitTests/TouchDeviceTests.cs
rename to tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
diff --git a/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs b/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs
new file mode 100644
index 0000000000..1ca7e9bd49
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs
@@ -0,0 +1,448 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Interactivity
+{
+    public class InteractiveTests
+    {
+        [Fact]
+        public void Direct_Event_Should_Go_Straight_To_Source()
+        {
+            var ev = new RoutedEvent("test", RoutingStrategies.Direct, typeof(RoutedEventArgs), typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+            var target = CreateTree(ev, handler, RoutingStrategies.Direct);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "2b" }, invoked);
+        }
+
+        [Fact]
+        public void Direct_Event_Should_Have_Route_Set_To_Direct()
+        {
+            var ev = new RoutedEvent("test", RoutingStrategies.Direct, typeof(RoutedEventArgs), typeof(TestInteractive));
+            bool called = false;
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                Assert.Equal(RoutingStrategies.Direct, e.Route);
+                called = true;
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Direct);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.True(called);
+        }
+
+        [Fact]
+        public void Bubbling_Event_Should_Bubble_Up()
+        {
+            var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "2b", "1" }, invoked);
+        }
+
+        [Fact]
+        public void Tunneling_Event_Should_Tunnel()
+        {
+            var ev = new RoutedEvent("test", RoutingStrategies.Tunnel, typeof(RoutedEventArgs), typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "1", "2b" }, invoked);
+        }
+
+        [Fact]
+        public void Tunneling_Bubbling_Event_Should_Tunnel_Then_Bubble_Up()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "1", "2b", "2b", "1" }, invoked);
+        }
+
+        [Fact]
+        public void Events_Should_Have_Route_Set()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var invoked = new List<RoutingStrategies>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(e.Route);
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[]
+            {
+                RoutingStrategies.Tunnel,
+                RoutingStrategies.Tunnel,
+                RoutingStrategies.Bubble,
+                RoutingStrategies.Bubble,
+            },
+            invoked);
+        }
+
+        [Fact]
+        public void Handled_Bubbled_Event_Should_Not_Propogate_Further()
+        {
+            var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
+            var invoked = new List<string>();
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                var t = (TestInteractive)s;
+                invoked.Add(t.Name);
+                e.Handled = t.Name == "2b";
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "2b" }, invoked);
+        }
+
+        [Fact]
+        public void Handled_Tunnelled_Event_Should_Not_Propogate_Further()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel, 
+                typeof(RoutedEventArgs), 
+                typeof(TestInteractive));
+            var invoked = new List<string>();
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                var t = (TestInteractive)s;
+                invoked.Add(t.Name);
+                e.Handled = t.Name == "2b";
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "1", "2b" }, invoked);
+        }
+
+        [Fact]
+        public void Direct_Subscription_Should_Not_Catch_Tunneling_Or_Bubbling()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var count = 0;
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                ++count;
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Direct);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(0, count);
+        }
+
+        [Fact]
+        public void Bubbling_Subscription_Should_Not_Catch_Tunneling()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var count = 0;
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                Assert.Equal(RoutingStrategies.Bubble, e.Route);
+                ++count;
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(2, count);
+        }
+
+        [Fact]
+        public void Tunneling_Subscription_Should_Not_Catch_Bubbling()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var count = 0;
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                Assert.Equal(RoutingStrategies.Tunnel, e.Route);
+                ++count;
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(2, count);
+        }
+
+        [Fact]
+        public void Event_Should_Should_Keep_Propogating_To_HandedEventsToo_Handlers()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var invoked = new List<string>();
+
+            EventHandler<RoutedEventArgs> handler = (s, e) =>
+            {
+                invoked.Add(((TestInteractive)s).Name);
+                e.Handled = true;
+            };
+
+            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel, true);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "1", "2b", "2b", "1" }, invoked);
+        }
+
+        [Fact]
+        public void Direct_Class_Handlers_Should_Be_Called()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Direct,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+
+            var target = CreateTree(ev, null, 0);
+
+            ev.AddClassHandler(typeof(TestInteractive), handler, RoutingStrategies.Direct);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "2b" }, invoked);
+        }
+
+        [Fact]
+        public void Tunneling_Class_Handlers_Should_Be_Called()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+
+            var target = CreateTree(ev, null, 0);
+
+            ev.AddClassHandler(typeof(TestInteractive), handler, RoutingStrategies.Tunnel);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "1", "2b" }, invoked);
+        }
+
+        [Fact]
+        public void Bubbling_Class_Handlers_Should_Be_Called()
+        {
+            var ev = new RoutedEvent(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(RoutedEventArgs),
+                typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+
+            var target = CreateTree(ev, null, 0);
+
+            ev.AddClassHandler(typeof(TestInteractive), handler, RoutingStrategies.Bubble);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "2b", "1" }, invoked);
+        }
+
+        [Fact]
+        public void Typed_Class_Handlers_Should_Be_Called()
+        {
+            var ev = new RoutedEvent<RoutedEventArgs>(
+                "test",
+                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
+                typeof(TestInteractive));
+
+            var target = CreateTree(ev, null, 0);
+
+            ev.AddClassHandler<TestInteractive>((x, e) => x.ClassHandler(e), RoutingStrategies.Bubble);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.True(target.ClassHandlerInvoked);
+            Assert.True(target.GetVisualParent<TestInteractive>().ClassHandlerInvoked);
+        }
+
+        [Fact]
+        public void GetObservable_Should_Listen_To_Event()
+        {
+            var ev = new RoutedEvent<RoutedEventArgs>("test", RoutingStrategies.Direct, typeof(TestInteractive));
+            var target = new TestInteractive();
+            var called = 0;
+            var subscription = target.GetObservable(ev).Subscribe(_ => ++called);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            subscription.Dispose();
+
+            target.RaiseEvent(args);
+
+            Assert.Equal(1, called);
+        }
+
+        [Fact]
+        public void Removing_Control_In_Handler_Should_Not_Stop_Event()
+        {
+            // Issue #3176
+            var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
+            var invoked = new List<string>();
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
+            var parent = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
+            var target = (IInteractive)parent.GetVisualChildren().Single();
+
+            EventHandler<RoutedEventArgs> removeHandler = (s, e) =>
+            {
+                parent.Children = Array.Empty<IVisual>();
+            };
+            
+            target.AddHandler(ev, removeHandler);
+
+            var args = new RoutedEventArgs(ev, target);
+            target.RaiseEvent(args);
+
+            Assert.Equal(new[] { "3", "2b", "1" }, invoked);
+        }
+
+        private TestInteractive CreateTree(
+            RoutedEvent ev,
+            EventHandler<RoutedEventArgs> handler,
+            RoutingStrategies handlerRoutes,
+            bool handledEventsToo = false)
+        {
+            TestInteractive target;
+
+            var tree = new TestInteractive
+            {
+                Name = "1",
+                Children = new[]
+                {
+                    new TestInteractive
+                    {
+                        Name = "2a",
+                    },
+                    (target = new TestInteractive
+                    {
+                        Name = "2b",
+                        Children = new[]
+                        {
+                            new TestInteractive
+                            {
+                                Name = "3",
+                            },
+                        },
+                    }),
+                }
+            };
+
+            if (handler != null)
+            {
+                foreach (var i in tree.GetSelfAndVisualDescendants().Cast<Interactive>())
+                {
+                    i.AddHandler(ev, handler, handlerRoutes, handledEventsToo);
+                }
+            }
+
+            return target;
+        }
+
+        private class TestInteractive : Interactive
+        {
+            public bool ClassHandlerInvoked { get; private set; }
+            public new string Name { get; set; }
+
+            public IEnumerable<IVisual> Children
+            {
+                get
+                {
+                    return ((IVisual)this).VisualChildren.AsEnumerable();
+                }
+
+                set
+                {
+                    VisualChildren.Clear();
+                    VisualChildren.AddRange(value.Cast<Visual>());
+                }
+            }
+
+            public void ClassHandler(RoutedEventArgs e)
+            {
+                ClassHandlerInvoked = true;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Interactivity/RoutedEventRegistryTests.cs b/tests/Avalonia.Base.UnitTests/Interactivity/RoutedEventRegistryTests.cs
new file mode 100644
index 0000000000..05b2187df4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Interactivity/RoutedEventRegistryTests.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Interactivity
+{
+    public class RoutedEventRegistryTests
+    {
+        [Fact]
+        public void Pointer_Events_Should_Be_Registered()
+        {
+            var expectedEvents = new List<RoutedEvent> { InputElement.PointerPressedEvent, InputElement.PointerReleasedEvent }; 
+            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<InputElement>();
+            Assert.Contains(registeredEvents, expectedEvents.Contains);
+        }
+
+        [Fact]
+        public void ClickEvent_Should_Be_Registered_On_Button()
+        {
+            var expectedEvents = new List<RoutedEvent> { Button.ClickEvent };
+            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<Button>();
+            Assert.Contains(registeredEvents, expectedEvents.Contains);
+        }
+
+        [Fact]
+        public void ClickEvent_Should_Not_Be_Registered_On_ContentControl()
+        {
+            // force ContentControl type to be loaded
+            new ContentControl();
+            var expectedEvents = new List<RoutedEvent> { Button.ClickEvent };
+            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<ContentControl>();
+            Assert.DoesNotContain(registeredEvents, expectedEvents.Contains);
+        }
+
+        [Fact]
+        public void InputElement_Events_Should_Not_Be_Registered_On_Button()
+        {
+            // force Button type to be loaded
+            new Button();
+            var expectedEvents = new List<RoutedEvent> { InputElement.PointerPressedEvent, InputElement.PointerReleasedEvent };
+            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<Button>();
+            Assert.DoesNotContain(registeredEvents, expectedEvents.Contains);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/ArrangeTests.cs b/tests/Avalonia.Base.UnitTests/Layout/ArrangeTests.cs
new file mode 100644
index 0000000000..b771cf2d24
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/ArrangeTests.cs
@@ -0,0 +1,137 @@
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class ArrangeTests
+    {
+        [Fact]
+        public void Bounds_Should_Not_Include_Margin()
+        {
+            var target = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Margin = new Thickness(5),
+            };
+
+            Assert.False(target.IsMeasureValid);
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+            Assert.Equal(new Rect(5, 5, 100, 100), target.Bounds);
+        }
+
+        [Fact]
+        public void Margin_Should_Be_Subtracted_From_Arrange_FinalSize()
+        {
+            var target = new TestControl
+            {
+                Width = 100,
+                Height = 100,
+                Margin = new Thickness(8),
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.Equal(new Size(100, 100), target.ArrangeFinalSize);
+        }
+
+        [Fact]
+        public void ArrangeOverride_Receives_Desired_Size_When_Centered()
+        {
+            var target = new TestControl
+            {
+                MeasureResult = new Size(100, 100),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(8),
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(0, 0, 200, 200));
+
+            Assert.Equal(new Size(100, 100), target.ArrangeFinalSize);
+        }
+
+        [Fact]
+        public void ArrangeOverride_Receives_Available_Size_Minus_Margin_When_Stretched()
+        {
+            var target = new TestControl
+            {
+                MeasureResult = new Size(100, 100),
+                HorizontalAlignment = HorizontalAlignment.Stretch,
+                VerticalAlignment = VerticalAlignment.Stretch,
+                Margin = new Thickness(8),
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(0, 0, 200, 200));
+
+            Assert.Equal(new Size(184, 184), target.ArrangeFinalSize);
+        }
+
+        [Fact]
+        public void ArrangeOverride_Receives_Requested_Size_When_Arranged_To_DesiredSize()
+        {
+            var target = new TestControl
+            {
+                MeasureResult = new Size(100, 100),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(8),
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.Equal(new Size(100, 100), target.ArrangeFinalSize);
+        }
+
+        [Fact]
+        public void Arrange_With_IsMeasureValid_False_Calls_Measure()
+        {
+            var target = new TestControl();
+
+            Assert.False(target.IsMeasureValid);
+            target.Arrange(new Rect(0, 0, 120, 120));
+            Assert.True(target.IsMeasureValid);
+            Assert.Equal(new Size(120, 120), target.MeasureConstraint);
+        }
+
+        [Fact]
+        public void Arrange_With_IsMeasureValid_False_Calls_Measure_With_Previous_Size_If_Available()
+        {
+            var target = new TestControl();
+
+            Assert.False(target.IsMeasureValid);
+            target.Arrange(new Rect(0, 0, 120, 120));
+            target.InvalidateMeasure();
+            target.Arrange(new Rect(0, 0, 100, 100));
+            Assert.True(target.IsMeasureValid);
+            Assert.Equal(new Size(120, 120), target.MeasureConstraint);
+        }
+
+        private class TestControl : Decorator
+        {
+            public Size MeasureConstraint { get; private set; }
+
+            public Size MeasureResult { get; set; }
+
+            public Size ArrangeFinalSize { get; private set; }
+
+            protected override Size MeasureOverride(Size constraint)
+            {
+                MeasureConstraint = constraint;
+                return MeasureResult;
+            }
+
+            protected override Size ArrangeOverride(Size finalSize)
+            {
+                ArrangeFinalSize = finalSize;
+                return base.ArrangeOverride(finalSize);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/FullLayoutTests.cs b/tests/Avalonia.Base.UnitTests/Layout/FullLayoutTests.cs
new file mode 100644
index 0000000000..1d6eead6dd
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/FullLayoutTests.cs
@@ -0,0 +1,115 @@
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Layout;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class FullLayoutTests
+    {
+        [Fact]
+        public void Grandchild_Size_Changed()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                Border border;
+                TextBlock textBlock;
+
+                var window = new Window()
+                {
+                    SizeToContent = SizeToContent.WidthAndHeight,
+                    Content = border = new Border
+                    {
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        Child = new Border
+                        {
+                            Child = textBlock = new TextBlock
+                            {
+                                Width = 400,
+                                Height = 400,
+                                Text = "Hello World!",
+                            },
+                        }
+                    }
+                };
+
+                window.Show();
+
+                Assert.Equal(new Size(400, 400), border.Bounds.Size);
+                textBlock.Width = 200;
+                window.LayoutManager.ExecuteLayoutPass();
+
+                Assert.Equal(new Size(200, 400), border.Bounds.Size);
+            }
+        }
+
+        [Fact]
+        public void Test_ScrollViewer_With_TextBlock()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                ScrollViewer scrollViewer;
+                TextBlock textBlock;
+
+                var window = new Window()
+                {
+                    Width = 800,
+                    Height = 600,
+                    Content = scrollViewer = new ScrollViewer
+                    {
+                        Width = 200,
+                        Height = 200,
+                        HorizontalScrollBarVisibility = ScrollBarVisibility.Auto,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        Content = textBlock = new TextBlock
+                        {
+                            Width = 400,
+                            Height = 400,
+                            Text = "Hello World!",
+                        },
+                    }
+                };
+
+                window.Resources["ScrollBarThickness"] = 10.0;
+
+                window.Show();
+
+                Assert.Equal(new Size(800, 600), window.Bounds.Size);
+                Assert.Equal(new Size(200, 200), scrollViewer.Bounds.Size);
+                Assert.Equal(new Point(300, 200), Position(scrollViewer));
+                Assert.Equal(new Size(400, 400), textBlock.Bounds.Size);
+
+                var scrollBars = scrollViewer.GetTemplateChildren().OfType<ScrollBar>().ToList();
+                var presenters = scrollViewer.GetTemplateChildren().OfType<ScrollContentPresenter>().ToList();
+
+                Assert.Equal(2, scrollBars.Count);
+                Assert.Single(presenters);
+
+                var presenter = presenters[0];
+                Assert.Equal(new Size(190, 190), presenter.Bounds.Size);
+
+                var horzScroll = scrollBars.Single(x => x.Orientation == Orientation.Horizontal);
+                var vertScroll = scrollBars.Single(x => x.Orientation == Orientation.Vertical);
+
+                Assert.True(horzScroll.IsVisible);
+                Assert.True(vertScroll.IsVisible);
+                Assert.Equal(new Size(190, 10), horzScroll.Bounds.Size);
+                Assert.Equal(new Size(10, 190), vertScroll.Bounds.Size);
+                Assert.Equal(new Point(0, 190), Position(horzScroll));
+                Assert.Equal(new Point(190, 0), Position(vertScroll));
+            }
+        }
+
+        private static Point Position(IVisual v)
+        {
+            return v.Bounds.Position;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutHelperTests.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutHelperTests.cs
new file mode 100644
index 0000000000..3df31939d1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutHelperTests.cs
@@ -0,0 +1,28 @@
+using System;
+using Avalonia.Layout;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class LayoutHelperTests
+    {
+        [Fact]
+        public void Round_Layout_Value_Without_DPI_Aware()
+        {
+            const double value = 42.5;
+            var expectedValue = Math.Round(value);
+            var actualValue = LayoutHelper.RoundLayoutValue(value, 1.0);
+            Assert.Equal(expectedValue, actualValue);
+        }
+
+        [Fact]
+        public void Round_Layout_Value_With_DPI_Aware()
+        {
+            const double dpiScale = 1.25;
+            const double value = 42.5;
+            var expectedValue = Math.Round(value * dpiScale) / dpiScale;
+            var actualValue = LayoutHelper.RoundLayoutValue(value, dpiScale);
+            Assert.Equal(expectedValue, actualValue);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutManagerTests.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutManagerTests.cs
new file mode 100644
index 0000000000..37e07c244e
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutManagerTests.cs
@@ -0,0 +1,443 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Threading;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class LayoutManagerTests
+    {
+        [Fact]
+        public void Measures_And_Arranges_InvalidateMeasured_Control()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = control.Arranged = false;
+
+            control.InvalidateMeasure();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.True(control.Measured);
+            Assert.True(control.Arranged);
+        }
+
+        [Fact]
+        public void Doesnt_Measure_And_Arrange_InvalidateMeasured_Control_When_TopLevel_Is_Not_Visible()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control, IsVisible = false };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = control.Arranged = false;
+
+            control.InvalidateMeasure();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.False(control.Measured);
+            Assert.False(control.Arranged);
+        }
+
+        [Fact]
+        public void Arranges_InvalidateArranged_Control()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = control.Arranged = false;
+
+            control.InvalidateArrange();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.False(control.Measured);
+            Assert.True(control.Arranged);
+        }
+
+        [Fact]
+        public void Measures_Parent_Of_Newly_Added_Control()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot();
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            root.Child = control;
+            root.Measured = root.Arranged = false;
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.True(root.Measured);
+            Assert.True(root.Arranged);
+            Assert.True(control.Measured);
+            Assert.True(control.Arranged);
+        }
+
+        [Fact]
+        public void Measures_In_Correct_Order()
+        {
+            LayoutTestControl control1;
+            LayoutTestControl control2;
+            var root = new LayoutTestRoot
+            {
+                Child = control1 = new LayoutTestControl
+                {
+                    Child = control2 = new LayoutTestControl(),
+                }
+            };
+
+            var order = new List<ILayoutable>();
+            Size MeasureOverride(ILayoutable control, Size size)
+            {
+                order.Add(control);
+                return new Size(10, 10);
+            }
+
+            root.DoMeasureOverride = MeasureOverride;
+            control1.DoMeasureOverride = MeasureOverride;
+            control2.DoMeasureOverride = MeasureOverride;
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            control2.InvalidateMeasure();
+            control1.InvalidateMeasure();
+            root.InvalidateMeasure();
+
+            order.Clear();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.Equal(new ILayoutable[] { root, control1, control2 }, order);
+        }
+
+        [Fact]
+        public void Measures_Root_And_Grandparent_In_Correct_Order()
+        {
+            LayoutTestControl control1;
+            LayoutTestControl control2;
+            var root = new LayoutTestRoot
+            {
+                Child = control1 = new LayoutTestControl
+                {
+                    Child = control2 = new LayoutTestControl(),
+                }
+            };
+
+            var order = new List<ILayoutable>();
+            Size MeasureOverride(ILayoutable control, Size size)
+            {
+                order.Add(control);
+                return new Size(10, 10);
+            }
+
+            root.DoMeasureOverride = MeasureOverride;
+            control1.DoMeasureOverride = MeasureOverride;
+            control2.DoMeasureOverride = MeasureOverride;
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            control2.InvalidateMeasure();
+            root.InvalidateMeasure();
+
+            order.Clear();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.Equal(new ILayoutable[] { root, control2 }, order);
+        }
+
+        [Fact]
+        public void Doesnt_Measure_Non_Invalidated_Root()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            root.Measured = root.Arranged = false;
+            control.Measured = control.Arranged = false;
+
+            control.InvalidateMeasure();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.False(root.Measured);
+            Assert.False(root.Arranged);
+            Assert.True(control.Measured);
+            Assert.True(control.Arranged);
+        }
+
+        [Fact]
+        public void Doesnt_Measure_Removed_Control()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = control.Arranged = false;
+
+            control.InvalidateMeasure();
+            root.Child = null;
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.False(control.Measured);
+            Assert.False(control.Arranged);
+        }
+
+        [Fact]
+        public void Measures_Root_With_Infinity()
+        {
+            var root = new LayoutTestRoot();
+            var availableSize = default(Size);
+
+            // Should not measure with this size.
+            root.MaxClientSize = new Size(123, 456);
+
+            root.DoMeasureOverride = (_, s) =>
+            {
+                availableSize = s;
+                return new Size(100, 100);
+            };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            Assert.Equal(Size.Infinity, availableSize);
+        }
+
+        [Fact]
+        public void Arranges_Root_With_DesiredSize()
+        {
+            var root = new LayoutTestRoot
+            {
+                Width = 100,
+                Height = 100,
+            };
+
+            var arrangeSize = default(Size);
+
+            root.DoArrangeOverride = (_, s) =>
+            {
+                arrangeSize = s;
+                return s;
+            };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            Assert.Equal(new Size(100, 100), arrangeSize);
+
+            root.Width = 120;
+
+            root.LayoutManager.ExecuteLayoutPass();
+            Assert.Equal(new Size(120, 100), arrangeSize);
+        }
+
+        [Fact]
+        public void Invalidating_Child_Remeasures_Parent()
+        {
+            Border border;
+            StackPanel panel;
+
+            var root = new LayoutTestRoot
+            {
+                Child = panel = new StackPanel
+                {
+                    Children =
+                    {
+                        (border = new Border())
+                    }
+                }
+            };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            Assert.Equal(new Size(0, 0), root.DesiredSize);
+
+            border.Width = 100;
+            border.Height = 100;
+
+            root.LayoutManager.ExecuteLayoutPass();
+            Assert.Equal(new Size(100, 100), panel.DesiredSize);
+        }
+
+        [Fact]
+        public void LayoutManager_Should_Prevent_Infinite_Loop_On_Measure()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = false;
+
+            int cnt = 0;
+            int maxcnt = 100;
+            control.DoMeasureOverride = (l, s) =>
+            {
+                //emulate a problem in the logic of a control that triggers
+                //invalidate measure during measure
+                //it can lead to an infinite loop in layoutmanager
+                if (++cnt < maxcnt)
+                {
+                    control.InvalidateMeasure();
+                }
+
+                return new Size(100, 100);
+            };
+
+            control.InvalidateMeasure();
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.True(cnt < 100);
+        }
+
+        [Fact]
+        public void LayoutManager_Should_Prevent_Infinite_Loop_On_Arrange()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Arranged = false;
+
+            int cnt = 0;
+            int maxcnt = 100;
+            control.DoArrangeOverride = (l, s) =>
+            {
+                //emulate a problem in the logic of a control that triggers
+                //invalidate measure during arrange
+                //it can lead to infinity loop in layoutmanager
+                if (++cnt < maxcnt)
+                {
+                    control.InvalidateArrange();
+                }
+
+                return new Size(100, 100);
+            };
+
+            control.InvalidateArrange();
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.True(cnt < 100);
+        }
+
+        [Fact]
+        public void LayoutManager_Should_Properly_Arrange_Visuals_Even_When_There_Are_Issues_With_Previous_Arranged()
+        {
+            var nonArrageableTargets = Enumerable.Range(1, 10).Select(_ => new LayoutTestControl()).ToArray();
+            var targets = Enumerable.Range(1, 10).Select(_ => new LayoutTestControl()).ToArray();
+
+            StackPanel panel;
+
+            var root = new LayoutTestRoot
+            {
+                Child = panel = new StackPanel()
+            };
+
+            panel.Children.AddRange(nonArrageableTargets);
+            panel.Children.AddRange(targets);
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            foreach (var c in panel.Children.OfType<LayoutTestControl>())
+            {
+                c.Measured = c.Arranged = false;
+                c.InvalidateMeasure();
+            }
+
+            foreach (var c in nonArrageableTargets)
+            {
+                c.DoArrangeOverride = (l, s) =>
+                {
+                    //emulate a problem in the logic of a control that triggers
+                    //invalidate measure during arrange
+                    c.InvalidateMeasure();
+                    return new Size(100, 100);
+                };
+            }
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            //altough nonArrageableTargets has rubbish logic and can't be measured/arranged properly
+            //layoutmanager should process properly other visuals
+            Assert.All(targets, c => Assert.True(c.Arranged));
+        }
+
+
+        [Fact]
+        public void LayoutManager_Should_Recover_From_Infinite_Loop_On_Measure()
+        {
+            // Test for issue #3041.
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = false;
+
+            control.DoMeasureOverride = (l, s) =>
+            {
+                control.InvalidateMeasure();
+                return new Size(100, 100);
+            };
+
+            control.InvalidateMeasure();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            // This is the important part: running a second layout pass in which we exceed the maximum
+            // retries causes LayoutQueue<T>.Info.Count to exceed _maxEnqueueCountPerLoop.
+            root.LayoutManager.ExecuteLayoutPass();
+
+            control.Measured = false;
+            control.DoMeasureOverride = null;
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.True(control.Measured);
+            Assert.True(control.IsMeasureValid);
+        }
+
+        [Fact]
+        public void Calling_ExecuteLayoutPass_From_ExecuteInitialLayoutPass_Does_Not_Break_Measure()
+        {
+            // Test for issue #3550.
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+            var count = 0;
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = false;
+
+            control.DoMeasureOverride = (l, s) =>
+            {
+                if (count++ == 0)
+                {
+                    control.InvalidateMeasure();
+                    root.LayoutManager.ExecuteLayoutPass();
+                    return new Size(100, 100);
+                }
+                else
+                {
+                    return new Size(200, 200);
+                }
+            };
+
+            root.InvalidateMeasure();
+            control.InvalidateMeasure();
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            Assert.Equal(new Size(200, 200), control.Bounds.Size);
+            Assert.Equal(new Size(200, 200), control.DesiredSize);
+        }
+        
+        [Fact]
+        public void LayoutManager_Execute_Layout_Pass_Should_Clear_Queued_LayoutPasses()
+        {
+            var control = new LayoutTestControl();
+            var root = new LayoutTestRoot { Child = control };
+
+            int layoutCount = 0;
+            root.LayoutUpdated += (_, _) => layoutCount++;
+
+            root.LayoutManager.InvalidateArrange(control);
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Layout);
+            
+            Assert.Equal(1, layoutCount);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutQueueTests.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutQueueTests.cs
new file mode 100644
index 0000000000..fc3b5c3d43
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutQueueTests.cs
@@ -0,0 +1,197 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Layout;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class LayoutQueueTests
+    {
+        [Fact]
+        public void Should_Enqueue()
+        {
+            var target = new LayoutQueue<string>(_ => true);
+            var refQueue = new Queue<string>();
+            var items = new[] { "1", "2", "3" };
+
+            foreach (var item in items)
+            {
+                target.Enqueue(item);
+                refQueue.Enqueue(item);
+            }
+
+            Assert.Equal(refQueue, target);
+        }
+
+        [Fact]
+        public void Should_Dequeue()
+        {
+            var target = new LayoutQueue<string>(_ => true);
+            var refQueue = new Queue<string>();
+            var items = new[] { "1", "2", "3" };
+
+            foreach (var item in items)
+            {
+                target.Enqueue(item);
+                refQueue.Enqueue(item);
+            }
+
+            while (refQueue.Count > 0)
+            {
+                Assert.Equal(refQueue.Dequeue(), target.Dequeue());
+            }
+        }
+
+        [Fact]
+        public void Should_Enqueue_UniqueElements()
+        {
+            var target = new LayoutQueue<string>(_ => true);
+
+            var items = new[] { "1", "2", "3", "1" };
+
+            foreach (var item in items)
+            {
+                target.Enqueue(item);
+            }
+
+            Assert.Equal(3, target.Count);
+            Assert.Equal(items.Take(3), target);
+        }
+
+        [Fact]
+        public void Shouldnt_Enqueue_More_Than_Limit_In_Loop()
+        {
+            var target = new LayoutQueue<string>(_ => true);
+
+            //1
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.BeginLoop(3);
+
+            target.Dequeue();
+
+            //2
+            target.Enqueue("Foo");
+            target.Dequeue();
+
+            //3
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.Dequeue();
+
+            //4 more than limit shouldn't be added
+            target.Enqueue("Foo");
+
+            Assert.Equal(0, target.Count);
+        }
+
+        [Fact]
+        public void Shouldnt_Count_Unique_Enqueue_For_Limit_In_Loop()
+        {
+            var target = new LayoutQueue<string>(_ => true);
+
+            //1
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.BeginLoop(3);
+
+            target.Dequeue();
+
+            //2
+            target.Enqueue("Foo");
+            target.Enqueue("Foo");
+            target.Dequeue();
+
+            //3
+            target.Enqueue("Foo");
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.Dequeue();
+
+            //4 more than limit shouldn't be added
+            target.Enqueue("Foo");
+
+            Assert.Equal(0, target.Count);
+        }
+
+        [Fact]
+        public void Should_Enqueue_When_Condition_True_After_Loop_When_Limit_Met()
+        {
+            var target = new LayoutQueue<string>(_ => true);
+
+            //1
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.BeginLoop(3);
+
+            target.Dequeue();
+
+            //2
+            target.Enqueue("Foo");
+            target.Dequeue();
+
+            //3
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.Dequeue();
+
+            //4 more than limit shouldn't be added to queue
+            target.Enqueue("Foo");
+
+            Assert.Equal(0, target.Count);
+
+            target.EndLoop();
+
+            //after loop should be added once
+            Assert.Equal(1, target.Count);
+            Assert.Equal("Foo", target.First());
+        }
+
+        [Fact]
+        public void Shouldnt_Enqueue_When_Condition_False_After_Loop_When_Limit_Met()
+        {
+            var target = new LayoutQueue<string>(_ => false);
+
+            //1
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.BeginLoop(3);
+
+            target.Dequeue();
+
+            //2
+            target.Enqueue("Foo");
+            target.Dequeue();
+
+            //3
+            target.Enqueue("Foo");
+
+            Assert.Equal(1, target.Count);
+
+            target.Dequeue();
+
+            //4 more than limit shouldn't be added
+            target.Enqueue("Foo");
+
+            Assert.Equal(0, target.Count);
+
+            target.EndLoop();
+
+            Assert.Equal(0, target.Count);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutTestControl.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutTestControl.cs
new file mode 100644
index 0000000000..ca593cc665
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutTestControl.cs
@@ -0,0 +1,30 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Layout;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    internal class LayoutTestControl : Decorator
+    {
+        public bool Measured { get; set; }
+        public bool Arranged { get; set; }
+        public Func<ILayoutable, Size, Size> DoMeasureOverride { get; set; }
+        public Func<ILayoutable, Size, Size> DoArrangeOverride { get; set; }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            Measured = true;
+            return DoMeasureOverride != null ?
+                DoMeasureOverride(this, availableSize) :
+                base.MeasureOverride(availableSize);
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            Arranged = true;
+            return DoArrangeOverride != null ?
+                DoArrangeOverride(this, finalSize) :
+                base.ArrangeOverride(finalSize);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutTestRoot.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutTestRoot.cs
new file mode 100644
index 0000000000..19ab54a339
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutTestRoot.cs
@@ -0,0 +1,41 @@
+using System;
+using Avalonia.Layout;
+using Avalonia.UnitTests;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    internal class LayoutTestRoot : TestRoot, ILayoutable
+    {
+        public bool Measured { get; set; }
+        public bool Arranged { get; set; }
+        public Func<ILayoutable, Size, Size> DoMeasureOverride { get; set; }
+        public Func<ILayoutable, Size, Size> DoArrangeOverride { get; set; }
+
+        void ILayoutable.Measure(Size availableSize)
+        {
+            Measured = true;
+            Measure(availableSize);
+        }
+
+        void ILayoutable.Arrange(Rect rect)
+        {
+            Arranged = true;
+            Arrange(rect);
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            return DoMeasureOverride != null ?
+                DoMeasureOverride(this, availableSize) :
+                base.MeasureOverride(availableSize);
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            Arranged = true;
+            return DoArrangeOverride != null ?
+                DoArrangeOverride(this, finalSize) :
+                base.ArrangeOverride(finalSize);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests.cs
new file mode 100644
index 0000000000..184aada6cd
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests.cs
@@ -0,0 +1,440 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class LayoutableTests
+    {
+        [Theory]
+        [InlineData(0, 0, 0, 0, 100, 100)]
+        [InlineData(10, 0, 0, 0, 90, 100)]
+        [InlineData(10, 0, 5, 0, 85, 100)]
+        [InlineData(0, 10, 0, 0, 100, 90)]
+        [InlineData(0, 10, 0, 5, 100, 85)]
+        [InlineData(4, 4, 6, 7, 90, 89)]
+        public void Margin_Is_Applied_To_MeasureOverride_Size(
+            double l,
+            double t,
+            double r,
+            double b,
+            double expectedWidth,
+            double expectedHeight)
+        {
+            var target = new TestLayoutable
+            {
+                Margin = new Thickness(l, t, r, b),
+            };
+
+            target.Measure(new Size(100, 100));
+
+            Assert.Equal(new Size(expectedWidth, expectedHeight), target.MeasureSize);
+        }
+
+        [Theory]
+        [InlineData(HorizontalAlignment.Stretch, 100)]
+        [InlineData(HorizontalAlignment.Left, 10)]
+        [InlineData(HorizontalAlignment.Center, 10)]
+        [InlineData(HorizontalAlignment.Right, 10)]
+        public void HorizontalAlignment_Is_Applied_To_ArrangeOverride_Size(
+            HorizontalAlignment h,
+            double expectedWidth)
+        {
+            var target = new TestLayoutable
+            {
+                HorizontalAlignment = h,
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Size(expectedWidth, 100), target.ArrangeSize);
+        }
+
+        [Theory]
+        [InlineData(VerticalAlignment.Stretch, 100)]
+        [InlineData(VerticalAlignment.Top, 10)]
+        [InlineData(VerticalAlignment.Center, 10)]
+        [InlineData(VerticalAlignment.Bottom, 10)]
+        public void VerticalAlignment_Is_Applied_To_ArrangeOverride_Size(
+            VerticalAlignment v,
+            double expectedHeight)
+        {
+            var target = new TestLayoutable
+            {
+                VerticalAlignment = v,
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Size(100, expectedHeight), target.ArrangeSize);
+        }
+
+        [Theory]
+        [InlineData(0, 0, 0, 0, 100, 100)]
+        [InlineData(10, 0, 0, 0, 90, 100)]
+        [InlineData(10, 0, 5, 0, 85, 100)]
+        [InlineData(0, 10, 0, 0, 100, 90)]
+        [InlineData(0, 10, 0, 5, 100, 85)]
+        [InlineData(4, 4, 6, 7, 90, 89)]
+        public void Margin_Is_Applied_To_ArrangeOverride_Size(
+            double l,
+            double t,
+            double r,
+            double b,
+            double expectedWidth,
+            double expectedHeight)
+        {
+            var target = new TestLayoutable
+            {
+                Margin = new Thickness(l, t, r, b),
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Size(expectedWidth, expectedHeight), target.ArrangeSize);
+        }
+
+        [Fact]
+        public void Only_Calls_LayoutManager_InvalidateMeasure_Once()
+        {
+            var target = new Mock<ILayoutManager>();
+            var control = new Decorator();
+            var root = new LayoutTestRoot
+            {
+                Child = control,
+                LayoutManager = target.Object,
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+            target.Invocations.Clear();
+
+            control.InvalidateMeasure();
+            control.InvalidateMeasure();
+
+            target.Verify(x => x.InvalidateMeasure(control), Times.Once());
+        }
+
+        [Fact]
+        public void Only_Calls_LayoutManager_InvalidateArrange_Once()
+        {
+            var target = new Mock<ILayoutManager>();
+            var control = new Decorator();
+            var root = new LayoutTestRoot
+            {
+                Child = control,
+                LayoutManager = target.Object,
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+            target.Invocations.Clear();
+
+            control.InvalidateArrange();
+            control.InvalidateArrange();
+
+            target.Verify(x => x.InvalidateArrange(control), Times.Once());
+        }
+
+        [Fact]
+        public void Attaching_Control_To_Tree_Invalidates_Parent_Measure()
+        {
+            var target = new Mock<ILayoutManager>();
+            var control = new Decorator();
+            var root = new LayoutTestRoot
+            {
+                Child = control,
+                LayoutManager = target.Object,
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+            Assert.True(control.IsMeasureValid);
+
+            root.Child = null;
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+
+            Assert.False(control.IsMeasureValid);
+            Assert.True(root.IsMeasureValid);
+
+            target.Invocations.Clear();
+
+            root.Child = control;
+
+            Assert.False(root.IsMeasureValid);
+            Assert.False(control.IsMeasureValid);
+            target.Verify(x => x.InvalidateMeasure(root), Times.Once());
+        }
+
+        [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);
+        }
+
+        [Fact]
+        public void Making_Control_Invisible_Should_Invalidate_Parent_Measure()
+        {
+            Border child;
+            var target = new StackPanel
+            {
+                Children =
+                {
+                    (child = new Border
+                    {
+                        Width = 100,
+                    }),
+                }
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.True(target.IsMeasureValid);
+            Assert.True(target.IsArrangeValid);
+            Assert.True(child.IsMeasureValid);
+            Assert.True(child.IsArrangeValid);
+
+            child.IsVisible = false;
+
+            Assert.False(target.IsMeasureValid);
+            Assert.False(target.IsArrangeValid);
+            Assert.True(child.IsMeasureValid);
+            Assert.True(child.IsArrangeValid);
+        }
+
+        [Fact]
+        public void Making_Control_Visible_Should_Invalidate_Own_And_Parent_Measure()
+        {
+            Border child;
+            var target = new StackPanel
+            {
+                Children =
+                {
+                    (child = new Border
+                    {
+                        Width = 100,
+                        IsVisible = false,
+                    }),
+                }
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.True(target.IsMeasureValid);
+            Assert.True(target.IsArrangeValid);
+            Assert.True(child.IsMeasureValid);
+            Assert.False(child.IsArrangeValid);
+
+            child.IsVisible = true;
+
+            Assert.False(target.IsMeasureValid);
+            Assert.False(target.IsArrangeValid);
+            Assert.False(child.IsMeasureValid);
+            Assert.False(child.IsArrangeValid);
+        }
+
+        [Fact]
+        public void Measuring_Invisible_Control_Should_Not_Invalidate_Parent_Measure()
+        {
+            Border child;
+            var target = new StackPanel
+            {
+                Children =
+                {
+                    (child = new Border
+                    {
+                        Width = 100,
+                    }),
+                }
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.True(target.IsMeasureValid);
+            Assert.True(target.IsArrangeValid);
+            Assert.Equal(new Size(100, 0), child.DesiredSize);
+
+            child.IsVisible = false;
+            Assert.Equal(default, child.DesiredSize);
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            target.Arrange(new Rect(target.DesiredSize));
+            child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+
+            Assert.True(target.IsMeasureValid);
+            Assert.True(target.IsArrangeValid);
+            Assert.Equal(default, child.DesiredSize);
+        }
+
+        private class TestLayoutable : Layoutable
+        {
+            public Size ArrangeSize { get; private set; }
+            public Size MeasureResult { get; set; } = new Size(10, 10);
+            public Size MeasureSize { get; private set; }
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                MeasureSize = availableSize;
+                return MeasureResult;
+            }
+
+            protected override Size ArrangeOverride(Size finalSize)
+            {
+                ArrangeSize = finalSize;
+                return base.ArrangeOverride(finalSize);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs
new file mode 100644
index 0000000000..7c1a525002
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs
@@ -0,0 +1,427 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class LayoutableTests_EffectiveViewportChanged
+    {
+        [Fact]
+        public async Task EffectiveViewportChanged_Not_Raised_When_Control_Added_To_Tree()
+        {
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+            await RunOnUIThread.Execute(async () =>
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
+            {
+                var root = CreateRoot();
+                var target = new Canvas();
+                var raised = 0;
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    ++raised;
+                };
+
+                root.Child = target;
+
+                Assert.Equal(0, raised);
+            });
+        }
+
+        [Fact]
+        public async Task EffectiveViewportChanged_Raised_Before_LayoutUpdated()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas();
+                var raised = 0;
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    ++raised;
+                };
+
+                root.Child = target;
+
+                await ExecuteInitialLayoutPass(root);
+
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Parent_Affects_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 100, Height = 100 };
+                var parent = new Border { Width = 200, Height = 200, Child = target };
+                var raised = 0;
+
+                root.Child = parent;
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    Assert.Equal(new Rect(-550, -400, 1200, 900), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                await ExecuteInitialLayoutPass(root);
+            });
+        }
+
+        [Fact]
+        public async Task Invalidating_In_Handler_Causes_Layout_To_Be_Rerun_Before_LayoutUpdated_Raised()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new TestCanvas();
+                var raised = 0;
+                var layoutUpdatedRaised = 0;
+
+                root.LayoutUpdated += (s, e) =>
+                {
+                    Assert.Equal(2, target.MeasureCount);
+                    Assert.Equal(2, target.ArrangeCount);
+                    ++layoutUpdatedRaised;
+                };
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    target.InvalidateMeasure();
+                    ++raised;
+                };
+
+                root.Child = target;
+
+                await ExecuteInitialLayoutPass(root);
+
+                Assert.Equal(1, raised);
+                Assert.Equal(1, layoutUpdatedRaised);
+            });
+        }
+
+        [Fact]
+        public async Task Viewport_Extends_Beyond_Centered_Control()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 52, Height = 52, };
+                var raised = 0;
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    Assert.Equal(new Rect(-574, -424, 1200, 900), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                root.Child = target;
+
+                await ExecuteInitialLayoutPass(root);
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Viewport_Extends_Beyond_Nested_Centered_Control()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 52, Height = 52 };
+                var parent = new Border { Width = 100, Height = 100, Child = target };
+                var raised = 0;
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    Assert.Equal(new Rect(-574, -424, 1200, 900), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                root.Child = parent;
+
+                await ExecuteInitialLayoutPass(root);
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task ScrollViewer_Determines_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 200, Height = 200 };
+                var scroller = new ScrollViewer { Width = 100, Height = 100, Content = target, Template = ScrollViewerTemplate(), HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden };
+                var raised = 0;
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    Assert.Equal(new Rect(0, 0, 100, 100), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                root.Child = scroller;
+
+                await ExecuteInitialLayoutPass(root);
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Scrolled_ScrollViewer_Determines_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 200, Height = 200 };
+                var scroller = new ScrollViewer { Width = 100, Height = 100, Content = target, Template = ScrollViewerTemplate(), HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden };
+                var raised = 0;
+
+                root.Child = scroller;
+
+                await ExecuteInitialLayoutPass(root);
+                scroller.Offset = new Vector(0, 10);
+
+                await ExecuteScrollerLayoutPass(root, scroller, target, (s, e) =>
+                {
+                    Assert.Equal(new Rect(0, 10, 100, 100), e.EffectiveViewport);
+                    ++raised;
+                });
+
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Moving_Parent_Updates_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 100, Height = 100 };
+                var parent = new Border { Width = 200, Height = 200, Child = target };
+                var raised = 0;
+
+                root.Child = parent;
+
+                await ExecuteInitialLayoutPass(root);
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    Assert.Equal(new Rect(-554, -400, 1200, 900), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                parent.Margin = new Thickness(8, 0, 0, 0);
+                await ExecuteLayoutPass(root);
+
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Translate_Transform_Doesnt_Affect_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 100, Height = 100 };
+                var parent = new Border { Width = 200, Height = 200, Child = target };
+                var raised = 0;
+
+                root.Child = parent;
+
+                await ExecuteInitialLayoutPass(root);
+                target.EffectiveViewportChanged += (s, e) => ++raised;
+                target.RenderTransform = new TranslateTransform { X = 8 };
+                target.InvalidateMeasure();
+                await ExecuteLayoutPass(root);
+
+                Assert.Equal(0, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Translate_Transform_On_Parent_Affects_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 100, Height = 100 };
+                var parent = new Border { Width = 200, Height = 200, Child = target };
+                var raised = 0;
+
+                root.Child = parent;
+
+                await ExecuteInitialLayoutPass(root);
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    Assert.Equal(new Rect(-558, -400, 1200, 900), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                // Change the parent render transform to move it. A layout is then needed before
+                // EffectiveViewportChanged is raised.
+                parent.RenderTransform = new TranslateTransform { X = 8 };
+                parent.InvalidateMeasure();
+                await ExecuteLayoutPass(root);
+
+                Assert.Equal(1, raised);
+            });
+        }
+
+        [Fact]
+        public async Task Rotate_Transform_On_Parent_Affects_EffectiveViewport()
+        {
+            await RunOnUIThread.Execute(async () =>
+            {
+                var root = CreateRoot();
+                var target = new Canvas { Width = 100, Height = 100 };
+                var parent = new Border { Width = 200, Height = 200, Child = target };
+                var raised = 0;
+
+                root.Child = parent;
+
+                await ExecuteInitialLayoutPass(root);
+
+                target.EffectiveViewportChanged += (s, e) =>
+                {
+                    AssertArePixelEqual(new Rect(-651, -792, 1484, 1484), e.EffectiveViewport);
+                    ++raised;
+                };
+
+                parent.RenderTransformOrigin = new RelativePoint(0, 0, RelativeUnit.Absolute);
+                parent.RenderTransform = new RotateTransform { Angle = 45 };
+                parent.InvalidateMeasure();
+                await ExecuteLayoutPass(root);
+
+                Assert.Equal(1, raised);
+            });
+        }
+
+        private TestRoot CreateRoot() => new TestRoot { Width = 1200, Height = 900 };
+
+        private Task ExecuteInitialLayoutPass(TestRoot root)
+        {
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            return Task.CompletedTask;
+        }
+
+        private Task ExecuteLayoutPass(TestRoot root)
+        {
+            root.LayoutManager.ExecuteLayoutPass();
+            return Task.CompletedTask;
+        }
+
+        private Task ExecuteScrollerLayoutPass(
+            TestRoot root,
+            ScrollViewer scroller,
+            Control target,
+            Action<object, EffectiveViewportChangedEventArgs> handler)
+        {
+            void ViewportChanged(object sender, EffectiveViewportChangedEventArgs e)
+            {
+                handler(sender, e);
+            }
+
+            target.EffectiveViewportChanged += ViewportChanged;
+            root.LayoutManager.ExecuteLayoutPass();
+            return Task.CompletedTask;
+        }
+        private IControlTemplate ScrollViewerTemplate()
+        {
+            return new FuncControlTemplate<ScrollViewer>((control, scope) => new Grid
+            {
+                ColumnDefinitions = new ColumnDefinitions
+                {
+                    new ColumnDefinition(1, GridUnitType.Star),
+                    new ColumnDefinition(GridLength.Auto),
+                },
+                RowDefinitions = new RowDefinitions
+                {
+                    new RowDefinition(1, GridUnitType.Star),
+                    new RowDefinition(GridLength.Auto),
+                },
+                Children =
+                {
+                    new ScrollContentPresenter
+                    {
+                        Name = "PART_ContentPresenter",
+                        [~ContentPresenter.ContentProperty] = control[~ContentControl.ContentProperty],
+                        [~~ScrollContentPresenter.ExtentProperty] = control[~~ScrollViewer.ExtentProperty],
+                        [~~ScrollContentPresenter.OffsetProperty] = control[~~ScrollViewer.OffsetProperty],
+                        [~~ScrollContentPresenter.ViewportProperty] = control[~~ScrollViewer.ViewportProperty],
+                        [~ScrollContentPresenter.CanHorizontallyScrollProperty] = control[~ScrollViewer.CanHorizontallyScrollProperty],
+                        [~ScrollContentPresenter.CanVerticallyScrollProperty] = control[~ScrollViewer.CanVerticallyScrollProperty],
+                    }.RegisterInNameScope(scope),
+                    new ScrollBar
+                    {
+                        Name = "horizontalScrollBar",
+                        Orientation = Orientation.Horizontal,
+                        [~RangeBase.MaximumProperty] = control[~ScrollViewer.HorizontalScrollBarMaximumProperty],
+                        [~~RangeBase.ValueProperty] = control[~~ScrollViewer.HorizontalScrollBarValueProperty],
+                        [~ScrollBar.ViewportSizeProperty] = control[~ScrollViewer.HorizontalScrollBarViewportSizeProperty],
+                        [~ScrollBar.VisibilityProperty] = control[~ScrollViewer.HorizontalScrollBarVisibilityProperty],
+                        [Grid.RowProperty] = 1,
+                    }.RegisterInNameScope(scope),
+                    new ScrollBar
+                    {
+                        Name = "verticalScrollBar",
+                        Orientation = Orientation.Vertical,
+                        [~RangeBase.MaximumProperty] = control[~ScrollViewer.VerticalScrollBarMaximumProperty],
+                        [~~RangeBase.ValueProperty] = control[~~ScrollViewer.VerticalScrollBarValueProperty],
+                        [~ScrollBar.ViewportSizeProperty] = control[~ScrollViewer.VerticalScrollBarViewportSizeProperty],
+                        [~ScrollBar.VisibilityProperty] = control[~ScrollViewer.VerticalScrollBarVisibilityProperty],
+                        [Grid.ColumnProperty] = 1,
+                    }.RegisterInNameScope(scope),
+                },
+            });
+        }
+
+        private void AssertArePixelEqual(Rect expected, Rect actual)
+        {
+            var expectedRounded = new Rect((int)expected.X, (int)expected.Y, (int)expected.Width, (int)expected.Height);
+            var actualRounded = new Rect((int)actual.X, (int)actual.Y, (int)actual.Width, (int)actual.Height);
+            Assert.Equal(expectedRounded, actualRounded);
+        }
+
+        private class TestCanvas : Canvas
+        {
+            public int MeasureCount { get; private set; }
+            public int ArrangeCount { get; private set; }
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                ++MeasureCount;
+                return base.MeasureOverride(availableSize);
+            }
+
+            protected override Size ArrangeOverride(Size finalSize)
+            {
+                ++ArrangeCount;
+                return base.ArrangeOverride(finalSize);
+            }
+        }
+
+        private static class RunOnUIThread
+        {
+            public static async Task Execute(Func<Task> func)
+            {
+                await func();
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/MeasureTests.cs b/tests/Avalonia.Base.UnitTests/Layout/MeasureTests.cs
new file mode 100644
index 0000000000..32c3e89b74
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/MeasureTests.cs
@@ -0,0 +1,154 @@
+using Avalonia.Controls;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class MeasureTests
+    {
+        [Fact]
+        public void Margin_Should_Be_Included_In_DesiredSize()
+        {
+            var decorator = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Margin = new Thickness(8),
+            };
+
+            decorator.Measure(Size.Infinity);
+
+            Assert.Equal(new Size(116, 116), decorator.DesiredSize);
+        }
+
+        [Fact]
+        public void Invalidating_Child_Should_Not_Invalidate_Parent()
+        {
+            var panel = new StackPanel();
+            var child = new Border();
+            panel.Children.Add(child);
+
+            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+
+            Assert.Equal(new Size(0, 0), panel.DesiredSize);
+
+            child.Width = 100;
+            child.Height = 100;
+
+            Assert.True(panel.IsMeasureValid);
+            Assert.False(child.IsMeasureValid);
+
+            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            Assert.Equal(new Size(0, 0), panel.DesiredSize);
+        }
+
+        [Fact]
+        public void Removing_From_Parent_Should_Invalidate_Measure_Of_Control_And_Descendants()
+        {
+            var panel = new StackPanel();
+            var child2 = new Border();
+            var child1 = new Border { Child = child2 };
+            panel.Children.Add(child1);
+
+            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            Assert.True(child1.IsMeasureValid);
+            Assert.True(child2.IsMeasureValid);
+
+            panel.Children.Remove(child1);
+            Assert.False(child1.IsMeasureValid);
+            Assert.False(child2.IsMeasureValid);
+        }
+
+        [Fact]
+        public void Negative_Margin_Larger_Than_Constraint_Should_Request_Width_0()
+        {
+            Control target;
+
+            var outer = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Child = target = new Control
+                {
+                    Margin = new Thickness(-100, 0, 0, 0),
+                }
+            };
+
+            outer.Measure(Size.Infinity);
+
+            Assert.Equal(0, target.DesiredSize.Width);
+        }
+
+        [Fact]
+        public void Negative_Margin_Larger_Than_Constraint_Should_Request_Height_0()
+        {
+            Control target;
+
+            var outer = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Child = target = new Control
+                {
+                    Margin = new Thickness(0, -100, 0, 0),
+                }
+            };
+
+            outer.Measure(Size.Infinity);
+
+            Assert.Equal(0, target.DesiredSize.Height);
+        }
+
+        [Fact]
+        public void Margin_Should_Affect_AvailableSize()
+        {
+            MeasureTest target;
+
+            var outer = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Child = target = new MeasureTest
+                {
+                    Margin = new Thickness(10),
+                }
+            };
+
+            outer.Measure(Size.Infinity);
+
+            Assert.Equal(new Size(80, 80), target.AvailableSize);
+        }
+
+        [Fact]
+        public void Margin_Should_Be_Applied_Before_Width_Height()
+        {
+            MeasureTest target;
+
+            var outer = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Child = target = new MeasureTest
+                {
+                    Width = 80,
+                    Height = 80,
+                    Margin = new Thickness(10),
+                }
+            };
+
+            outer.Measure(Size.Infinity);
+
+            Assert.Equal(new Size(80, 80), target.AvailableSize);
+        }
+
+        class MeasureTest : Control
+        {
+            public Size? AvailableSize { get; private set; }
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                AvailableSize = availableSize;
+                return availableSize;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs b/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs
new file mode 100644
index 0000000000..78cf63ed3f
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs
@@ -0,0 +1,336 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Layout
+{
+    public class NonVirtualizingStackLayoutTests
+    {
+        [Fact]
+        public void Lays_Out_Children_Vertically()
+        {
+            var target = new NonVirtualizingStackLayout { Orientation = Orientation.Vertical };
+            var context = CreateContext(new[]
+            {
+                new Border { Height = 20, Width = 120 },
+                new Border { Height = 30 },
+                new Border { Height = 50 },
+            });
+
+            var desiredSize = target.Measure(context, Size.Infinity);
+            var arrangeSize = target.Arrange(context, desiredSize);
+
+            Assert.Equal(new Size(120, 100), desiredSize);
+            Assert.Equal(new Size(120, 100), arrangeSize);
+            Assert.Equal(new Rect(0, 0, 120, 20), context.Children[0].Bounds);
+            Assert.Equal(new Rect(0, 20, 120, 30), context.Children[1].Bounds);
+            Assert.Equal(new Rect(0, 50, 120, 50), context.Children[2].Bounds);
+        }
+
+        [Fact]
+        public void Lays_Out_Children_Horizontally()
+        {
+            var target = new NonVirtualizingStackLayout { Orientation = Orientation.Horizontal };
+            var context = CreateContext(new[]
+            {
+                new Border { Width = 20, Height = 120 },
+                new Border { Width = 30 },
+                new Border { Width = 50 },
+            });
+
+            var desiredSize = target.Measure(context, Size.Infinity);
+            var arrangeSize = target.Arrange(context, desiredSize);
+
+            Assert.Equal(new Size(100, 120), desiredSize);
+            Assert.Equal(new Size(100, 120), arrangeSize);
+            Assert.Equal(new Rect(0, 0, 20, 120), context.Children[0].Bounds);
+            Assert.Equal(new Rect(20, 0, 30, 120), context.Children[1].Bounds);
+            Assert.Equal(new Rect(50, 0, 50, 120), context.Children[2].Bounds);
+        }
+
+        [Fact]
+        public void Lays_Out_Children_Vertically_With_Spacing()
+        {
+            var target = new NonVirtualizingStackLayout 
+            { 
+                Orientation = Orientation.Vertical,
+                Spacing = 10,
+            };
+
+            var context = CreateContext(new[]
+            {
+                new Border { Height = 20, Width = 120 },
+                new Border { Height = 30 },
+                new Border { Height = 50 },
+            });
+
+            var desiredSize = target.Measure(context, Size.Infinity);
+            var arrangeSize = target.Arrange(context, desiredSize);
+
+            Assert.Equal(new Size(120, 120), desiredSize);
+            Assert.Equal(new Size(120, 120), arrangeSize);
+            Assert.Equal(new Rect(0, 0, 120, 20), context.Children[0].Bounds);
+            Assert.Equal(new Rect(0, 30, 120, 30), context.Children[1].Bounds);
+            Assert.Equal(new Rect(0, 70, 120, 50), context.Children[2].Bounds);
+        }
+
+        [Fact]
+        public void Lays_Out_Children_Horizontally_With_Spacing()
+        {
+            var target = new NonVirtualizingStackLayout 
+            { 
+                Orientation = Orientation.Horizontal,
+                Spacing = 10,
+            };
+
+            var context = CreateContext(new[]
+            {
+                new Border { Width = 20, Height = 120 },
+                new Border { Width = 30 },
+                new Border { Width = 50 },
+            });
+
+            var desiredSize = target.Measure(context, Size.Infinity);
+            var arrangeSize = target.Arrange(context, desiredSize);
+
+            Assert.Equal(new Size(120, 120), desiredSize);
+            Assert.Equal(new Size(120, 120), arrangeSize);
+            Assert.Equal(new Rect(0, 0, 20, 120), context.Children[0].Bounds);
+            Assert.Equal(new Rect(30, 0, 30, 120), context.Children[1].Bounds);
+            Assert.Equal(new Rect(70, 0, 50, 120), context.Children[2].Bounds);
+        }
+
+        [Fact]
+        public void Arranges_Vertical_Children_With_Correct_Bounds()
+        {
+            var target = new NonVirtualizingStackLayout
+            {
+                Orientation = Orientation.Vertical
+            };
+            
+            var context = CreateContext(new[]
+            {
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Left,
+                    MeasureSize = new Size(50, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Left,
+                    MeasureSize = new Size(150, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    MeasureSize = new Size(50, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    MeasureSize = new Size(150, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Right,
+                    MeasureSize = new Size(50, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Right,
+                    MeasureSize = new Size(150, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    MeasureSize = new Size(50, 10),
+                },
+                new TestControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    MeasureSize = new Size(150, 10),
+                },
+            });
+
+            var desiredSize = target.Measure(context, new Size(100, 150));
+            Assert.Equal(new Size(100, 80), desiredSize);
+
+            target.Arrange(context, desiredSize);
+
+            var bounds = context.Children.Select(x => x.Bounds).ToArray();
+
+            Assert.Equal(
+                new[]
+                {
+                    new Rect(0, 0, 50, 10),
+                    new Rect(0, 10, 100, 10),
+                    new Rect(25, 20, 50, 10),
+                    new Rect(0, 30, 100, 10),
+                    new Rect(50, 40, 50, 10),
+                    new Rect(0, 50, 100, 10),
+                    new Rect(0, 60, 100, 10),
+                    new Rect(0, 70, 100, 10),
+
+                }, bounds);
+        }
+
+        [Fact]
+        public void Arranges_Horizontal_Children_With_Correct_Bounds()
+        {
+            var target = new NonVirtualizingStackLayout
+            {
+                Orientation = Orientation.Horizontal
+            };
+
+            var context = CreateContext(new[]
+            {
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Top,
+                    MeasureSize = new Size(10, 50),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Top,
+                    MeasureSize = new Size(10, 150),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Center,
+                    MeasureSize = new Size(10, 50),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Center,
+                    MeasureSize = new Size(10, 150),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Bottom,
+                    MeasureSize = new Size(10, 50),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Bottom,
+                    MeasureSize = new Size(10, 150),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                    MeasureSize = new Size(10, 50),
+                },
+                new TestControl
+                {
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                    MeasureSize = new Size(10, 150),
+                },
+            });
+
+            var desiredSize = target.Measure(context, new Size(150, 100));
+            Assert.Equal(new Size(80, 100), desiredSize);
+
+            target.Arrange(context, desiredSize);
+
+            var bounds = context.Children.Select(x => x.Bounds).ToArray();
+
+            Assert.Equal(
+                new[]
+                {
+                    new Rect(0, 0, 10, 50),
+                    new Rect(10, 0, 10, 100),
+                    new Rect(20, 25, 10, 50),
+                    new Rect(30, 0, 10, 100),
+                    new Rect(40, 50, 10, 50),
+                    new Rect(50, 0, 10, 100),
+                    new Rect(60, 0, 10, 100),
+                    new Rect(70, 0, 10, 100),
+                }, bounds);
+        }
+
+        [Theory]
+        [InlineData(Orientation.Horizontal)]
+        [InlineData(Orientation.Vertical)]
+        public void Spacing_Not_Added_For_Invisible_Children(Orientation orientation)
+        {
+            var targetThreeChildrenOneInvisble = new NonVirtualizingStackLayout
+            {
+                Orientation = orientation,
+                Spacing = 40,
+            };
+
+            var contextThreeChildrenOneInvisble = CreateContext(new[]
+            {
+                new StackPanel { Width = 10, Height= 10, IsVisible = false },
+                new StackPanel { Width = 10, Height= 10 },
+                new StackPanel { Width = 10, Height= 10 },
+            });
+
+            var targetTwoChildrenNoneInvisible = new NonVirtualizingStackLayout
+            {
+                Spacing = 40,
+                Orientation = orientation,
+            };
+
+            var contextTwoChildrenNoneInvisible = CreateContext(new[]
+            {
+                new StackPanel { Width = 10, Height = 10 },
+                new StackPanel { Width = 10, Height = 10 }
+            });
+
+            var desiredSize1 = targetThreeChildrenOneInvisble.Measure(contextThreeChildrenOneInvisble, Size.Infinity);
+            var desiredSize2 = targetTwoChildrenNoneInvisible.Measure(contextTwoChildrenNoneInvisible, Size.Infinity);
+ 
+            Assert.Equal(desiredSize2, desiredSize1);
+        }
+
+        [Theory]
+        [InlineData(Orientation.Horizontal)]
+        [InlineData(Orientation.Vertical)]
+        public void Only_Arrange_Visible_Children(Orientation orientation)
+        {
+            var hiddenPanel = new Panel { Width = 10, Height = 10, IsVisible = false };
+            var panel = new Panel { Width = 10, Height = 10 };
+
+            var target = new NonVirtualizingStackLayout
+            {
+                Spacing = 40,
+                Orientation = orientation,
+            };
+
+            var context = CreateContext(new[]
+            {
+                hiddenPanel,
+                panel
+            });
+
+            var desiredSize = target.Measure(context, Size.Infinity);
+            var arrangeSize = target.Arrange(context, desiredSize);
+            Assert.Equal(new Size(10, 10), arrangeSize);
+        }
+
+        private NonVirtualizingLayoutContext CreateContext(Control[] children)
+        {
+            return new TestLayoutContext(children);
+        }
+
+        private class TestLayoutContext : NonVirtualizingLayoutContext
+        {
+            public TestLayoutContext(Control[] children) => ChildrenCore = children;
+            protected override IReadOnlyList<ILayoutable> ChildrenCore { get; }
+        }
+
+        private class TestControl : Control
+        {
+            public Size MeasureConstraint { get; private set; }
+            public Size MeasureSize { get; set; }
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                MeasureConstraint = availableSize;
+                return MeasureSize;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/MatrixTests.cs b/tests/Avalonia.Base.UnitTests/MatrixTests.cs
new file mode 100644
index 0000000000..99fe4685d7
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/MatrixTests.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests;
+
+/// <summary>
+///  These tests use the "official" Matrix4x4 and Matrix3x2 from the System.Numerics namespace, to validate
+///  that Avalonias own implementation of a 3x3 Matrix works correctly.
+/// </summary>
+public class MatrixTests
+{
+    /// <summary>
+    ///  Because Avalonia is working internally with doubles, but System.Numerics Vector and Matrix implementations
+    ///  only make use of floats, we need to reduce precision, comparing them. It should be sufficient to compare
+    ///  5 fractional digits to ensure, that the result is correct.
+    /// </summary>
+    /// <param name="expected">The expected vector</param>
+    /// <param name="actual">The actual transformed point</param>
+    private void AssertCoordinatesEqualWithReducedPrecision(Vector2 expected, Point actual)
+    {
+        double ReducePrecision(double input) => Math.Truncate(input * 10000);
+        
+        var expectedX = ReducePrecision(expected.X);
+        var expectedY = ReducePrecision(expected.Y);
+        
+        var actualX = ReducePrecision(actual.X);
+        var actualY = ReducePrecision(actual.Y);
+        
+        Assert.Equal(expectedX, actualX);
+        Assert.Equal(expectedY, actualY);
+    }
+    
+    [Fact]
+    public void Transform_Point_Should_Return_Correct_Value_For_Translated_Matrix()
+    {
+        var vector2 = Vector2.Transform(
+            new Vector2(1, 1), 
+            Matrix3x2.CreateTranslation(2, 2));
+        var expected = new Point(vector2.X, vector2.Y);
+        
+        var matrix = Matrix.CreateTranslation(2, 2);
+        var point = new Point(1, 1);
+        var transformedPoint = matrix.Transform(point);
+        
+        Assert.Equal(expected, transformedPoint);
+    }
+    
+    [Fact]
+    public void Transform_Point_Should_Return_Correct_Value_For_Rotated_Matrix()
+    {
+        var expected = Vector2.Transform(
+            new Vector2(0, 10), 
+            Matrix3x2.CreateRotation((float)Matrix.ToRadians(45)));
+
+        var matrix = Matrix.CreateRotation(Matrix.ToRadians(45));
+        var point = new Point(0, 10);
+        var actual = matrix.Transform(point);
+
+        AssertCoordinatesEqualWithReducedPrecision(expected, actual);
+    }
+    
+    [Fact]
+    public void Transform_Point_Should_Return_Correct_Value_For_Scaled_Matrix()
+    {
+        var vector2 = Vector2.Transform(
+            new Vector2(1, 1), 
+            Matrix3x2.CreateScale(2, 2));
+        var expected = new Point(vector2.X, vector2.Y);
+        var matrix = Matrix.CreateScale(2, 2);
+        var point = new Point(1, 1);
+        var actual = matrix.Transform(point);
+        
+        Assert.Equal(expected, actual);
+    }
+    
+    [Fact]
+    public void Transform_Point_Should_Return_Correct_Value_For_Skewed_Matrix()
+    {
+        var expected = Vector2.Transform(
+            new Vector2(1, 1), 
+            Matrix3x2.CreateSkew(30, 20));
+
+        var matrix = Matrix.CreateSkew(30, 20);
+        var point = new Point(1, 1);
+        var actual = matrix.Transform(point);
+        
+        AssertCoordinatesEqualWithReducedPrecision(expected, actual);
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/BoxShadowTests.cs b/tests/Avalonia.Base.UnitTests/Media/BoxShadowTests.cs
new file mode 100644
index 0000000000..5f1860d177
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/BoxShadowTests.cs
@@ -0,0 +1,45 @@
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class BoxShadowTests
+    {
+        [Fact]
+        public void BoxShadow_Should_Parse()
+        {
+            foreach (var extraSpaces in new[] { false, true })
+            foreach (var inset in new[] { false, true })
+                for (var componentCount = 2; componentCount < 5; componentCount++)
+                {
+                    var s = (inset ? "inset " : "") + "10 20";
+                    double blur = 0;
+                    double spread = 0;
+                    if (componentCount > 2)
+                    {
+                        s += " 30";
+                        blur = 30;
+                    }
+
+                    if (componentCount > 3)
+                    {
+                        s += " 40";
+                        spread = 40;
+                    }
+
+                    s += " red";
+
+                    if (extraSpaces)
+                        s = " " + s.Replace(" ", "  ") + "   ";
+
+                    var parsed = BoxShadow.Parse(s);
+                    Assert.Equal(inset, parsed.IsInset);
+                    Assert.Equal(10, parsed.OffsetX);
+                    Assert.Equal(20, parsed.OffsetY);
+                    Assert.Equal(blur, parsed.Blur);
+                    Assert.Equal(spread, parsed.Spread);
+                    Assert.Equal(Colors.Red, parsed.Color);
+                }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/BrushTests.cs b/tests/Avalonia.Base.UnitTests/Media/BrushTests.cs
new file mode 100644
index 0000000000..6edce79de1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/BrushTests.cs
@@ -0,0 +1,93 @@
+using System;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class BrushTests
+    {
+        [Fact]
+        public void Parse_Parses_RGB_Hash_Brush()
+        {
+            var result = (ISolidColorBrush)Brush.Parse("#ff8844");
+
+            Assert.Equal(0xff, result.Color.R);
+            Assert.Equal(0x88, result.Color.G);
+            Assert.Equal(0x44, result.Color.B);
+            Assert.Equal(0xff, result.Color.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_ARGB_Hash_Brush()
+        {
+            var result = (ISolidColorBrush)Brush.Parse("#40ff8844");
+
+            Assert.Equal(0xff, result.Color.R);
+            Assert.Equal(0x88, result.Color.G);
+            Assert.Equal(0x44, result.Color.B);
+            Assert.Equal(0x40, result.Color.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_Named_Brush_Lowercase()
+        {
+            var result = (ISolidColorBrush)Brush.Parse("red");
+
+            Assert.Equal(0xff, result.Color.R);
+            Assert.Equal(0x00, result.Color.G);
+            Assert.Equal(0x00, result.Color.B);
+            Assert.Equal(0xff, result.Color.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_Named_Brush_Uppercase()
+        {
+            var result = (ISolidColorBrush)Brush.Parse("RED");
+
+            Assert.Equal(0xff, result.Color.R);
+            Assert.Equal(0x00, result.Color.G);
+            Assert.Equal(0x00, result.Color.B);
+            Assert.Equal(0xff, result.Color.A);
+        }
+
+        [Fact]
+        public void Parse_ToString_Named_Brush_Roundtrip()
+        {
+            const string expectedName = "Red";
+            var brush = (ISolidColorBrush)Brush.Parse(expectedName);
+            var name = brush.ToString();
+
+            Assert.Equal(expectedName, name);
+        }
+
+        [Fact]
+        public void Parse_Hex_Value_Doesnt_Accept_Too_Few_Chars()
+        {
+            Assert.Throws<FormatException>(() => Brush.Parse("#ff"));
+        }
+
+        [Fact]
+        public void Parse_Hex_Value_Doesnt_Accept_Too_Many_Chars()
+        {
+            Assert.Throws<FormatException>(() => Brush.Parse("#ff5555555"));
+        }
+
+        [Fact]
+        public void Parse_Hex_Value_Doesnt_Accept_Invalid_Number()
+        {
+            Assert.Throws<FormatException>(() => Brush.Parse("#ff808g80"));
+        }
+
+        [Fact]
+        public void Changing_Opacity_Raises_Invalidated()
+        {
+            var target = new SolidColorBrush();
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            target.Opacity = 0.5;
+
+            Assert.True(raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/ColorTests.cs b/tests/Avalonia.Base.UnitTests/Media/ColorTests.cs
new file mode 100644
index 0000000000..36929d5e95
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/ColorTests.cs
@@ -0,0 +1,339 @@
+using System;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class ColorTests
+    {
+        [Fact]
+        public void Parse_Parses_RGB_Hash_Color()
+        {
+            var result = Color.Parse("#ff8844");
+
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void Try_Parse_Parses_RGB_Hash_Color()
+        {
+            var success = Color.TryParse("#ff8844", out Color result);
+
+            Assert.True(success);
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_RGB_Hash_Shorthand_Color()
+        {
+            var result = Color.Parse("#f84");
+
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void Try_Parse_Parses_RGB_Hash_Shorthand_Color()
+        {
+            var success = Color.TryParse("#f84", out Color result);
+
+            Assert.True(success);
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_ARGB_Hash_Color()
+        {
+            var result = Color.Parse("#40ff8844");
+
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0x40, result.A);
+        }
+
+        [Fact]
+        public void Try_Parse_Parses_ARGB_Hash_Color()
+        {
+            var success = Color.TryParse("#40ff8844", out Color result);
+
+            Assert.True(success);
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0x40, result.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_ARGB_Hash_Shorthand_Color()
+        {
+            var result = Color.Parse("#4f84");
+
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0x44, result.A);
+        }
+
+        [Fact]
+        public void Try_Parse_Parses_ARGB_Hash_Shorthand_Color()
+        {
+            var success = Color.TryParse("#4f84", out Color result);
+
+            Assert.True(success);
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x88, result.G);
+            Assert.Equal(0x44, result.B);
+            Assert.Equal(0x44, result.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_Named_Color_Lowercase()
+        {
+            var result = Color.Parse("red");
+
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x00, result.G);
+            Assert.Equal(0x00, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void TryParse_Parses_Named_Color_Lowercase()
+        {
+            var success = Color.TryParse("red", out Color result);
+
+            Assert.True(success);
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x00, result.G);
+            Assert.Equal(0x00, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void Parse_Parses_Named_Color_Uppercase()
+        {
+            var result = Color.Parse("RED");
+
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x00, result.G);
+            Assert.Equal(0x00, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void TryParse_Parses_Named_Color_Uppercase()
+        {
+            var success = Color.TryParse("RED", out Color result);
+
+            Assert.True(success);
+            Assert.Equal(0xff, result.R);
+            Assert.Equal(0x00, result.G);
+            Assert.Equal(0x00, result.B);
+            Assert.Equal(0xff, result.A);
+        }
+
+        [Fact]
+        public void Parse_Hex_Value_Doesnt_Accept_Too_Few_Chars()
+        {
+            Assert.Throws<FormatException>(() => Color.Parse("#ff"));
+        }
+
+        [Fact]
+        public void TryParse_Hex_Value_Doesnt_Accept_Too_Few_Chars()
+        {
+            Assert.False(Color.TryParse("#ff", out _));
+        }
+
+        [Fact]
+        public void Parse_Hex_Value_Doesnt_Accept_Too_Many_Chars()
+        {
+            Assert.Throws<FormatException>(() => Color.Parse("#ff5555555"));
+        }
+
+        [Fact]
+        public void TryParse_Hex_Value_Doesnt_Accept_Too_Many_Chars()
+        {
+            Assert.False(Color.TryParse("#ff5555555", out _));
+        }
+
+        [Fact]
+        public void Parse_Hex_Value_Doesnt_Accept_Invalid_Number()
+        {
+            Assert.Throws<FormatException>(() => Color.Parse("#ff808g80"));
+        }
+
+        [Fact]
+        public void TryParse_Hex_Value_Doesnt_Accept_Invalid_Number()
+        {
+            Assert.False(Color.TryParse("#ff808g80", out _));
+        }
+
+        [Fact]
+        public void Parse_Throws_ArgumentNullException_For_Null_Input()
+        {
+            Assert.Throws<ArgumentNullException>(() => Color.Parse((string)null));
+        }
+
+        [Fact]
+        public void Parse_Throws_FormatException_For_Invalid_Input()
+        {
+            Assert.Throws<FormatException>(() => Color.Parse(string.Empty));
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        public void TryParse_Returns_False_For_Invalid_Input(string input)
+        {
+            Assert.False(Color.TryParse(input, out _));
+        }
+
+        [Fact]
+        public void Try_Parse_HslColor()
+        {
+            // Inline data requires constants, so the data is handled internally here
+            var data = new Tuple<string, HslColor>[]
+            {
+                // HSV
+                Tuple.Create("hsl(0, 0, 0)",         new HslColor(1, 0, 0, 0)),
+                Tuple.Create("hsl(0, 0%, 0%)",       new HslColor(1, 0, 0, 0)),
+                Tuple.Create("hsl(180, 0.5, 0.5)",   new HslColor(1, 180, 0.5, 0.5)),
+                Tuple.Create("hsl(180, 50%, 50%)",   new HslColor(1, 180, 0.5, 0.5)),
+                Tuple.Create("hsl(360, 1.0, 1.0)",   new HslColor(1, 0, 1, 1)),         // Wraps Hue to zero
+                Tuple.Create("hsl(360, 100%, 100%)", new HslColor(1, 0, 1, 1)),         // Wraps Hue to zero
+
+                Tuple.Create("hsl(-1000, -1000, -1000)",   new HslColor(1, 0, 0, 0)),   // Clamps to min
+                Tuple.Create("hsl(-1000, -1000%, -1000%)", new HslColor(1, 0, 0, 0)),   // Clamps to min
+                Tuple.Create("hsl(1000, 1000, 1000)",      new HslColor(1, 0, 1, 1)),   // Clamps to max (Hue wraps to zero)
+                Tuple.Create("hsl(1000, 1000%, 1000%)",    new HslColor(1, 0, 1, 1)),   // Clamps to max (Hue wraps to zero)
+
+                Tuple.Create("hsl(300, 0.8, 0.2)", new HslColor(1.0, 300, 0.8, 0.2)),
+                Tuple.Create("hsl(300, 80%, 20%)", new HslColor(1.0, 300, 0.8, 0.2)),
+
+                // HSVA
+                Tuple.Create("hsla(0, 0, 0, 0)",            new HslColor(0, 0, 0, 0)),
+                Tuple.Create("hsla(0, 0%, 0%, 0%)",         new HslColor(0, 0, 0, 0)),
+                Tuple.Create("hsla(180, 0.5, 0.5, 0.5)",    new HslColor(0.5, 180, 0.5, 0.5)),
+                Tuple.Create("hsla(180, 50%, 50%, 50%)",    new HslColor(0.5, 180, 0.5, 0.5)),
+                Tuple.Create("hsla(360, 1.0, 1.0, 1.0)",    new HslColor(1, 0, 1, 1)),          // Wraps Hue to zero
+                Tuple.Create("hsla(360, 100%, 100%, 100%)", new HslColor(1, 0, 1, 1)),          // Wraps Hue to zero
+
+                Tuple.Create("hsla(-1000, -1000, -1000, -1000)",    new HslColor(0, 0, 0, 0)),  // Clamps to min
+                Tuple.Create("hsla(-1000, -1000%, -1000%, -1000%)", new HslColor(0, 0, 0, 0)),  // Clamps to min
+                Tuple.Create("hsla(1000, 1000, 1000, 1000)",        new HslColor(1, 0, 1, 1)),  // Clamps to max (Hue wraps to zero)
+                Tuple.Create("hsla(1000, 1000%, 1000%, 1000%)",     new HslColor(1, 0, 1, 1)),  // Clamps to max (Hue wraps to zero)
+
+                Tuple.Create("hsla(300, 0.9, 0.2, 0.8)", new HslColor(0.8, 300, 0.9, 0.2)),
+                Tuple.Create("hsla(300, 90%, 20%, 0.8)", new HslColor(0.8, 300, 0.9, 0.2)),
+            };
+
+            foreach (var dataPoint in data)
+            {
+                Assert.True(HslColor.TryParse(dataPoint.Item1, out HslColor parsedHslColor));
+                Assert.True(dataPoint.Item2 == parsedHslColor);
+            }
+        }
+
+        [Fact]
+        public void Try_Parse_HsvColor()
+        {
+            // Inline data requires constants, so the data is handled internally here
+            var data = new Tuple<string, HsvColor>[]
+            {
+                // HSV
+                Tuple.Create("hsv(0, 0, 0)",         new HsvColor(1, 0, 0, 0)),
+                Tuple.Create("hsv(0, 0%, 0%)",       new HsvColor(1, 0, 0, 0)),
+                Tuple.Create("hsv(180, 0.5, 0.5)",   new HsvColor(1, 180, 0.5, 0.5)),
+                Tuple.Create("hsv(180, 50%, 50%)",   new HsvColor(1, 180, 0.5, 0.5)),
+                Tuple.Create("hsv(360, 1.0, 1.0)",   new HsvColor(1, 0, 1, 1)),         // Wraps Hue to zero
+                Tuple.Create("hsv(360, 100%, 100%)", new HsvColor(1, 0, 1, 1)),         // Wraps Hue to zero
+
+                Tuple.Create("hsv(-1000, -1000, -1000)",   new HsvColor(1, 0, 0, 0)),   // Clamps to min
+                Tuple.Create("hsv(-1000, -1000%, -1000%)", new HsvColor(1, 0, 0, 0)),   // Clamps to min
+                Tuple.Create("hsv(1000, 1000, 1000)",      new HsvColor(1, 0, 1, 1)),   // Clamps to max (Hue wraps to zero)
+                Tuple.Create("hsv(1000, 1000%, 1000%)",    new HsvColor(1, 0, 1, 1)),   // Clamps to max (Hue wraps to zero)
+
+                Tuple.Create("hsv(300, 0.8, 0.2)", new HsvColor(1.0, 300, 0.8, 0.2)),
+                Tuple.Create("hsv(300, 80%, 20%)", new HsvColor(1.0, 300, 0.8, 0.2)),
+
+                // HSVA
+                Tuple.Create("hsva(0, 0, 0, 0)",            new HsvColor(0, 0, 0, 0)),
+                Tuple.Create("hsva(0, 0%, 0%, 0%)",         new HsvColor(0, 0, 0, 0)),
+                Tuple.Create("hsva(180, 0.5, 0.5, 0.5)",    new HsvColor(0.5, 180, 0.5, 0.5)),
+                Tuple.Create("hsva(180, 50%, 50%, 50%)",    new HsvColor(0.5, 180, 0.5, 0.5)),
+                Tuple.Create("hsva(360, 1.0, 1.0, 1.0)",    new HsvColor(1, 0, 1, 1)),          // Wraps Hue to zero
+                Tuple.Create("hsva(360, 100%, 100%, 100%)", new HsvColor(1, 0, 1, 1)),          // Wraps Hue to zero
+
+                Tuple.Create("hsva(-1000, -1000, -1000, -1000)",    new HsvColor(0, 0, 0, 0)),  // Clamps to min
+                Tuple.Create("hsva(-1000, -1000%, -1000%, -1000%)", new HsvColor(0, 0, 0, 0)),  // Clamps to min
+                Tuple.Create("hsva(1000, 1000, 1000, 1000)",        new HsvColor(1, 0, 1, 1)),  // Clamps to max (Hue wraps to zero)
+                Tuple.Create("hsva(1000, 1000%, 1000%, 1000%)",     new HsvColor(1, 0, 1, 1)),  // Clamps to max (Hue wraps to zero)
+
+                Tuple.Create("hsva(300, 0.9, 0.2, 0.8)", new HsvColor(0.8, 300, 0.9, 0.2)),
+                Tuple.Create("hsva(300, 90%, 20%, 0.8)", new HsvColor(0.8, 300, 0.9, 0.2)),
+            };
+
+            foreach (var dataPoint in data)
+            {
+                Assert.True(HsvColor.TryParse(dataPoint.Item1, out HsvColor parsedHsvColor));
+                Assert.True(dataPoint.Item2 == parsedHsvColor);
+            }
+        }
+
+        [Fact]
+        public void Try_Parse_All_Formats_With_Conversion()
+        {
+            // Inline data requires constants, so the data is handled internally here
+            var data = new Tuple<string, Color>[]
+            {
+                // RGB
+                Tuple.Create("White",   new Color(0xff, 0xff, 0xff, 0xff)),
+                Tuple.Create("#123456", new Color(0xff, 0x12, 0x34, 0x56)),
+
+                Tuple.Create("rgb(100, 30, 45)",       new Color(255, 100, 30, 45)),
+                Tuple.Create("rgba(100, 30, 45, 0.9)", new Color(230, 100, 30, 45)),
+                Tuple.Create("rgba(100, 30, 45, 90%)", new Color(230, 100, 30, 45)),
+
+                Tuple.Create("rgb(255,0,0)", new Color(255, 255, 0, 0)),
+                Tuple.Create("rgb(0,255,0)", new Color(255, 0, 255, 0)),
+                Tuple.Create("rgb(0,0,255)", new Color(255, 0, 0, 255)),
+
+                Tuple.Create("rgb(100%, 0, 0)", new Color(255, 255, 0, 0)),
+                Tuple.Create("rgb(0, 100%, 0)", new Color(255, 0, 255, 0)),
+                Tuple.Create("rgb(0, 0, 100%)", new Color(255, 0, 0, 255)),
+
+                Tuple.Create("rgba(0, 0, 100%, 50%)",    new Color(128, 0, 0, 255)),
+                Tuple.Create("rgba(50%, 10%, 80%, 50%)", new Color(128, 128, 26, 204)),
+                Tuple.Create("rgba(50%, 10%, 80%, 0.5)", new Color(128, 128, 26, 204)),
+
+                // HSL
+                Tuple.Create("hsl(296, 85%, 12%)",         new Color(255, 53, 5, 57)),
+                Tuple.Create("hsla(296, 0.85, 0.12, 0.9)", new Color(230, 53, 5, 57)),
+                Tuple.Create("hsla(296, 85%, 12%, 90%)",   new Color(230, 53, 5, 57)),
+
+                // HSV
+                Tuple.Create("hsv(240, 83%, 78%)",         new Color(255, 34, 34, 199)),
+                Tuple.Create("hsva(240, 0.83, 0.78, 0.9)", new Color(230, 34, 34, 199)),
+                Tuple.Create("hsva(240, 83%, 78%, 90%)",   new Color(230, 34, 34, 199)),
+            };
+
+            foreach (var dataPoint in data)
+            {
+                Assert.True(Color.TryParse(dataPoint.Item1, out Color parsedColor));
+                Assert.True(dataPoint.Item2 == parsedColor);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/FontFamilyTests.cs b/tests/Avalonia.Base.UnitTests/Media/FontFamilyTests.cs
new file mode 100644
index 0000000000..1f8ae9bd8b
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/FontFamilyTests.cs
@@ -0,0 +1,138 @@
+using System;
+using System.Linq;
+using Avalonia.Media;
+using Avalonia.Media.Fonts;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class FontFamilyTests
+    {
+        [Fact]
+        public void Should_Implicitly_Convert_String_To_FontFamily()
+        {
+            FontFamily fontFamily = "Arial";
+
+            Assert.Equal(new FontFamily("Arial"), fontFamily);
+        }
+
+        [InlineData("Font A")]
+        [InlineData("Font A, Font B")]
+        [InlineData("resm: Avalonia.Visuals.UnitTests#MyFont")]
+        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
+        [Theory]
+        public void Should_Have_Equal_Hash(string s)
+        {
+            var fontFamily = new FontFamily(s);
+
+            Assert.Equal(new FontFamily(s).GetHashCode(), fontFamily.GetHashCode());
+        }
+
+        [InlineData("Font A, Font B", "Font B, Font A")]
+        [InlineData("Font A, Font B", "Font A, Font C")]
+        [Theory]
+        public void Should_Not_Have_Equal_Hash(string a, string b)
+        {
+            var fontFamily = new FontFamily(b);
+
+            Assert.NotEqual(new FontFamily(a).GetHashCode(), fontFamily.GetHashCode());
+        }
+
+        [InlineData("Font A")]
+        [InlineData("Font A, Font B")]
+        [InlineData("resm: Avalonia.Visuals.UnitTests#MyFont")]
+        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
+        [Theory]
+        public void Should_Be_Equal(string s)
+        {
+            var fontFamily = new FontFamily(s);
+
+            Assert.Equal(new FontFamily(s), fontFamily);
+        }
+
+        [InlineData("Font A, Font B", "Font B, Font A")]
+        [InlineData("Font A, Font B", "Font A, Font C")]
+        [Theory]
+        public void Should_Not_Be_Equal(string a, string b)
+        {
+            var fontFamily = new FontFamily(b);
+
+            Assert.NotEqual(new FontFamily(a), fontFamily);
+        }
+
+        [Fact]
+        public void Should_Parse_FontFamily_With_SystemFont_Name()
+        {
+            var fontFamily = FontFamily.Parse("Courier New");
+
+            Assert.Equal("Courier New", fontFamily.Name);
+        }
+
+        [Fact]
+        public void Should_Parse_FontFamily_With_Fallbacks()
+        {
+            var fontFamily = FontFamily.Parse("Courier New, Times New Roman");
+
+            Assert.Equal("Courier New", fontFamily.Name);
+
+            Assert.Equal(2, fontFamily.FamilyNames.Count());
+
+            Assert.Equal("Times New Roman", fontFamily.FamilyNames.Last());
+        }
+
+        [Fact]
+        public void Should_Parse_FontFamily_With_Resource_Folder()
+        {
+            var source = new Uri("resm:Avalonia.Visuals.UnitTests#MyFont");
+
+            var key = new FontFamilyKey(source);
+
+            var fontFamily = FontFamily.Parse(source.OriginalString);
+
+            Assert.Equal("MyFont", fontFamily.Name);
+
+            Assert.Equal(key, fontFamily.Key);
+        }
+
+        [Fact]
+        public void Should_Parse_FontFamily_With_Resource_Filename()
+        {
+            var source = new Uri("resm:Avalonia.Visuals.UnitTests.MyFont.ttf#MyFont");
+
+            var key = new FontFamilyKey(source);
+
+            var fontFamily = FontFamily.Parse(source.OriginalString);
+
+            Assert.Equal("MyFont", fontFamily.Name);
+
+            Assert.Equal(key, fontFamily.Key);
+        }
+
+        [Theory]
+        [InlineData("resm:Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
+        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
+        public void Should_Create_FontFamily_From_Uri(string name)
+        {
+            var fontFamily = new FontFamily(name);
+
+            Assert.Equal("MyFont", fontFamily.Name);
+
+            Assert.NotNull(fontFamily.Key);
+        }
+
+        [Theory]
+        [InlineData("resm:Avalonia.Visuals.UnitTests.Assets.Fonts", "#MyFont")]
+        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts", "#MyFont")]
+        [InlineData("avares://Avalonia.Visuals.UnitTests", "/Assets/Fonts#MyFont")]
+        public void Should_Create_FontFamily_From_Uri_With_Base_Uri(string @base, string name)
+        {
+            var baseUri = new Uri(@base);
+
+            var fontFamily = new FontFamily(baseUri, name);
+
+            Assert.Equal("MyFont", fontFamily.Name);
+
+            Assert.NotNull(fontFamily.Key);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/FontManagerTests.cs b/tests/Avalonia.Base.UnitTests/Media/FontManagerTests.cs
new file mode 100644
index 0000000000..11ecac0039
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/FontManagerTests.cs
@@ -0,0 +1,74 @@
+using System;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class FontManagerTests
+    {
+        [Fact]
+        public void Should_Create_Single_Instance_Typeface()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var fontFamily = new FontFamily("MyFont");
+
+                var typeface = new Typeface(fontFamily);
+
+                var glyphTypeface = FontManager.Current.GetOrAddGlyphTypeface(typeface);
+
+                Assert.Same(glyphTypeface, FontManager.Current.GetOrAddGlyphTypeface(typeface));
+            }
+        }
+
+        [Fact]
+        public void Should_Throw_When_Default_FamilyName_Is_Null()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface.With(fontManagerImpl: new MockFontManagerImpl(null))))
+            {
+                Assert.Throws<InvalidOperationException>(() => FontManager.Current);
+            }
+        }
+
+        [Fact]
+        public void Should_Use_FontManagerOptions_DefaultFamilyName()
+        {
+            var options = new FontManagerOptions { DefaultFamilyName = "MyFont" };
+
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
+                .With(fontManagerImpl: new MockFontManagerImpl())))
+            {
+                AvaloniaLocator.CurrentMutable.Bind<FontManagerOptions>().ToConstant(options);
+
+                Assert.Equal("MyFont", FontManager.Current.DefaultFontFamilyName);
+            }
+        }
+
+        [Fact]
+        public void Should_Use_FontManagerOptions_FontFallback()
+        {
+            var options = new FontManagerOptions
+            {
+                FontFallbacks = new[]
+                {
+                    new FontFallback
+                    {
+                        FontFamily = new FontFamily("MyFont"), UnicodeRange = UnicodeRange.Default
+                    }
+                }
+            };
+
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
+                .With(fontManagerImpl: new MockFontManagerImpl())))
+            {
+                AvaloniaLocator.CurrentMutable.Bind<FontManagerOptions>().ToConstant(options);
+
+                FontManager.Current.TryMatchCharacter(1, FontStyle.Normal, FontWeight.Normal, FontStretch.Normal,
+                    FontFamily.Default, null, out var typeface);
+
+                Assert.Equal("MyFont", typeface.FontFamily.Name);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs b/tests/Avalonia.Base.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs
new file mode 100644
index 0000000000..07415ac2d6
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs
@@ -0,0 +1,23 @@
+using System;
+using Avalonia.Media.Fonts;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media.Fonts
+{
+    public class FamilyNameCollectionTests
+    {
+        [Fact]
+        public void Exception_Should_Be_Thrown_If_Names_Is_Null()
+        {
+            Assert.Throws<ArgumentNullException>(() => new FamilyNameCollection(null));
+        }
+
+        [Fact]
+        public void Should_Be_Equal()
+        {
+            var familyNames = new FamilyNameCollection("Arial, Times New Roman");
+
+            Assert.Equal(new FamilyNameCollection("Arial, Times New Roman"), familyNames);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/Fonts/FontFamilyKeyTests.cs b/tests/Avalonia.Base.UnitTests/Media/Fonts/FontFamilyKeyTests.cs
new file mode 100644
index 0000000000..0cb70ea016
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/Fonts/FontFamilyKeyTests.cs
@@ -0,0 +1,35 @@
+using System;
+using Avalonia.Media.Fonts;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media.Fonts
+{
+    public class FontFamilyKeyTests
+    {
+        [Fact]
+        public void Exception_Should_Be_Thrown_If_Source_Is_Null()
+        {
+            Assert.Throws<ArgumentNullException>(() => new FontFamilyKey(null));
+        }
+
+        [Fact]
+        public void Should_Initialize_With_Location()
+        {
+            var source = new Uri("resm:Avalonia.Visuals.UnitTests#MyFont");
+
+            var fontFamilyKey = new FontFamilyKey(source);
+
+            Assert.Equal(new Uri("resm:Avalonia.Visuals.UnitTests"), fontFamilyKey.Source);
+        }
+
+        [Fact]
+        public void Should_Initialize_With_Location_And_Filename()
+        {
+            var source = new Uri("resm:Avalonia.Visuals.UnitTests.MyFont.ttf#MyFont");
+
+            var fontFamilyKey = new FontFamilyKey(source);
+
+            Assert.Equal(new Uri("resm:Avalonia.Visuals.UnitTests.MyFont.ttf"), fontFamilyKey.Source);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs b/tests/Avalonia.Base.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
new file mode 100644
index 0000000000..1bb2300724
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Avalonia.Media;
+using Avalonia.Media.Fonts;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media.Fonts
+{
+    public class FontFamilyLoaderTests : IDisposable
+    {
+        private const string AssetMyFontRegular = AssetLocation + ".MyFont Regular.ttf" + Assembly + FontName;
+        private const string FontName = "#MyFont";
+        private const string Assembly = "?assembly=Avalonia.Visuals.UnitTests";
+        private const string AssetLocation = "resm:Avalonia.Visuals.UnitTests.Assets";
+        private const string AssetLocationAvares = "avares://Avalonia.Visuals.UnitTests";
+        private const string AssetYourFileName = "/Assets/YourFont.ttf";
+        private const string AssetYourFontAvares = AssetLocationAvares + AssetYourFileName;
+
+        private readonly IDisposable _testApplication;
+
+        public FontFamilyLoaderTests()
+        {
+            const string AssetMyFontBold = AssetLocation + ".MyFont Bold.ttf" + Assembly + FontName;
+            const string AssetYourFont = AssetLocation + ".YourFont.ttf" + Assembly + FontName;
+
+            var fontAssets = new[]
+            {
+                (AssetMyFontRegular, "AssetData"),
+                (AssetMyFontBold, "AssetData"),
+                (AssetYourFont, "AssetData"),
+                (AssetYourFontAvares, "AssetData")
+            };
+
+            _testApplication = StartWithResources(fontAssets);
+        }
+
+        public void Dispose()
+        {
+            _testApplication.Dispose();
+        }
+
+        [Fact]
+        public void Should_Load_Single_FontAsset()
+        {
+            var source = new Uri(AssetMyFontRegular, UriKind.RelativeOrAbsolute);
+            var key = new FontFamilyKey(source);
+
+            var fontAssets = FontFamilyLoader.LoadFontAssets(key);
+
+            Assert.Single(fontAssets);
+        }
+
+        [Fact]
+        public void Should_Load_Single_FontAsset_Avares_Without_BaseUri()
+        {
+            var source = new Uri(AssetYourFontAvares);
+            var key = new FontFamilyKey(source);
+
+            var fontAssets = FontFamilyLoader.LoadFontAssets(key);
+
+            Assert.Single(fontAssets);
+        }
+
+        [Fact]
+        public void Should_Load_Single_FontAsset_Avares_With_BaseUri()
+        {
+            var source = new Uri(AssetYourFileName, UriKind.RelativeOrAbsolute);
+            var baseUri = new Uri(AssetLocationAvares);
+            var key = new FontFamilyKey(source, baseUri);
+
+            var fontAssets = FontFamilyLoader.LoadFontAssets(key);
+
+            Assert.Single(fontAssets);
+        }
+
+        [Fact]
+        public void Should_Load_Matching_Assets()
+        {
+            var source = new Uri(AssetLocation + ".MyFont*.ttf" + Assembly + FontName, UriKind.RelativeOrAbsolute);
+            var key = new FontFamilyKey(source);
+
+            var fontAssets = FontFamilyLoader.LoadFontAssets(key).ToArray();
+
+            foreach (var fontAsset in fontAssets)
+            {
+                Debug.WriteLine(fontAsset);
+            }
+
+            Assert.Equal(2, fontAssets.Length);
+        }
+
+        [Fact]
+        public void Should_Load_Embedded_Font()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var assetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>();
+
+                var fontFamily = new FontFamily("resm:Avalonia.Base.UnitTests.Assets?assembly=Avalonia.Base.UnitTests#Noto Mono");
+
+                var fontAssets = FontFamilyLoader.LoadFontAssets(fontFamily.Key).ToArray();
+
+                Assert.NotEmpty(fontAssets);
+
+                foreach (var fontAsset in fontAssets)
+                {
+                    var stream = assetLoader.Open(fontAsset);
+
+                    Assert.NotNull(stream);
+                }
+            }
+        }
+
+        private static IDisposable StartWithResources(params (string, string)[] assets)
+        {
+            var assetLoader = new MockAssetLoader(assets);
+            var services = new TestServices(assetLoader: assetLoader, platform: new AppBuilder().RuntimePlatform);
+            return UnitTestApplication.Start(services);
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/GeometryGroupTests.cs b/tests/Avalonia.Base.UnitTests/Media/GeometryGroupTests.cs
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Media/GeometryGroupTests.cs
rename to tests/Avalonia.Base.UnitTests/Media/GeometryGroupTests.cs
diff --git a/tests/Avalonia.Base.UnitTests/Media/GeometryTests.cs b/tests/Avalonia.Base.UnitTests/Media/GeometryTests.cs
new file mode 100644
index 0000000000..ae8dc9dad2
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/GeometryTests.cs
@@ -0,0 +1,115 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class GeometryTests
+    {
+        [Fact]
+        public void Changing_AffectsGeometry_Property_Causes_PlatformImpl_To_Be_Updated()
+        {
+            var target = new TestGeometry();
+            var platformImpl = target.PlatformImpl;
+
+            target.Foo = true;
+
+            Assert.NotSame(platformImpl, target.PlatformImpl);
+        }
+
+        [Fact]
+        public void Changing_AffectsGeometry_Property_Causes_Changed_To_Be_Raised()
+        {
+            var target = new TestGeometry();
+            var raised = false;
+
+            target.Changed += (s, e) => raised = true;
+            target.Foo = true;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Setting_Transform_Causes_Changed_To_Be_Raised()
+        {
+            var target = new TestGeometry();
+            var raised = false;
+
+            target.Changed += (s, e) => raised = true;
+            target.Transform = new RotateTransform(45);
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_Transform_Causes_Changed_To_Be_Raised()
+        {
+            var transform = new RotateTransform(45);
+            var target = new TestGeometry { Transform = transform };
+            var raised = false;
+
+            target.Changed += (s, e) => raised = true;
+            transform.Angle = 90;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Removing_Transform_Causes_Changed_To_Be_Raised()
+        {
+            var transform = new RotateTransform(45);
+            var target = new TestGeometry { Transform = transform };
+            var raised = false;
+
+            target.Changed += (s, e) => raised = true;
+            target.Transform = null;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Transform_Produces_Transformed_PlatformImpl()
+        {
+            var target = new TestGeometry();
+            var rotate = new RotateTransform(45);
+
+            Assert.False(target.PlatformImpl is ITransformedGeometryImpl);
+            target.Transform = rotate;
+            Assert.True(target.PlatformImpl is ITransformedGeometryImpl);
+            rotate.Angle = 0;
+            Assert.False(target.PlatformImpl is ITransformedGeometryImpl);
+        }
+
+        private class TestGeometry : Geometry
+        {
+            public static readonly StyledProperty<bool> FooProperty =
+                AvaloniaProperty.Register<TestGeometry, bool>(nameof(Foo));
+
+            static TestGeometry()
+            {
+                AffectsGeometry(FooProperty);
+            }
+
+            public bool Foo
+            {
+                get => GetValue(FooProperty);
+                set => SetValue(FooProperty, value);
+            }
+
+            public override Geometry Clone()
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override IGeometryImpl CreateDefiningGeometry()
+            {
+                return Mock.Of<IGeometryImpl>(
+                    x => x.WithTransform(It.IsAny<Matrix>()) == 
+                        Mock.Of<ITransformedGeometryImpl>(y =>
+                            y.SourceGeometry == x));
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/GlyphRunTests.cs b/tests/Avalonia.Base.UnitTests/Media/GlyphRunTests.cs
new file mode 100644
index 0000000000..cd0586233f
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/GlyphRunTests.cs
@@ -0,0 +1,192 @@
+using System.Linq;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class GlyphRunTests : TestWithServicesBase
+    {
+        public GlyphRunTests()
+        {
+            AvaloniaLocator.CurrentMutable
+                .Bind<IPlatformRenderInterface>().ToSingleton<MockPlatformRenderInterface>();
+        }
+
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0)]
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 3, 30)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 1, 0, 10)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 2, 0, 20)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 2, 1, 30)]
+        [Theory]
+        public void Should_Get_Distance_From_CharacterHit(double[] advances, int[] clusters, int start, int trailingLength, double expectedDistance)
+        {
+            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using (var glyphRun = CreateGlyphRun(advances, clusters))
+            {
+                var characterHit = new CharacterHit(start, trailingLength);
+
+                var distance = glyphRun.GetDistanceFromCharacterHit(characterHit);
+
+                Assert.Equal(expectedDistance, distance);
+            }
+        }
+
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 26.0, 0, 3, true)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 20.0, 1, 1, true)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 26.0, 2, 1, true)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 35.0, 2, 1, false)]
+        [Theory]
+        public void Should_Get_CharacterHit_FromDistance(double[] advances, int[] clusters, double distance, int start,
+            int trailingLengthExpected, bool isInsideExpected)
+        {
+            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using (var glyphRun = CreateGlyphRun(advances, clusters))
+            {
+                var textBounds = glyphRun.GetCharacterHitFromDistance(distance, out var isInside);
+
+                Assert.Equal(start, textBounds.FirstCharacterIndex);
+
+                Assert.Equal(trailingLengthExpected, textBounds.TrailingLength);
+
+                Assert.Equal(isInsideExpected, isInside);
+            }
+        }
+
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 10, 11, 12 }, 0, -1, 10, 1, 10)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 10, 11, 12 }, 0, 15, 12, 1, 10)]
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0, 3, 30.0)]
+        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 0, 1, 1, 1, 10.0)]
+        [InlineData(new double[] { 10, 20, 0, 10 }, new int[] { 0, 1, 1, 3 }, 0, 2, 1, 2, 20.0)]
+        [InlineData(new double[] { 10, 20, 0, 10 }, new int[] { 0, 1, 1, 3 }, 0, 1, 1, 2, 20.0)]
+        [InlineData(new double[] { 10, 0, 20, 10 }, new int[] { 3, 1, 1, 0 }, 1, 1, 1, 2, 20.0)]
+        [Theory]
+        public void Should_Find_Nearest_CharacterHit(double[] advances, int[] clusters, int bidiLevel,
+            int index, int expectedIndex, int expectedLength, double expectedWidth)
+        {
+            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
+            {
+                var textBounds = glyphRun.FindNearestCharacterHit(index, out var width);
+
+                Assert.Equal(expectedIndex, textBounds.FirstCharacterIndex);
+
+                Assert.Equal(expectedLength, textBounds.TrailingLength);
+
+                Assert.Equal(expectedWidth, width, 2);
+            }
+        }
+
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0, 3, 0)]
+        [InlineData(new double[] { 0, 0, 30 }, new int[] { 0, 0, 0 }, 0, 0, 0, 3, 1)]
+        [InlineData(new double[] { 30, 0, 0, 10 }, new int[] { 0, 0, 0, 3 }, 3, 0, 3, 1, 0)]
+        [InlineData(new double[] { 10, 0, 0, 30 }, new int[] { 3, 0, 0, 0 }, 3, 0, 3, 1, 1)]
+        [InlineData(new double[] { 10, 30, 0, 0, 10 }, new int[] { 0, 1, 1, 1, 4 }, 1, 0, 4, 0, 0)]
+        [InlineData(new double[] { 10, 0, 0, 30, 10 }, new int[] { 4, 1, 1, 1, 0 }, 1, 0, 4, 0, 1)]
+        [Theory]
+        public void Should_Get_Next_CharacterHit(double[] advances,int[] clusters,
+            int firstCharacterIndex, int trailingLength,
+            int nextIndex, int nextLength,
+            int bidiLevel)
+        {
+            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
+            {
+                var characterHit = glyphRun.GetNextCaretCharacterHit(new CharacterHit(firstCharacterIndex, trailingLength));
+
+                Assert.Equal(nextIndex, characterHit.FirstCharacterIndex);
+
+                Assert.Equal(nextLength, characterHit.TrailingLength);
+            }
+        }
+
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0, 0, 0)]
+        [InlineData(new double[] { 0, 0, 30 }, new int[] { 0, 0, 0 }, 0, 0, 0, 0, 1)]
+        [InlineData(new double[] { 30, 0, 0, 10 }, new int[] { 0, 0, 0, 3 }, 3, 1, 3, 0, 0)]
+        [InlineData(new double[] { 0, 0, 30, 10 }, new int[] { 3, 0, 0, 0 }, 3, 1, 3, 0, 1)]
+        [InlineData(new double[] { 10, 30, 0, 0, 10 }, new int[] { 0, 1, 1, 1, 4 }, 4, 1, 4, 0, 0)]
+        [InlineData(new double[] { 10, 0, 0, 30, 10 }, new int[] { 4, 1, 1, 1, 0 }, 4, 1, 4, 0, 1)]
+        [Theory]
+        public void Should_Get_Previous_CharacterHit(double[] advances, int[] clusters,
+            int currentIndex, int currentLength,
+            int previousIndex, int previousLength,
+            int bidiLevel)
+        {
+            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
+            {
+                var characterHit = glyphRun.GetPreviousCaretCharacterHit(new CharacterHit(currentIndex, currentLength));
+
+                Assert.Equal(previousIndex, characterHit.FirstCharacterIndex);
+
+                Assert.Equal(previousLength, characterHit.TrailingLength);
+            }
+        }
+
+        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0)]
+        [InlineData(new double[] { 0, 0, 30 }, new int[] { 0, 0, 0 }, 1)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new int[] { 0, 0, 0, 3 }, 0)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new int[] { 3, 0, 0, 0 }, 1)]
+        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new int[] { 0, 1, 1, 1, 4 }, 0)]
+        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new int[] { 4, 1, 1, 1, 0 }, 1)]
+        [Theory]
+        public void Should_Find_Glyph_Index(double[] advances, int[] clusters, int bidiLevel)
+        {
+            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
+            {
+                if (glyphRun.IsLeftToRight)
+                {
+                    for (var i = 0; i < clusters.Length; i++)
+                    {
+                        var cluster = clusters[i];
+
+                        var found = glyphRun.FindGlyphIndex(cluster);
+
+                        var expected = i;
+
+                        while (expected - 1 >= 0 && clusters[expected - 1] == cluster)
+                        {
+                            expected--;
+                        }
+
+                        Assert.Equal(expected, found);
+                    }
+                }
+                else
+                {
+                    for (var i = clusters.Length - 1; i > 0; i--)
+                    {
+                        var cluster = clusters[i];
+
+                        var found = glyphRun.FindGlyphIndex(cluster);
+
+                        var expected = i;
+
+                        while (expected + 1 < clusters.Length && clusters[expected + 1] == cluster)
+                        {
+                            expected++;
+                        }
+
+                        Assert.Equal(expected, found);
+                    }
+                }
+            }
+        }
+
+        private static GlyphRun CreateGlyphRun(double[] glyphAdvances, int[] glyphClusters, int bidiLevel = 0)
+        {
+            var count = glyphAdvances.Length;
+            var glyphIndices = new ushort[count];
+
+            var start = bidiLevel == 0 ? glyphClusters[0] : glyphClusters[^1];
+
+            var characters = new ReadOnlySlice<char>(Enumerable.Repeat('a', count).ToArray(), start, count);
+
+            return new GlyphRun(new GlyphTypeface(new MockGlyphTypeface()), 10, characters, glyphIndices, glyphAdvances,
+                glyphClusters: glyphClusters, biDiLevel: bidiLevel);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/ImageBrushTests.cs b/tests/Avalonia.Base.UnitTests/Media/ImageBrushTests.cs
new file mode 100644
index 0000000000..2e872e7f7f
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/ImageBrushTests.cs
@@ -0,0 +1,24 @@
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class ImageBrushTests
+    {
+        [Fact]
+        public void Changing_Source_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new ImageBrush(bitmap1);
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            target.Source = bitmap2;
+
+            Assert.True(raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/LinearGradientBrushTests.cs b/tests/Avalonia.Base.UnitTests/Media/LinearGradientBrushTests.cs
new file mode 100644
index 0000000000..736bafba66
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/LinearGradientBrushTests.cs
@@ -0,0 +1,85 @@
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class LinearGradientBrushTests
+    {
+        [Fact]
+        public void Changing_StartPoint_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.StartPoint = new RelativePoint();
+            target.Invalidated += (s, e) => raised = true;
+            target.StartPoint = new RelativePoint(10, 10, RelativeUnit.Absolute);
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_EndPoint_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.EndPoint = new RelativePoint();
+            target.Invalidated += (s, e) => raised = true;
+            target.EndPoint = new RelativePoint(10, 10, RelativeUnit.Absolute);
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_GradientStops_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
+            target.Invalidated += (s, e) => raised = true;
+            target.GradientStops = new GradientStops { new GradientStop(Colors.Green, 0) };
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Adding_GradientStop_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
+            target.Invalidated += (s, e) => raised = true;
+            target.GradientStops.Add(new GradientStop(Colors.Green, 1));
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_GradientStop_Offset_Raises_Invalidated()
+        {
+            var bitmap1 = Mock.Of<IBitmap>();
+            var bitmap2 = Mock.Of<IBitmap>();
+            var target = new LinearGradientBrush();
+            var raised = false;
+
+            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
+            target.Invalidated += (s, e) => raised = true;
+            target.GradientStops[0].Offset = 0.5;
+
+            Assert.True(raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/MatrixTests.cs b/tests/Avalonia.Base.UnitTests/Media/MatrixTests.cs
new file mode 100644
index 0000000000..4aa13fab3a
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/MatrixTests.cs
@@ -0,0 +1,109 @@
+using System;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class MatrixTests
+    {
+        [Fact]
+        public void Can_Parse()
+        {
+            var matrix = Matrix.Parse("1,2,3,-4,5 6");
+            var expected = new Matrix(1, 2, 3, -4, 5, 6);
+            Assert.Equal(expected, matrix);
+        }
+
+        [Fact]
+        public void Singular_Has_No_Inverse()
+        {
+            var matrix = new Matrix(0, 0, 0, 0, 0, 0);
+
+            Assert.False(matrix.HasInverse);
+        }
+
+        [Fact]
+        public void Identity_Has_Inverse()
+        {
+            var matrix = Matrix.Identity;
+
+            Assert.True(matrix.HasInverse);
+        }
+
+        [Fact]
+        public void Invert_Should_Work()
+        {
+            var matrix = new Matrix(1, 2, 3, 0, 1, 4, 5, 6, 0);
+            var inverted = matrix.Invert();
+
+            Assert.Equal(matrix * inverted, Matrix.Identity);
+            Assert.Equal(inverted * matrix, Matrix.Identity);
+        }
+
+        [Fact]
+        public void Can_Decompose_Translation()
+        {
+            var matrix = Matrix.CreateTranslation(5, 10);
+
+            var result = Matrix.TryDecomposeTransform(matrix, out Matrix.Decomposed decomposed);
+
+            Assert.Equal(true, result);
+            Assert.Equal(5, decomposed.Translate.X);
+            Assert.Equal(10, decomposed.Translate.Y);
+        }
+
+        [Theory]
+        [InlineData(30d)]
+        [InlineData(0d)]
+        [InlineData(90d)]
+        [InlineData(270d)]
+        public void Can_Decompose_Angle(double angleDeg)
+        {
+            var angleRad = MathUtilities.Deg2Rad(angleDeg);
+
+            var matrix = Matrix.CreateRotation(angleRad);
+
+            var result = Matrix.TryDecomposeTransform(matrix, out Matrix.Decomposed decomposed);
+
+            Assert.Equal(true, result);
+
+            var expected = NormalizeAngle(angleRad);
+            var actual = NormalizeAngle(decomposed.Angle);
+
+            Assert.Equal(expected, actual, 4);
+        }
+
+        [Theory]
+        [InlineData(1d, 1d)]
+        [InlineData(-1d, 1d)]
+        [InlineData(1d, -1d)]
+        [InlineData(5d, 10d)]
+        public void Can_Decompose_Scale(double x, double y)
+        {
+            var matrix = Matrix.CreateScale(x, y);
+
+            var result = Matrix.TryDecomposeTransform(matrix, out Matrix.Decomposed decomposed);
+
+            Assert.Equal(true, result);
+            Assert.Equal(x, decomposed.Scale.X);
+            Assert.Equal(y, decomposed.Scale.Y);
+        }
+
+        private static double NormalizeAngle(double rad)
+        {
+            double twoPi = 2 * Math.PI;
+
+            while (rad < 0)
+            {
+                rad += twoPi;
+            }
+
+            while (rad > twoPi)
+            {
+                rad -= twoPi;
+            }
+
+            return rad;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/PathMarkupParserTests.cs b/tests/Avalonia.Base.UnitTests/Media/PathMarkupParserTests.cs
new file mode 100644
index 0000000000..c829690eb4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/PathMarkupParserTests.cs
@@ -0,0 +1,323 @@
+using System.Globalization;
+using System.IO;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Visuals.Platform;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class PathMarkupParserTests
+    {
+        [Fact]
+        public void Parses_Move()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("M10 10");
+
+                var figure = pathGeometry.Figures[0];
+
+                Assert.Equal(new Point(10, 10), figure.StartPoint);
+            }
+        }
+
+        [Fact]
+        public void Parses_Line()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("M0 0L10 10");
+
+                var figure = pathGeometry.Figures[0];
+
+                var segment = figure.Segments[0];
+
+                Assert.IsType<LineSegment>(segment);
+
+                var lineSegment = (LineSegment)segment;
+
+                Assert.Equal(new Point(10, 10), lineSegment.Point);
+            }
+        }
+
+        [Fact]
+        public void Parses_Close()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("M0 0L10 10z");
+
+                var figure = pathGeometry.Figures[0];
+
+                Assert.True(figure.IsClosed);
+            }
+        }
+
+        [Fact]
+        public void Parses_FillMode_Before_Move()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("F 1M0,0");
+
+                Assert.Equal(FillRule.NonZero, pathGeometry.FillRule);
+            }
+        }
+
+        [Theory]
+        [InlineData("M0 0 10 10 20 20")]
+        [InlineData("M0,0 10,10 20,20")]
+        [InlineData("M0,0,10,10,20,20")]
+        public void Parses_Implicit_Line_Command_After_Move(string pathData)
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse(pathData);
+
+                var figure = pathGeometry.Figures[0];
+
+                var segment = figure.Segments[0];
+
+                Assert.IsType<LineSegment>(segment);
+
+                var lineSegment = (LineSegment)segment;
+
+                Assert.Equal(new Point(10, 10), lineSegment.Point);
+
+                segment = figure.Segments[1];
+
+                Assert.IsType<LineSegment>(segment);
+
+                lineSegment = (LineSegment)segment;
+
+                Assert.Equal(new Point(20, 20), lineSegment.Point);
+            }
+        }
+
+        [Theory]
+        [InlineData("m0 0 10 10 20 20")]
+        [InlineData("m0,0 10,10 20,20")]
+        [InlineData("m0,0,10,10,20,20")]
+        public void Parses_Implicit_Line_Command_After_Relative_Move(string pathData)
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse(pathData);
+
+                var figure = pathGeometry.Figures[0];
+
+                var segment = figure.Segments[0];
+
+                Assert.IsType<LineSegment>(segment);
+
+                var lineSegment = (LineSegment)segment;
+
+                Assert.Equal(new Point(10, 10), lineSegment.Point);
+
+                segment = figure.Segments[1];
+
+                Assert.IsType<LineSegment>(segment);
+
+                lineSegment = (LineSegment)segment;
+
+                Assert.Equal(new Point(30, 30), lineSegment.Point);
+            }
+        }
+
+        [Fact]
+        public void Parses_Scientific_Notation_Double()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("M -1.01725E-005 -1.01725e-005");
+
+                var figure = pathGeometry.Figures[0];
+
+                Assert.Equal(
+                    new Point(
+                        double.Parse("-1.01725E-005", NumberStyles.Float, CultureInfo.InvariantCulture),
+                        double.Parse("-1.01725E-005", NumberStyles.Float, CultureInfo.InvariantCulture)),
+                    figure.StartPoint);
+            }
+        }
+
+        [Theory]
+        [InlineData("M5.5.5 5.5.5 5.5.5")]
+        [InlineData("F1M9.0771,11C9.1161,10.701,9.1801,10.352,9.3031,10L9.0001,10 9.0001,6.166 3.0001,9.767 3.0001,10 "
+                    + "9.99999999997669E-05,10 9.99999999997669E-05,0 3.0001,0 3.0001,0.234 9.0001,3.834 9.0001,0 "
+                    + "12.0001,0 12.0001,8.062C12.1861,8.043 12.3821,8.031 12.5941,8.031 15.3481,8.031 15.7961,9.826 "
+                    + "15.9201,11L16.0001,16 9.0001,16 9.0001,12.562 9.0001,11z")] // issue #1708
+        [InlineData("         M0 0")]
+        [InlineData("F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z")] // issue #1107
+        [InlineData("M0 0L10 10z")]
+        [InlineData("M50 50 L100 100 L150 50")]
+        [InlineData("M50 50L100 100L150 50")]
+        [InlineData("M50,50 L100,100 L150,50")]
+        [InlineData("M50 50 L-10 -10 L10 50")]
+        [InlineData("M50 50L-10-10L10 50")]
+        [InlineData("M50 50 L100 100 L150 50zM50 50 L70 70 L120 50z")]
+        [InlineData("M 50 50 L 100 100 L 150 50")]
+        [InlineData("M50 50 L100 100 L150 50 H200 V100Z")]
+        [InlineData("M 80 200 A 100 50 45 1 0 100 50")]
+        [InlineData(
+            "F1 M 16.6309 18.6563C 17.1309 8.15625 29.8809 14.1563 29.8809 14.1563C 30.8809 11.1563 34.1308 11.4063" +
+            " 34.1308 11.4063C 33.5 12 34.6309 13.1563 34.6309 13.1563C 32.1309 13.1562 31.1309 14.9062 31.1309 14.9" +
+            "062C 41.1309 23.9062 32.6309 27.9063 32.6309 27.9062C 24.6309 24.9063 21.1309 22.1562 16.6309 18.6563 Z" +
+            " M 16.6309 19.9063C 21.6309 24.1563 25.1309 26.1562 31.6309 28.6562C 31.6309 28.6562 26.3809 39.1562 18" +
+            ".3809 36.1563C 18.3809 36.1563 18 38 16.3809 36.9063C 15 36 16.3809 34.9063 16.3809 34.9063C 16.3809 34" +
+            ".9063 10.1309 30.9062 16.6309 19.9063 Z ")]
+        [InlineData(
+            "F1M16,12C16,14.209 14.209,16 12,16 9.791,16 8,14.209 8,12 8,11.817 8.03,11.644 8.054,11.467L6.585,10 4,10 " +
+            "4,6.414 2.5,7.914 0,5.414 0,3.586 3.586,0 4.414,0 7.414,3 7.586,3 9,1.586 11.914,4.5 10.414,6 " +
+            "12.461,8.046C14.45,8.278,16,9.949,16,12")]
+        public void Should_Parse(string pathData)
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse(pathData);
+
+                Assert.True(true);
+            }
+        }
+
+        [Theory]
+        [InlineData("M0 0L10 10")]
+        [InlineData("M0 0L10 10z")]
+        [InlineData("M0 0L10 10 \n ")]
+        [InlineData("M0 0L10 10z \n ")]
+        [InlineData("M0 0L10 10 ")]
+        [InlineData("M0 0L10 10z ")]
+        public void Should_AlwaysEndFigure(string pathData)
+        {
+            var context = new Mock<IGeometryContext>();
+
+            using (var parser = new PathMarkupParser(context.Object))
+            {
+                parser.Parse(pathData);
+            }
+
+            context.Verify(v => v.EndFigure(It.IsAny<bool>()), Times.AtLeastOnce());
+        }
+
+        [Theory]
+        [InlineData("M 5.5, 5 L 5.5, 5 L 5.5, 5")]
+        [InlineData("F1 M 9.0771, 11 C 9.1161, 10.701 9.1801, 10.352 9.3031, 10 L 9.0001, 10 L 9.0001, 6.166 L 3.0001, 9.767 L 3.0001, 10 "
+            + "L 9.99999999997669E-05, 10 L 9.99999999997669E-05, 0 L 3.0001, 0 L 3.0001, 0.234 L 9.0001, 3.834 L 9.0001, 0 "
+            + "L 12.0001, 0 L 12.0001, 8.062 C 12.1861, 8.043 12.3821, 8.031 12.5941, 8.031 C 15.3481, 8.031 15.7961, 9.826 "
+            + "15.9201, 11 L 16.0001, 16 L 9.0001, 16 L 9.0001, 12.562 L 9.0001, 11Z")]
+        [InlineData("F1 M 24, 14 A 2, 2 0 1 1 20, 14 A 2, 2 0 1 1 24, 14Z")]
+        [InlineData("M 0, 0 L 10, 10Z")]
+        [InlineData("M 50, 50 L 100, 100 L 150, 50")]
+        [InlineData("M 50, 50 L -10, -10 L 10, 50")]
+        [InlineData("M 50, 50 L 100, 100 L 150, 50Z M 50, 50 L 70, 70 L 120, 50Z")]
+        [InlineData("M 80, 200 A 100, 50 45 1 0 100, 50")]
+        [InlineData("F1 M 16, 12 C 16, 14.209 14.209, 16 12, 16 C 9.791, 16 8, 14.209 8, 12 C 8, 11.817 8.03, 11.644 8.054, 11.467 L 6.585, 10 "
+            + "L 4, 10 L 4, 6.414 L 2.5, 7.914 L 0, 5.414 L 0, 3.586 L 3.586, 0 L 4.414, 0 L 7.414, 3 L 7.586, 3 L 9, 1.586 L "
+            + "11.914, 4.5 L 10.414, 6 L 12.461, 8.046 C 14.45, 8.278 16, 9.949 16, 12")]
+        public void Parsed_Geometry_ToString_Should_Produce_Valid_Value(string pathData)
+        {
+            var target = PathGeometry.Parse(pathData);
+
+            string output = target.ToString();
+
+            Assert.Equal(pathData, output);
+        }
+
+        [Theory]
+        [InlineData("M5.5.5 5.5.5 5.5.5", "M 5.5, 0.5 L 5.5, 0.5 L 5.5, 0.5")]
+        [InlineData("F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z", "F1 M 24, 14 A 2, 2 0 1 1 20, 14 A 2, 2 0 1 1 24, 14Z")]
+        [InlineData("F1M16,12C16,14.209 14.209,16 12,16 9.791,16 8,14.209 8,12 8,11.817 8.03,11.644 8.054,11.467L6.585,10 4,10 "
+                    + "4,6.414 2.5,7.914 0,5.414 0,3.586 3.586,0 4.414,0 7.414,3 7.586,3 9,1.586 11.914,4.5 10.414,6 "
+                    + "12.461,8.046C14.45,8.278,16,9.949,16,12",
+                    "F1 M 16, 12 C 16, 14.209 14.209, 16 12, 16 C 9.791, 16 8, 14.209 8, 12 C 8, 11.817 8.03, 11.644 8.054, 11.467 L 6.585, 10 "
+                    + "L 4, 10 L 4, 6.414 L 2.5, 7.914 L 0, 5.414 L 0, 3.586 L 3.586, 0 L 4.414, 0 L 7.414, 3 L 7.586, 3 L 9, 1.586 L "
+                    + "11.914, 4.5 L 10.414, 6 L 12.461, 8.046 C 14.45, 8.278 16, 9.949 16, 12")]
+        public void Parsed_Geometry_ToString_Should_Format_Value(string pathData, string formattedPathData)
+        {
+            var target = PathGeometry.Parse(pathData);
+
+            string output = target.ToString();
+
+            Assert.Equal(formattedPathData, output);
+        }
+
+        [Theory]
+        [InlineData("0 0")]
+        [InlineData("j")]
+        public void Throws_InvalidDataException_On_None_Defined_Command(string pathData)
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                Assert.Throws<InvalidDataException>(() => parser.Parse(pathData));
+            }
+        }
+
+        [Fact]
+        public void CloseFigure_Should_Move_CurrentPoint_To_CreateFigurePoint()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("M10,10L100,100Z m10,10");
+
+                Assert.Equal(2, pathGeometry.Figures.Count);
+
+                var figure = pathGeometry.Figures[0];
+
+                Assert.Equal(new Point(10, 10), figure.StartPoint);
+
+                Assert.Equal(true, figure.IsClosed);
+
+                Assert.Equal(new Point(100, 100), ((LineSegment)figure.Segments[0]).Point);
+
+                figure = pathGeometry.Figures[1];
+
+                Assert.Equal(new Point(20, 20), figure.StartPoint);
+            }
+        }
+
+        [Fact]
+        public void Should_Parse_Flags_Without_Separator()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("a.898.898 0 01.27.188");
+
+                var figure = pathGeometry.Figures[0];
+
+                var segments = figure.Segments;
+                
+                Assert.NotNull(segments);
+                
+                Assert.Equal(1, segments.Count);
+
+                var arcSegment = segments[0];
+
+                Assert.IsType<ArcSegment>(arcSegment);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/PathSegmentTests.cs b/tests/Avalonia.Base.UnitTests/Media/PathSegmentTests.cs
new file mode 100644
index 0000000000..41d2fdb349
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/PathSegmentTests.cs
@@ -0,0 +1,34 @@
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class PathSegmentTests
+    {
+        [Fact]
+        public void PathSegment_Triggers_Invalidation_On_Property_Change()
+        {
+            var targetSegment = new ArcSegment()
+            {
+                Size = new Size(10, 10),
+                Point = new Point(5, 5)
+            };
+
+            var target = new PathGeometry
+            {
+                Figures = new PathFigures
+                {
+                    new PathFigure { IsClosed = false, Segments = new PathSegments { targetSegment } }
+                }
+            };
+            
+            var changed = false;
+
+            target.Changed += (s, e) => changed = true;
+
+            targetSegment.Size = new Size(20, 20);
+
+            Assert.True(changed);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/PenTests.cs b/tests/Avalonia.Base.UnitTests/Media/PenTests.cs
new file mode 100644
index 0000000000..fecdd30834
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/PenTests.cs
@@ -0,0 +1,105 @@
+using Avalonia.Collections;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class PenTests
+    {
+        [Fact]
+        public void Changing_Thickness_Raises_Invalidated()
+        {
+            var target = new Pen();
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            target.Thickness = 18;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_Brush_Color_Raises_Invalidated()
+        {
+            var brush = new SolidColorBrush(Colors.Red);
+            var target = new Pen { Brush = brush };
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            brush.Color = Colors.Green;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_DashStyle_Dashes_Raises_Invalidated()
+        {
+            var dashes = new DashStyle();
+            var target = new Pen { DashStyle = dashes };
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            dashes.Dashes = new AvaloniaList<double> { 0.1, 0.2 };
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Adding_DashStyle_Dashes_Raises_Invalidated()
+        {
+            var dashes = new DashStyle();
+            var target = new Pen { DashStyle = dashes };
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            dashes.Dashes.Add(0.3);
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Equality_Is_Implemented_Between_Immutable_And_Mutable_Pens()
+        {
+            var brush = new ImmutableSolidColorBrush(Colors.Red);
+            var target1 = new ImmutablePen(
+                brush: brush,
+                thickness: 2,
+                dashStyle: (ImmutableDashStyle)DashStyle.Dash,
+                lineCap: PenLineCap.Round,
+                lineJoin: PenLineJoin.Round,
+                miterLimit: 21);
+            var target2 = new Pen(
+                brush: brush,
+                thickness: 2,
+                dashStyle: DashStyle.Dash,
+                lineCap: PenLineCap.Round,
+                lineJoin: PenLineJoin.Round,
+                miterLimit: 21);
+
+            Assert.True(Equals(target1, target2));
+        }
+
+        [Fact]
+        public void Equality_Is_Implemented_Between_Mutable_And_Immutable_DashStyles()
+        {
+            var brush = new ImmutableSolidColorBrush(Colors.Red);
+            var target1 = new ImmutablePen(
+                brush: brush,
+                thickness: 2,
+                dashStyle: new ImmutableDashStyle(new[] { 0.1, 0.2 }, 5),
+                lineCap: PenLineCap.Round,
+                lineJoin: PenLineJoin.Round,
+                miterLimit: 21);
+            var target2 = new Pen(
+                brush: brush,
+                thickness: 2,
+                dashStyle: new DashStyle(new[] { 0.1, 0.2 }, 5),
+                lineCap: PenLineCap.Round,
+                lineJoin: PenLineJoin.Round,
+                miterLimit: 21);
+
+            Assert.True(Equals(target1, target2));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/PixelRectTests.cs b/tests/Avalonia.Base.UnitTests/Media/PixelRectTests.cs
new file mode 100644
index 0000000000..61c410ca8e
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/PixelRectTests.cs
@@ -0,0 +1,43 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class PixelRectTests
+    {
+        [Fact]
+        public void FromRect_Snaps_To_Device_Pixels()
+        {
+            var rect = new Rect(189, 189, 26, 164);
+            var result = PixelRect.FromRect(rect, 1.5);
+
+            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
+        }
+
+        [Fact]
+        public void FromRect_Vector_Snaps_To_Device_Pixels()
+        {
+            var rect = new Rect(189, 189, 26, 164);
+            var result = PixelRect.FromRect(rect, new Vector(1.5, 1.5));
+
+            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
+        }
+
+        [Fact]
+        public void FromRectWithDpi_Snaps_To_Device_Pixels()
+        {
+            var rect = new Rect(189, 189, 26, 164);
+            var result = PixelRect.FromRectWithDpi(rect, 144);
+
+            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
+        }
+
+        [Fact]
+        public void FromRectWithDpi_Vector_Snaps_To_Device_Pixels()
+        {
+            var rect = new Rect(189, 189, 26, 164);
+            var result = PixelRect.FromRectWithDpi(rect, new Vector(144, 144));
+
+            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/RectTests.cs b/tests/Avalonia.Base.UnitTests/Media/RectTests.cs
new file mode 100644
index 0000000000..96473348cd
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/RectTests.cs
@@ -0,0 +1,15 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class RectTests
+    {
+        [Fact]
+        public void Parse_Parses()
+        {
+            var rect = Rect.Parse("1,2 3,-4");
+            var expected = new Rect(1, 2, 3, -4);
+            Assert.Equal(expected, rect);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs b/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs
new file mode 100644
index 0000000000..387b2f4a19
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs
@@ -0,0 +1,38 @@
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class RectangleGeometryTests
+    {
+        [Fact]
+        public void Rectangle_With_Transform_Can_Be_Changed()
+        {
+            using (UnitTestApplication.Start(GetServices()))
+            {
+                var target = new RectangleGeometry
+                {
+                    Rect = new Rect(0, 0, 100, 100),
+                    Transform = new RotateTransform(45),
+                };
+
+                target.Rect = new Rect(50, 50, 150, 150);
+            }
+        }
+
+        private TestServices GetServices()
+        {
+            var context = Mock.Of<IStreamGeometryContextImpl>();
+            var transformedGeometry = new Mock<ITransformedGeometryImpl>();
+            var streamGeometry = Mock.Of<IStreamGeometryImpl>(x => 
+                x.Open() == context &&
+                x.WithTransform(It.IsAny<Matrix>()) == transformedGeometry.Object);
+            var renderInterface = Mock.Of<IPlatformRenderInterface>(x =>
+                x.CreateStreamGeometry() == streamGeometry);
+            return new TestServices(renderInterface: renderInterface);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/SolidColorBrushTests.cs b/tests/Avalonia.Base.UnitTests/Media/SolidColorBrushTests.cs
new file mode 100644
index 0000000000..c982d8c1c8
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/SolidColorBrushTests.cs
@@ -0,0 +1,20 @@
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class SolidColorBrushTests
+    {
+        [Fact]
+        public void Changing_Color_Raises_Invalidated()
+        {
+            var target = new SolidColorBrush(Colors.Red);
+            var raised = false;
+
+            target.Invalidated += (s, e) => raised = true;
+            target.Color = Colors.Green;
+
+            Assert.True(raised);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextDecorationTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextDecorationTests.cs
new file mode 100644
index 0000000000..c4537ea2f8
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextDecorationTests.cs
@@ -0,0 +1,28 @@
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class TextDecorationTests
+    {
+        [Fact]
+        public void Should_Parse_TextDecorations()
+        {
+            var baseline = TextDecorationCollection.Parse("baseline");
+
+            Assert.Equal(TextDecorationLocation.Baseline, baseline[0].Location);
+
+            var underline = TextDecorationCollection.Parse("underline");
+
+            Assert.Equal(TextDecorationLocation.Underline, underline[0].Location);
+
+            var overline = TextDecorationCollection.Parse("overline");
+
+            Assert.Equal(TextDecorationLocation.Overline, overline[0].Location);
+
+            var strikethrough = TextDecorationCollection.Parse("strikethrough");
+
+            Assert.Equal(TextDecorationLocation.Strikethrough, strikethrough[0].Location);
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiAlgorithmTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiAlgorithmTests.cs
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiAlgorithmTests.cs
rename to tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiAlgorithmTests.cs
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
new file mode 100644
index 0000000000..f6b01d737c
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using Avalonia.Base.UnitTests.Media.TextFormatting;
+
+namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
+{
+    internal class BiDiClassTestDataGenerator : IEnumerable<BiDiClassData>
+    {
+        private readonly List<BiDiClassData> _testData;
+
+        public BiDiClassTestDataGenerator()
+        {
+            _testData = ReadData();
+        }
+        
+        public IEnumerator<BiDiClassData> GetEnumerator()
+        {
+            return _testData.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+        
+        private static List<BiDiClassData> ReadData()
+        {
+            var testData = new List<BiDiClassData>();
+            
+            using (var client = new HttpClient())
+            {
+                var url = Path.Combine(UnicodeDataGenerator.Ucd, "BidiCharacterTest.txt");
+
+                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                        return testData;
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        var lineNumber = 0;
+                        
+                        // Process each line
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            lineNumber++;
+                            
+                            if (line == null)
+                            {
+                                break;
+                            }
+
+                            if (line.StartsWith("#") || string.IsNullOrEmpty(line))
+                            {
+                                continue;
+                            }
+                            
+                            // Split into fields
+                            var fields = line.Split(';');
+
+                            // Parse field 0 - code points
+                            var codePoints = fields[0].Split(' ').Select(x => x.Trim()).Where(x => !string.IsNullOrEmpty(x)).Select(x => Convert.ToInt32(x, 16)).ToArray();
+
+                            // Parse field 1 - paragraph level
+                            var paragraphLevel = sbyte.Parse(fields[1]);
+
+                            // Parse field 2 - resolved paragraph level
+                            var resolvedParagraphLevel = sbyte.Parse(fields[2]);
+
+                            // Parse field 3 - resolved levels
+                            var resolvedLevels = fields[3].Split(' ').Select(x => x.Trim()).Where(x => !string.IsNullOrEmpty(x)).Select(x => x == "x" ? (sbyte)-1 : Convert.ToSByte(x)).ToArray();
+
+                            // Parse field 4 - resolved levels
+                            var resolvedOrder = fields[4].Split(' ').Select(x => x.Trim()).Where(x => !string.IsNullOrEmpty(x)).Select(x => Convert.ToInt32(x)).ToArray();
+
+                            testData.Add(new BiDiClassData
+                            {
+                                LineNumber = lineNumber,
+                                CodePoints = codePoints,
+                                ParagraphLevel = paragraphLevel,
+                                ResolvedParagraphLevel = resolvedParagraphLevel,
+                                ResolvedLevels = resolvedLevels,
+                                ResolvedOrder = resolvedOrder
+                            });
+                        }
+                    }
+                }
+            }
+
+            return testData;
+        }
+        
+       
+    }
+    
+    internal struct BiDiClassData
+    {
+        public int LineNumber { get; set; }
+        public int[] CodePoints{ get; set; }
+        public sbyte ParagraphLevel{ get; set; }
+        public  sbyte ResolvedParagraphLevel{ get; set; }
+        public sbyte[] ResolvedLevels{ get; set; }
+        public int[] ResolvedOrder{ get; set; }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiClassTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTests.cs
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiClassTests.cs
rename to tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTests.cs
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
new file mode 100644
index 0000000000..033e0e2242
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using Avalonia.Base.UnitTests.Media.TextFormatting;
+using Avalonia.Media.TextFormatting.Unicode;
+
+namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
+{
+    internal class BiDiTestDataGenerator : IEnumerable<BiDiTestData>
+    {
+        private readonly List<BiDiTestData> _testData;
+
+        public BiDiTestDataGenerator()
+        {
+            _testData = ReadTestData();
+        }
+
+        public IEnumerator<BiDiTestData> GetEnumerator()
+        {
+            return _testData.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        private static List<BiDiTestData> ReadTestData()
+        {
+            var testData = new List<BiDiTestData>();
+
+            using (var client = new HttpClient())
+            {
+                var url = Path.Combine(UnicodeDataGenerator.Ucd, "BidiTest.txt");
+
+                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                        return testData;
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        var lineNumber = 0;
+
+                        // Process each line
+                        int[] levels = null;
+
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            lineNumber++;
+
+                            if (line == null)
+                            {
+                                break;
+                            }
+
+                            if (line.StartsWith("#") || string.IsNullOrEmpty(line))
+                            {
+                                continue;
+                            }
+
+                            // Directive?
+                            if (line.StartsWith("@"))
+                            {
+                                if (line.StartsWith("@Levels:"))
+                                {
+                                    levels = line.Substring(8).Trim().Split(' ').Where(x => x.Length > 0).Select(x =>
+                                    {
+                                        if (x == "x")
+                                        {
+                                            return -1;
+                                        }
+
+                                        return int.Parse(x);
+
+                                    }).ToArray();
+                                }
+
+                                continue;
+                            }
+
+                            // Split data line
+                            var parts = line.Split(';');
+
+                            // Get the directions
+                            var directions = parts[0].Split(' ').Select(PropertyValueAliasHelper.GetBiDiClass)
+                                .ToArray();
+
+                            // Get the bit set
+                            var bitset = Convert.ToInt32(parts[1].Trim(), 16);
+
+                            for (var bit = 1; bit < 8; bit <<= 1)
+                            {
+                                if ((bitset & bit) == 0)
+                                {
+                                    continue;
+                                }
+
+                                sbyte paragraphEmbeddingLevel;
+
+                                switch (bit)
+                                {
+                                    case 1:
+                                        paragraphEmbeddingLevel = 2; // Auto
+                                        break;
+
+                                    case 2:
+                                        paragraphEmbeddingLevel = 0; // LTR
+                                        break;
+
+                                    case 4:
+                                        paragraphEmbeddingLevel = 1; // RTL
+                                        break;
+
+                                    default:
+                                        throw new NotSupportedException();
+                                }
+
+                                testData.Add(new BiDiTestData
+                                {
+                                    LineNumber = lineNumber,
+                                    Classes = directions,
+                                    ParagraphEmbeddingLevel = paragraphEmbeddingLevel,
+                                    Levels = levels
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+
+            return testData;
+        }
+    }
+
+    internal class BiDiTestData
+    {
+        public int LineNumber { get; set; }
+        public BidiClass[] Classes { get; set; }
+        public sbyte ParagraphEmbeddingLevel { get; set; }
+        public int[] Levels { get; set; }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BreakPairTable.txt b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BreakPairTable.txt
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BreakPairTable.txt
rename to tests/Avalonia.Base.UnitTests/Media/TextFormatting/BreakPairTable.txt
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs
new file mode 100644
index 0000000000..7ad2e71d77
--- /dev/null
+++ b/tests/Avalonia.Base.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.Base.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.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs
new file mode 100644
index 0000000000..e1e3e14ea7
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs
@@ -0,0 +1,61 @@
+using System;
+using Avalonia.Media.TextFormatting.Unicode;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media.TextFormatting
+{
+    /// <summary>
+    ///     This class is intended for use when the Unicode spec changes. Otherwise the containing tests are redundant.
+    ///     To update the <c>GraphemeBreak.trie</c> run the <see cref="Should_Generate_Trie"/> test.
+    /// </summary>
+    public class GraphemeBreakClassTrieGeneratorTests
+    {
+        [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.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
new file mode 100644
index 0000000000..1dbfbe4d24
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
@@ -0,0 +1,259 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using Avalonia.Media.TextFormatting.Unicode;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Avalonia.Base.UnitTests.Media.TextFormatting
+{
+    public class LineBreakEnumeratorTests
+    {
+        private readonly ITestOutputHelper _outputHelper;
+        
+        public LineBreakEnumeratorTests(ITestOutputHelper outputHelper)
+        {
+            _outputHelper = outputHelper;
+        }
+        
+        [Fact]
+        public void BasicLatinTest()
+        {
+            var lineBreaker = new LineBreakEnumerator("Hello World\r\nThis is a test.".AsMemory());
+
+            Assert.True(lineBreaker.MoveNext());
+            Assert.Equal(6, lineBreaker.Current.PositionWrap);
+            Assert.False(lineBreaker.Current.Required);
+
+            Assert.True(lineBreaker.MoveNext());
+            Assert.Equal(13, lineBreaker.Current.PositionWrap);
+            Assert.True(lineBreaker.Current.Required);
+
+            Assert.True(lineBreaker.MoveNext());
+            Assert.Equal(18, lineBreaker.Current.PositionWrap);
+            Assert.False(lineBreaker.Current.Required);
+
+            Assert.True(lineBreaker.MoveNext());
+            Assert.Equal(21, lineBreaker.Current.PositionWrap);
+            Assert.False(lineBreaker.Current.Required);
+
+            Assert.True(lineBreaker.MoveNext());
+            Assert.Equal(23, lineBreaker.Current.PositionWrap);
+            Assert.False(lineBreaker.Current.Required);
+
+            Assert.True(lineBreaker.MoveNext());
+            Assert.Equal(28, lineBreaker.Current.PositionWrap);
+            Assert.False(lineBreaker.Current.Required);
+
+            Assert.False(lineBreaker.MoveNext());
+        }
+
+
+        [Fact]
+        public void ForwardTextWithOuterWhitespace()
+        {
+            var lineBreaker = new LineBreakEnumerator(" Apples Pears Bananas   ".AsMemory());
+            var positionsF = GetBreaks(lineBreaker);
+            Assert.Equal(1, positionsF[0].PositionWrap);
+            Assert.Equal(0, positionsF[0].PositionMeasure);
+            Assert.Equal(8, positionsF[1].PositionWrap);
+            Assert.Equal(7, positionsF[1].PositionMeasure);
+            Assert.Equal(14, positionsF[2].PositionWrap);
+            Assert.Equal(13, positionsF[2].PositionMeasure);
+            Assert.Equal(24, positionsF[3].PositionWrap);
+            Assert.Equal(21, positionsF[3].PositionMeasure);
+        }
+
+        private static List<LineBreak> GetBreaks(LineBreakEnumerator lineBreaker)
+        {
+            var breaks = new List<LineBreak>();
+
+            while (lineBreaker.MoveNext())
+            {
+                breaks.Add(lineBreaker.Current);
+            }
+
+            return breaks;
+        }
+
+        [Fact]
+        public void ForwardTest()
+        {
+            var lineBreaker = new LineBreakEnumerator("Apples Pears Bananas".AsMemory());
+
+            var positionsF = GetBreaks(lineBreaker);
+            Assert.Equal(7, positionsF[0].PositionWrap);
+            Assert.Equal(6, positionsF[0].PositionMeasure);
+            Assert.Equal(13, positionsF[1].PositionWrap);
+            Assert.Equal(12, positionsF[1].PositionMeasure);
+            Assert.Equal(20, positionsF[2].PositionWrap);
+            Assert.Equal(20, positionsF[2].PositionMeasure);
+        }
+
+        [Theory(Skip = "Only run when the Unicode spec changes.")]
+        [ClassData(typeof(LineBreakTestDataGenerator))]
+        public void ShouldFindBreaks(int lineNumber, int[] codePoints, int[] breakPoints)
+        {
+            var text = string.Join(null, codePoints.Select(char.ConvertFromUtf32));
+
+            var lineBreaker = new LineBreakEnumerator(text.AsMemory());
+
+            var foundBreaks = new List<int>();
+            
+            while (lineBreaker.MoveNext())
+            {
+                foundBreaks.Add(lineBreaker.Current.PositionWrap);
+            }
+            
+            // Check the same
+            var pass = true;
+
+            if (foundBreaks.Count != breakPoints.Length)
+            {
+                pass = false;
+            }
+            else
+            {
+                for (var i = 0; i < foundBreaks.Count; i++)
+                {
+                    if (foundBreaks[i] != breakPoints[i])
+                    {
+                        pass = false;
+                    }
+                }
+            }
+
+            if (!pass)
+            {
+                _outputHelper.WriteLine($"Failed test on line {lineNumber}");
+                _outputHelper.WriteLine("");
+                _outputHelper.WriteLine($"    Code Points: {string.Join(" ", codePoints)}");
+                _outputHelper.WriteLine($"Expected Breaks: {string.Join(" ", breakPoints)}");
+                _outputHelper.WriteLine($"  Actual Breaks: {string.Join(" ", foundBreaks)}");
+                _outputHelper.WriteLine($"           Text: {text}");
+                _outputHelper.WriteLine($"     Char Props: {string.Join(" ", codePoints.Select(x => new Codepoint(x).LineBreakClass))}");
+                _outputHelper.WriteLine("");
+            }
+            
+            Assert.True(pass);
+        }
+
+        private class LineBreakTestDataGenerator : IEnumerable<object[]>
+        {
+            private readonly List<object[]> _testData;
+
+            public LineBreakTestDataGenerator()
+            {
+                _testData = GenerateTestData();
+            }
+
+            public IEnumerator<object[]> GetEnumerator()
+            {
+                return _testData.GetEnumerator();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+
+            private static List<object[]> GenerateTestData()
+            {
+                // Process each line
+                var tests = new List<object[]>();
+
+                // Read the test file
+                var url = Path.Combine(UnicodeDataGenerator.Ucd, "auxiliary/LineBreakTest.txt");
+
+                using (var client = new HttpClient())
+                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                    {
+                        return tests;
+                    }
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        var lineNumber = 1;
+
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            if (line is null)
+                            {
+                                break;
+                            }
+
+                            // Get the line, remove comments
+                            line = line.Split('#')[0].Trim();
+
+                            // Ignore blank/comment only lines
+                            if (string.IsNullOrWhiteSpace(line))
+                            {
+                                lineNumber++;
+                                continue;
+                            }
+
+                            var codePoints = new List<int>();
+                            var breakPoints = new List<int>();
+
+                            // Parse the test
+                            var p = 0;
+
+                            while (p < line.Length)
+                            {
+                                // Ignore white space
+                                if (char.IsWhiteSpace(line[p]))
+                                {
+                                    p++;
+                                    continue;
+                                }
+
+                                if (line[p] == '×')
+                                {
+                                    p++;
+                                    continue;
+                                }
+
+                                if (line[p] == '÷')
+                                {
+                                    breakPoints.Add(codePoints.Select(x=> x > ushort.MaxValue ? 2 : 1).Sum());
+                                    p++;
+                                    continue;
+                                }
+
+                                var codePointPos = p;
+
+                                while (p < line.Length && IsHexDigit(line[p]))
+                                {
+                                    p++;
+                                }
+
+                                var codePointStr = line.Substring(codePointPos, p - codePointPos);
+                                var codePoint = Convert.ToInt32(codePointStr, 16);
+                                codePoints.Add(codePoint);
+                            }
+
+                            tests.Add(new object[] { lineNumber, codePoints.ToArray(), breakPoints.ToArray() });
+
+                            lineNumber++;
+                        }
+                    }
+                }
+
+                return tests;
+            }
+
+            private static bool IsHexDigit(char ch)
+            {
+                return char.IsDigit(ch) || (ch >= 'A' && ch <= 'F') || (ch >= 'a' && ch <= 'f');
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/TestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/TestDataGenerator.cs
new file mode 100644
index 0000000000..33b4c8a269
--- /dev/null
+++ b/tests/Avalonia.Base.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.Base.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.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
new file mode 100644
index 0000000000..e2877abd83
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
@@ -0,0 +1,439 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Text.RegularExpressions;
+using Avalonia.Media.TextFormatting.Unicode;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media.TextFormatting
+{
+    internal static class UnicodeDataGenerator
+    {
+        public const string Ucd = "https://www.unicode.org/Public/13.0.0/ucd/";
+
+        public static UnicodeTrie GenerateBiDiTrie(out BiDiDataEntries biDiDataEntries,out Dictionary<int, BiDiDataItem> biDiData)
+        {
+            biDiData = new Dictionary<int, BiDiDataItem>();
+
+            var biDiClassEntries =
+                UnicodeEnumsGenerator.CreateBiDiClassEnum();
+
+            var biDiClassMappings = CreateTagToIndexMappings(biDiClassEntries);
+
+            var biDiClassData = ReadBiDiData();
+
+            foreach (var (range, name) in biDiClassData)
+            {
+                var biDiClass = biDiClassMappings[name];
+
+                AddBiDiClassRange(biDiData, range, biDiClass);
+            }
+
+            var biDiPairedBracketTypeEntries = UnicodeEnumsGenerator.CreateBiDiPairedBracketTypeEnum();
+
+            var biDiPairedBracketTypeMappings = CreateTagToIndexMappings(biDiPairedBracketTypeEntries);
+
+            var biDiPairedBracketData = ReadBiDiPairedBracketData();
+            
+            foreach (var (range, name) in biDiPairedBracketData)
+            {
+                var bracketType = biDiPairedBracketTypeMappings[name];
+
+                AddBiDiBracket(biDiData, range, bracketType);
+            }
+            
+            var biDiTrieBuilder = new UnicodeTrieBuilder(/*initialValue*/);
+            
+            foreach (var properties in biDiData.Values)
+            {
+                //[bracket]|[bracketType]|[biDiClass]
+                var value = (properties.BiDiClass << UnicodeData.BIDICLASS_SHIFT) |
+                            (properties.BracketType << UnicodeData.BIDIPAIREDBRACKEDTYPE_SHIFT) | properties.Bracket;
+
+                biDiTrieBuilder.Set(properties.Codepoint, (uint)value);
+            }
+
+            biDiDataEntries = new BiDiDataEntries()
+            {
+                PairedBracketTypes = biDiPairedBracketTypeEntries, BiDiClasses = biDiClassEntries
+            };
+            
+            using (var stream = File.Create("Generated\\BiDi.trie"))
+            {
+                var trie = biDiTrieBuilder.Freeze();
+
+                trie.Save(stream);
+
+                return trie;
+            }
+        }
+
+        public static UnicodeTrie GenerateUnicodeDataTrie(out UnicodeDataEntries dataEntries, out Dictionary<int, UnicodeDataItem> unicodeData)
+        {
+            var generalCategoryEntries =
+                UnicodeEnumsGenerator.CreateGeneralCategoryEnum();
+
+            var generalCategoryMappings = CreateTagToIndexMappings(generalCategoryEntries);
+            
+            var scriptEntries = UnicodeEnumsGenerator.CreateScriptEnum();
+
+            var scriptMappings = CreateNameToIndexMappings(scriptEntries);
+            
+            var lineBreakClassEntries =
+                UnicodeEnumsGenerator.CreateLineBreakClassEnum();
+
+            var lineBreakClassMappings = CreateTagToIndexMappings(lineBreakClassEntries);
+
+            unicodeData = GetUnicodeData(generalCategoryMappings, scriptMappings, lineBreakClassMappings);
+            
+            var unicodeDataTrieBuilder = new UnicodeTrieBuilder(/*initialValue*/);
+            
+            foreach (var properties in unicodeData.Values)
+            {
+                //[line break]|[biDi]|[script]|[category]
+                var value = (properties.LineBreakClass << UnicodeData.LINEBREAK_SHIFT) |
+                            (properties.Script << UnicodeData.SCRIPT_SHIFT) | properties.GeneralCategory;
+
+                unicodeDataTrieBuilder.Set(properties.Codepoint, (uint)value);
+            }
+
+            dataEntries = new UnicodeDataEntries
+            {
+                Scripts = scriptEntries,
+                GeneralCategories = generalCategoryEntries,
+                LineBreakClasses = lineBreakClassEntries
+            };
+
+            using (var stream = File.Create("Generated\\UnicodeData.trie"))
+            {
+                var trie = unicodeDataTrieBuilder.Freeze();
+
+                trie.Save(stream);
+                
+                return trie;
+            }
+        }
+
+        private static Dictionary<int, UnicodeDataItem> GetUnicodeData(IReadOnlyDictionary<string, int> generalCategoryMappings, 
+            IReadOnlyDictionary<string, int> scriptMappings, IReadOnlyDictionary<string, int> lineBreakClassMappings)
+        {
+            var unicodeData = new Dictionary<int, UnicodeDataItem>();
+            
+            var generalCategoryData = ReadGeneralCategoryData();
+
+            foreach (var (range, name) in generalCategoryData)
+            {
+                var generalCategory = generalCategoryMappings[name];
+
+                AddGeneralCategoryRange(unicodeData, range, generalCategory);
+            }
+            
+            var scriptData = ReadScriptData();
+
+            foreach (var (range, name) in scriptData)
+            {
+                var script = scriptMappings[name];
+
+                AddScriptRange(unicodeData, range, script);
+            }
+            
+            var lineBreakClassData = ReadLineBreakClassData();
+
+            foreach (var (range, name) in lineBreakClassData)
+            {
+                var lineBreakClass = lineBreakClassMappings[name];
+
+                AddLineBreakClassRange(unicodeData, range, lineBreakClass);
+            }
+
+            return unicodeData;
+        }
+
+        private static Dictionary<string, int> CreateTagToIndexMappings(IReadOnlyList<DataEntry> entries)
+        {
+            var mappings = new Dictionary<string, int>();
+
+            for (var i = 0; i < entries.Count; i++)
+            {
+                mappings.Add(entries[i].Tag, i);
+            }
+
+            return mappings;
+        }
+
+        private static Dictionary<string, int> CreateNameToIndexMappings(IReadOnlyList<DataEntry> entries)
+        {
+            var mappings = new Dictionary<string, int>();
+
+            for (var i = 0; i < entries.Count; i++)
+            {
+                mappings.Add(entries[i].Name, i);
+            }
+
+            return mappings;
+        }
+
+        private static void AddGeneralCategoryRange(Dictionary<int, UnicodeDataItem> codepoints, CodepointRange range,
+            int generalCategory)
+        {
+            for (var i = range.Start; i <= range.End; i++)
+            {
+                if (!codepoints.ContainsKey(i))
+                {
+                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, GeneralCategory = generalCategory });
+                }
+                else
+                {
+                    codepoints[i].GeneralCategory = generalCategory;
+                }
+            }
+        }
+
+        private static void AddScriptRange(Dictionary<int, UnicodeDataItem> codepoints, CodepointRange range,
+            int script)
+        {
+            for (var i = range.Start; i <= range.End; i++)
+            {
+                if (!codepoints.ContainsKey(i))
+                {
+                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, Script = script });
+                }
+                else
+                {
+                    codepoints[i].Script = script;
+                }
+            }
+        }
+
+        private static void AddBiDiClassRange(Dictionary<int, BiDiDataItem> codepoints, CodepointRange range,
+            int biDiClass)
+        {
+            for (var i = range.Start; i <= range.End; i++)
+            {
+                if (!codepoints.ContainsKey(i))
+                {
+                    codepoints.Add(i, new BiDiDataItem { Codepoint = i, BiDiClass = biDiClass });
+                }
+                else
+                {
+                    codepoints[i].BiDiClass = biDiClass;
+                }
+            }
+        }
+
+        private static void AddBiDiBracket(Dictionary<int, BiDiDataItem> codepoints, CodepointRange range,
+            int bracketType)
+        {
+            if (!codepoints.ContainsKey(range.Start))
+            {
+                codepoints.Add(range.Start,
+                    new BiDiDataItem { Codepoint = range.Start, Bracket = range.End, BracketType = bracketType });
+            }
+            else
+            {
+                var codepoint = codepoints[range.Start];
+
+                codepoint.Bracket = range.End;
+                codepoint.BracketType = bracketType;
+            }
+        }
+
+        private static void AddLineBreakClassRange(Dictionary<int, UnicodeDataItem> codepoints, CodepointRange range,
+            int lineBreakClass)
+        {
+            for (var i = range.Start; i <= range.End; i++)
+            {
+                if (!codepoints.ContainsKey(i))
+                {
+                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, LineBreakClass = lineBreakClass });
+                }
+                else
+                {
+                    codepoints[i].LineBreakClass = lineBreakClass;
+                }
+            }
+        }
+
+        public static List<(CodepointRange, string)> ReadGeneralCategoryData()
+        {
+            return ReadUnicodeData("extracted/DerivedGeneralCategory.txt");
+        }
+
+        public static List<(CodepointRange, string)> ReadScriptData()
+        {
+            return ReadUnicodeData("Scripts.txt");
+        }
+
+        public static List<(CodepointRange, string)> ReadBiDiData()
+        {
+            return ReadUnicodeData("extracted/DerivedBidiClass.txt");
+        }
+
+        public static List<(CodepointRange, string)> ReadLineBreakClassData()
+        {
+            return ReadUnicodeData("extracted/DerivedLineBreak.txt");
+        }
+        
+        public static List<(CodepointRange, string)> ReadBiDiPairedBracketData()
+        {
+            const string file = "BidiBrackets.txt";
+        
+            var data = new List<(CodepointRange, string)>();
+            
+            var regex = new Regex(@"^([0-9A-F]+);\s([0-9A-F]+);\s([ocn])");
+
+            using (var client = new HttpClient())
+            {
+                var url = Path.Combine(Ucd, file);
+
+                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                    {
+                        return data;
+                    }
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            if (string.IsNullOrEmpty(line))
+                            {
+                                continue;
+                            }
+
+                            var match = regex.Match(line);
+
+                            if (!match.Success)
+                            {
+                                continue;
+                            }
+
+                            var start = Convert.ToInt32(match.Groups[1].Value, 16);
+
+                            var end = start;
+
+                            if (!string.IsNullOrEmpty(match.Groups[2].Value))
+                            {
+                                end = Convert.ToInt32(match.Groups[2].Value, 16);
+                            }
+
+                            data.Add((new CodepointRange(start, end), match.Groups[3].Value));
+                        }
+                    }
+                }
+            }
+
+            return data;
+        }
+
+        private static List<(CodepointRange, string)> ReadUnicodeData(string file)
+        {
+            var data = new List<(CodepointRange, string)>();
+
+            var regex = new Regex(@"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s+;\s+(\w+)\s+#.*", RegexOptions.Compiled);
+
+            using (var client = new HttpClient())
+            {
+                var url = Path.Combine(Ucd, file);
+
+                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                    {
+                        return data;
+                    }
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            if (string.IsNullOrEmpty(line))
+                            {
+                                continue;
+                            }
+
+                            var match = regex.Match(line);
+
+                            if (!match.Success)
+                            {
+                                continue;
+                            }
+
+                            var start = Convert.ToInt32(match.Groups[1].Value, 16);
+
+                            var end = start;
+
+                            if (!string.IsNullOrEmpty(match.Groups[2].Value))
+                            {
+                                end = Convert.ToInt32(match.Groups[2].Value, 16);
+                            }
+
+                            data.Add((new CodepointRange(start, end), match.Groups[3].Value));
+                        }
+                    }
+                }
+            }
+
+            return data;
+        }
+
+        internal class UnicodeDataItem
+        {
+            public int Codepoint { get; set; }
+
+            public int Script { get; set; }
+
+            public int GeneralCategory { get; set; }
+
+            public int BiDiClass { get; set; }
+
+            public int LineBreakClass { get; set; }
+        }
+        
+        internal class BiDiDataItem
+        {
+            public int Codepoint { get; set; }
+
+            public int Bracket { get; set; }
+
+            public int BracketType { get; set; }
+
+            public int BiDiClass { get; set; }
+        }
+        
+
+    }
+    
+    internal class UnicodeDataEntries
+    {
+        public IReadOnlyList<DataEntry> Scripts { get; set; }
+        public IReadOnlyList<DataEntry> GeneralCategories{ get; set; }
+        public IReadOnlyList<DataEntry> LineBreakClasses{ get; set; }
+    }
+    
+    internal class BiDiDataEntries
+    {
+        public IReadOnlyList<DataEntry> PairedBracketTypes { get; set; }
+        public IReadOnlyList<DataEntry> BiDiClasses{ get; set; }
+    }
+
+    internal readonly struct CodepointRange
+    {
+        public CodepointRange(int start, int end)
+        {
+            Start = start;
+            End = end;
+        }
+
+        public int Start { get; }
+        public int End { get; }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs
new file mode 100644
index 0000000000..f3aea83316
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs
@@ -0,0 +1,55 @@
+using System.IO;
+using Avalonia.Media.TextFormatting.Unicode;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media.TextFormatting
+{
+    public class UnicodeDataGeneratorTests
+    {
+        /// <summary>
+        ///     This test is used to generate all Unicode related types.
+        ///     We only need to run this when the Unicode spec changes.
+        /// </summary>
+        [Fact(Skip = "Only run when the Unicode spec changes.")]
+        public void Should_Generate_Data()
+        {
+            if (!Directory.Exists("Generated"))
+            {
+                Directory.CreateDirectory("Generated");
+            }
+
+            var unicodeDataTrie = UnicodeDataGenerator.GenerateUnicodeDataTrie(out var unicodeDataEntries, out var unicodeData);
+
+            foreach (var value in unicodeData.Values)
+            {
+                var data = unicodeDataTrie.Get(value.Codepoint);
+                
+                Assert.Equal(value.GeneralCategory, GetValue(data, 0, UnicodeData.CATEGORY_MASK));
+                
+                Assert.Equal(value.Script, GetValue(data, UnicodeData.SCRIPT_SHIFT, UnicodeData.SCRIPT_MASK));
+                
+                Assert.Equal(value.LineBreakClass, GetValue(data, UnicodeData.LINEBREAK_SHIFT, UnicodeData.LINEBREAK_MASK));
+            }
+            
+            var biDiTrie = UnicodeDataGenerator.GenerateBiDiTrie(out var biDiDataEntries, out var biDiData);
+
+            foreach (var value in biDiData.Values)
+            {
+                var data = biDiTrie.Get(value.Codepoint);
+                
+                Assert.Equal(value.Bracket, GetValue(data, 0, UnicodeData.BIDIPAIREDBRACKED_MASK));
+                
+                Assert.Equal(value.BracketType, GetValue(data, UnicodeData.BIDIPAIREDBRACKEDTYPE_SHIFT, UnicodeData.BIDIPAIREDBRACKEDTYPE_MASK));
+                
+                Assert.Equal(value.BiDiClass, GetValue(data, UnicodeData.BIDICLASS_SHIFT, UnicodeData.BIDICLASS_MASK));
+            }
+            
+            UnicodeEnumsGenerator.CreatePropertyValueAliasHelper(unicodeDataEntries, biDiDataEntries);
+        }
+
+        private static int GetValue(uint value, int shift, int mask)
+        {
+            return (int)((value >> shift) & mask);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
new file mode 100644
index 0000000000..1323ddfbd1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
@@ -0,0 +1,474 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+
+namespace Avalonia.Base.UnitTests.Media.TextFormatting
+{
+    internal static class UnicodeEnumsGenerator
+    {
+        public static List<DataEntry> CreateScriptEnum()
+        {
+            var entries = new List<DataEntry>
+            {
+                new DataEntry("Unknown", "Zzzz", string.Empty),
+                new DataEntry("Common", "Zyyy", string.Empty),
+                new DataEntry("Inherited", "Zinh", string.Empty)
+            };
+
+            ParseDataEntries("# Script (sc)", entries);
+
+            using (var stream = File.Create("Generated\\Script.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    public enum Script");
+                writer.WriteLine("    {");
+
+                foreach (var entry in entries)
+                {
+                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
+                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
+                }
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+
+            return entries;
+        }
+
+        public static List<DataEntry> CreateGeneralCategoryEnum()
+        {
+            var entries = new List<DataEntry> { new DataEntry("Other", "C", " Cc | Cf | Cn | Co | Cs") };
+
+            ParseDataEntries("# General_Category (gc)", entries);
+
+            using (var stream = File.Create("Generated\\GeneralCategory.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    public enum GeneralCategory");
+                writer.WriteLine("    {");
+
+                foreach (var entry in entries)
+                {
+                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
+                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
+                }
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+
+            return entries;
+        }
+
+        public static List<DataEntry> CreateGraphemeBreakTypeEnum()
+        {
+            var entries = new List<DataEntry> { new DataEntry("Other", "XX", string.Empty) };
+
+            ParseDataEntries("# Grapheme_Cluster_Break (GCB)", entries);
+
+            using (var stream = File.Create("Generated\\GraphemeBreakClass.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    public enum GraphemeBreakClass");
+                writer.WriteLine("    {");
+
+                foreach (var entry in entries)
+                {
+                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
+                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
+                }
+
+                writer.WriteLine("        ExtendedPictographic");
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+
+            return entries;
+        }
+
+        private static List<string> GenerateBreakPairTable()
+        {
+            var rows = new List<string[]>();
+
+            using (var stream =
+                typeof(UnicodeEnumsGenerator).Assembly.GetManifestResourceStream(
+                    "Avalonia.Visuals.UnitTests.Media.TextFormatting.BreakPairTable.txt"))
+            using (var reader = new StreamReader(stream))
+            {
+                while (!reader.EndOfStream)
+                {
+                    var line = reader.ReadLine();
+
+                    var columns = line.Split('\t');
+
+                    rows.Add(columns);
+                }
+            }
+
+            using (var stream = File.Create("Generated\\BreakPairTable.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    internal static class BreakPairTable");
+                writer.WriteLine("    {");
+
+                writer.WriteLine("        private static readonly byte[][] s_breakPairTable = ");
+                writer.WriteLine("            {");
+
+                for (var i = 1; i < rows.Count; i++)
+                {
+                    writer.Write("             new byte[] {");
+
+                    writer.Write($"{GetBreakPairType(rows[i][1])}");
+
+                    for (var index = 2; index < rows[i].Length; index++)
+                    {
+                        var column = rows[i][index];
+
+                        writer.Write($",{GetBreakPairType(column)}");
+                    }
+
+                    writer.Write("},");
+                    writer.Write(Environment.NewLine);
+                }
+                writer.WriteLine("        };");
+
+                writer.WriteLine();
+
+                writer.WriteLine("        public static PairBreakType Map(LineBreakClass first, LineBreakClass second)");
+                writer.WriteLine("        {");
+                writer.WriteLine("            return (PairBreakType)s_breakPairTable[(int)first][(int)second];");
+                writer.WriteLine("        }");
+
+                writer.WriteLine("    }");
+
+                writer.WriteLine();
+
+                writer.WriteLine("    internal enum PairBreakType : byte");
+                writer.WriteLine("    {");
+                writer.WriteLine("        DI = 0, // Direct break opportunity");
+                writer.WriteLine("        IN = 1, // Indirect break opportunity");
+                writer.WriteLine("        CI = 2, // Indirect break opportunity for combining marks");
+                writer.WriteLine("        CP = 3, // Prohibited break for combining marks");
+                writer.WriteLine("        PR = 4 // Prohibited break");
+                writer.WriteLine("    }");
+
+
+                writer.WriteLine("}");
+            }
+
+            return rows[0].Where(x => !string.IsNullOrEmpty(x)).ToList();
+        }
+
+        public const byte DI_BRK = 0; // Direct break opportunity
+        public const byte IN_BRK = 1; // Indirect break opportunity
+        public const byte CI_BRK = 2; // Indirect break opportunity for combining marks
+        public const byte CP_BRK = 3; // Prohibited break for combining marks
+        public const byte PR_BRK = 4; // Prohibited break
+
+        private static byte GetBreakPairType(string type)
+        {
+            switch (type)
+            {
+                case "_":
+                    return DI_BRK;
+                case "%":
+                    return IN_BRK;
+                case "#":
+                    return CI_BRK;
+                case "@":
+                    return CP_BRK;
+                case "^":
+                    return PR_BRK;
+                default:
+                    return byte.MaxValue;
+            }
+        }
+
+        public static List<DataEntry> CreateLineBreakClassEnum()
+        {
+            var usedLineBreakClasses = GenerateBreakPairTable();
+
+            var entries = new List<DataEntry> { new DataEntry("Unknown", "XX", string.Empty) };
+
+            ParseDataEntries("# Line_Break (lb)", entries);
+
+            var orderedLineBreakEntries = new Dictionary<string, DataEntry>();
+
+            foreach (var tag in usedLineBreakClasses)
+            {
+                var entry = entries.Single(x => x.Tag == tag);
+
+                orderedLineBreakEntries.Add(tag, entry);
+            }
+
+            foreach (var entry in entries)
+            {
+                if (orderedLineBreakEntries.ContainsKey(entry.Tag))
+                {
+                    continue;
+                }
+
+                orderedLineBreakEntries.Add(entry.Tag, entry);
+            }
+
+            using (var stream = File.Create("Generated\\LineBreakClass.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    public enum LineBreakClass");
+                writer.WriteLine("    {");
+
+                foreach (var entry in orderedLineBreakEntries.Values)
+                {
+                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
+                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
+                }
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+
+            return orderedLineBreakEntries.Values.ToList();
+        }
+
+        public static List<DataEntry> CreateBiDiClassEnum()
+        {
+            var entries = new List<DataEntry> { new DataEntry("Left_To_Right", "L", string.Empty) };
+
+            ParseDataEntries("# Bidi_Class (bc)", entries);
+
+            using (var stream = File.Create("Generated\\BiDiClass.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    public enum BiDiClass");
+                writer.WriteLine("    {");
+
+                foreach (var entry in entries)
+                {
+                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
+                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
+                }
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+
+            return entries;
+        }
+        
+        public static List<DataEntry> CreateBiDiPairedBracketTypeEnum()
+        {
+            var entries = new List<DataEntry> { new DataEntry("None", "n", string.Empty) };
+
+            ParseDataEntries("# Bidi_Paired_Bracket_Type (bpt)", entries);
+
+            using (var stream = File.Create("Generated\\BiDiPairedBracketType.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    public enum BiDiPairedBracketType");
+                writer.WriteLine("    {");
+
+                foreach (var entry in entries)
+                {
+                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
+                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
+                }
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+
+            return entries;
+        }
+
+        public static void CreatePropertyValueAliasHelper(UnicodeDataEntries unicodeDataEntries, 
+            BiDiDataEntries biDiDataEntries)
+        {
+            using (var stream = File.Create("Generated\\PropertyValueAliasHelper.cs"))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("using System.Collections.Generic;");
+                writer.WriteLine();
+
+                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
+                writer.WriteLine("{");
+                writer.WriteLine("    internal static class PropertyValueAliasHelper");
+                writer.WriteLine("    {");
+
+                WritePropertyValueAliasGetTag(writer, unicodeDataEntries.Scripts, "Script", "Zzzz");
+
+                WritePropertyValueAlias(writer, unicodeDataEntries.Scripts, "Script", "Unknown");
+
+                WritePropertyValueAlias(writer, unicodeDataEntries.GeneralCategories, "GeneralCategory", "Other");
+                
+                WritePropertyValueAlias(writer, unicodeDataEntries.LineBreakClasses, "LineBreakClass", "Unknown");
+
+                WritePropertyValueAlias(writer, biDiDataEntries.PairedBracketTypes, "BiDiPairedBracketType", "None");
+                
+                WritePropertyValueAlias(writer, biDiDataEntries.BiDiClasses, "BiDiClass", "LeftToRight");
+
+                writer.WriteLine("    }");
+                writer.WriteLine("}");
+            }
+        }
+
+        public static void ParseDataEntries(string property, List<DataEntry> entries)
+        {
+            using (var client = new HttpClient())
+            {
+                var url = Path.Combine(UnicodeDataGenerator.Ucd, "PropertyValueAliases.txt");
+
+                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
+                {
+                    if (!result.IsSuccessStatusCode)
+                    {
+                        return;
+                    }
+
+                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
+                    using (var reader = new StreamReader(stream))
+                    {
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            if (string.IsNullOrEmpty(line))
+                            {
+                                continue;
+                            }
+
+                            if (line != property)
+                            {
+                                continue;
+                            }
+
+                            reader.ReadLine();
+
+                            break;
+                        }
+
+                        while (!reader.EndOfStream)
+                        {
+                            var line = reader.ReadLine();
+
+                            if (string.IsNullOrEmpty(line) || line.StartsWith("#"))
+                            {
+                                break;
+                            }
+
+                            var elements = line.Split(';');
+
+                            var tag = elements[1].Trim();
+
+                            elements = elements[2].Split('#');
+
+                            var name = elements[0].Trim();
+
+                            if (entries.Any(x => x.Name == name))
+                            {
+                                continue;
+                            }
+
+                            var comment = string.Empty;
+
+                            if (elements.Length > 1)
+                            {
+                                comment = elements[1];
+                            }
+
+                            var entry = new DataEntry(name, tag, comment);
+
+                            entries.Add(entry);
+                        }
+                    }
+                }
+            }
+        }
+
+        private static void WritePropertyValueAliasGetTag(TextWriter writer, IEnumerable<DataEntry> entries,
+            string typeName, string defaultValue)
+        {
+            writer.WriteLine(
+                $"        private static readonly Dictionary<{typeName}, string> s_{typeName.ToLower()}ToTag = ");
+            writer.WriteLine($"            new Dictionary<{typeName}, string>{{");
+
+            foreach (var entry in entries)
+            {
+                writer.WriteLine($"                {{ {typeName}.{entry.Name.Replace("_", "")}, \"{entry.Tag}\"}},");
+            }
+
+            writer.WriteLine("        };");
+
+            writer.WriteLine();
+
+            writer.WriteLine($"        public static string GetTag({typeName} {typeName.ToLower()})");
+            writer.WriteLine("        {");
+            writer.WriteLine($"            if(!s_{typeName.ToLower()}ToTag.ContainsKey({typeName.ToLower()}))");
+            writer.WriteLine("            {");
+            writer.WriteLine($"                return \"{defaultValue}\";");
+            writer.WriteLine("            }");
+            writer.WriteLine($"            return s_{typeName.ToLower()}ToTag[{typeName.ToLower()}];");
+            writer.WriteLine("        }");
+
+            writer.WriteLine();
+        }
+
+        private static void WritePropertyValueAlias(TextWriter writer, IEnumerable<DataEntry> entries, string typeName,
+            string defaultValue)
+        {
+            writer.WriteLine($"        private static readonly Dictionary<string, {typeName}> s_tagTo{typeName} = ");
+            writer.WriteLine($"            new Dictionary<string,{typeName}>{{");
+
+            foreach (var entry in entries)
+            {
+                writer.WriteLine($"                {{ \"{entry.Tag}\", {typeName}.{entry.Name.Replace("_", "")}}},");
+            }
+
+            writer.WriteLine("        };");
+
+            writer.WriteLine();
+
+            writer.WriteLine($"        public static {typeName} Get{typeName}(string tag)");
+            writer.WriteLine("        {");
+            writer.WriteLine($"            if(!s_tagTo{typeName}.ContainsKey(tag))");
+            writer.WriteLine("            {");
+            writer.WriteLine($"                return {typeName}.{defaultValue};");
+            writer.WriteLine("            }");
+            writer.WriteLine($"            return s_tagTo{typeName}[tag];");
+            writer.WriteLine("        }");
+
+            writer.WriteLine();
+        }
+    }
+
+    public readonly struct DataEntry
+    {
+        public DataEntry(string name, string tag, string comment)
+        {
+            Name = name;
+            Tag = tag;
+            Comment = comment;
+        }
+
+        public string Name { get; }
+        public string Tag { get; }
+        public string Comment { get; }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TransformOperationsTests.cs b/tests/Avalonia.Base.UnitTests/Media/TransformOperationsTests.cs
new file mode 100644
index 0000000000..0d84ba1700
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TransformOperationsTests.cs
@@ -0,0 +1,297 @@
+using Avalonia.Media.Transformation;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class TransformOperationsTests
+    {
+        [Theory]
+        [InlineData("translate(10px)", 10d, 0d)]
+        [InlineData("translate(10px, 10px)", 10d, 10d)]
+        [InlineData("translate(0px, 10px)", 0d, 10d)]
+        [InlineData("translate(10px, 0px)", 10d, 0d)]
+        [InlineData("translateX(10px)", 10d, 0d)]
+        [InlineData("translateY(10px)", 0d, 10d)]
+        public void Can_Parse_Translation(string data, double x, double y)
+        {
+            var transform = TransformOperations.Parse(data);
+
+            var operations = transform.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Translate, operations[0].Type);
+            Assert.Equal(x, operations[0].Data.Translate.X);
+            Assert.Equal(y, operations[0].Data.Translate.Y);
+        }
+
+        [Theory]
+        [InlineData("rotate(90deg)", 90d)]
+        [InlineData("rotate(0.5turn)", 180d)]
+        [InlineData("rotate(200grad)", 180d)]
+        [InlineData("rotate(3.14159265rad)", 180d)]
+        public void Can_Parse_Rotation(string data, double angleDeg)
+        {
+            var transform = TransformOperations.Parse(data);
+
+            var operations = transform.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Rotate, operations[0].Type);
+            Assert.Equal(MathUtilities.Deg2Rad(angleDeg), operations[0].Data.Rotate.Angle, 4);
+        }
+
+        [Theory]
+        [InlineData("scale(10)", 10d, 10d)]
+        [InlineData("scale(10, 10)", 10d, 10d)]
+        [InlineData("scale(0, 10)", 0d, 10d)]
+        [InlineData("scale(10, 0)", 10d, 0d)]
+        [InlineData("scaleX(10)", 10d, 1d)]
+        [InlineData("scaleY(10)", 1d, 10d)]
+        public void Can_Parse_Scale(string data, double x, double y)
+        {
+            var transform = TransformOperations.Parse(data);
+
+            var operations = transform.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Scale, operations[0].Type);
+            Assert.Equal(x, operations[0].Data.Scale.X);
+            Assert.Equal(y, operations[0].Data.Scale.Y);
+        }
+
+        [Theory]
+        [InlineData("skew(90deg)", 90d, 0d)]
+        [InlineData("skew(0.5turn)", 180d, 0d)]
+        [InlineData("skew(200grad)", 180d, 0d)]
+        [InlineData("skew(3.14159265rad)", 180d, 0d)]
+        [InlineData("skewX(90deg)", 90d, 0d)]
+        [InlineData("skewX(0.5turn)", 180d, 0d)]
+        [InlineData("skewX(200grad)", 180d, 0d)]
+        [InlineData("skewX(3.14159265rad)", 180d, 0d)]
+        [InlineData("skew(0, 90deg)", 0d, 90d)]
+        [InlineData("skew(0, 0.5turn)", 0d, 180d)]
+        [InlineData("skew(0, 200grad)", 0d, 180d)]
+        [InlineData("skew(0, 3.14159265rad)", 0d, 180d)]
+        [InlineData("skewY(90deg)", 0d, 90d)]
+        [InlineData("skewY(0.5turn)", 0d, 180d)]
+        [InlineData("skewY(200grad)", 0d, 180d)]
+        [InlineData("skewY(3.14159265rad)", 0d, 180d)]
+        [InlineData("skew(90deg, 90deg)", 90d, 90d)]
+        [InlineData("skew(0.5turn, 0.5turn)", 180d, 180d)]
+        [InlineData("skew(200grad, 200grad)", 180d, 180d)]
+        [InlineData("skew(3.14159265rad, 3.14159265rad)", 180d, 180d)]
+        public void Can_Parse_Skew(string data, double x, double y)
+        {
+            var transform = TransformOperations.Parse(data);
+
+            var operations = transform.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Skew, operations[0].Type);
+            Assert.Equal(MathUtilities.Deg2Rad(x), operations[0].Data.Skew.X, 4);
+            Assert.Equal(MathUtilities.Deg2Rad(y), operations[0].Data.Skew.Y, 4);
+        }
+
+        [Fact]
+        public void Can_Parse_Compound_Operations()
+        {
+            var data = "scale(1,2) translate(3px,4px) rotate(5deg) skew(6deg,7deg)";
+
+            var transform = TransformOperations.Parse(data);
+
+            var operations = transform.Operations;
+
+            Assert.Equal(TransformOperation.OperationType.Scale, operations[0].Type);
+            Assert.Equal(1, operations[0].Data.Scale.X);
+            Assert.Equal(2, operations[0].Data.Scale.Y);
+
+            Assert.Equal(TransformOperation.OperationType.Translate, operations[1].Type);
+            Assert.Equal(3, operations[1].Data.Translate.X);
+            Assert.Equal(4, operations[1].Data.Translate.Y);
+
+            Assert.Equal(TransformOperation.OperationType.Rotate, operations[2].Type);
+            Assert.Equal(MathUtilities.Deg2Rad(5), operations[2].Data.Rotate.Angle);
+
+            Assert.Equal(TransformOperation.OperationType.Skew, operations[3].Type);
+            Assert.Equal(MathUtilities.Deg2Rad(6), operations[3].Data.Skew.X);
+            Assert.Equal(MathUtilities.Deg2Rad(7), operations[3].Data.Skew.Y);
+        }
+
+        [Fact]
+        public void Can_Parse_Matrix_Operation()
+        {
+            var data = "matrix(1,2,3,4,5,6)";
+
+            var transform = TransformOperations.Parse(data);
+
+            var operations = transform.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Matrix, operations[0].Type);
+
+            var expectedMatrix = new Matrix(1, 2, 3, 4, 5, 6);
+
+            Assert.Equal(expectedMatrix, operations[0].Matrix);
+        }
+
+        [Theory]
+        [InlineData(0d, 10d, 0d)]
+        [InlineData(0.5d, 5d, 10d)]
+        [InlineData(1d, 0d, 20d)]
+        public void Can_Interpolate_Translation(double progress, double x, double y)
+        {
+            var from = TransformOperations.Parse("translateX(10px)");
+            var to = TransformOperations.Parse("translateY(20px)");
+
+            var interpolated = TransformOperations.Interpolate(from, to, progress);
+
+            var operations = interpolated.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Translate, operations[0].Type);
+            Assert.Equal(x, operations[0].Data.Translate.X);
+            Assert.Equal(y, operations[0].Data.Translate.Y);
+        }
+
+        [Theory]
+        [InlineData(0d, 10d, 1d)]
+        [InlineData(0.5d, 5.5d, 10.5d)]
+        [InlineData(1d, 1d, 20d)]
+        public void Can_Interpolate_Scale(double progress, double x, double y)
+        {
+            var from = TransformOperations.Parse("scaleX(10)");
+            var to = TransformOperations.Parse("scaleY(20)");
+
+            var interpolated = TransformOperations.Interpolate(from, to, progress);
+
+            var operations = interpolated.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Scale, operations[0].Type);
+            Assert.Equal(x, operations[0].Data.Scale.X);
+            Assert.Equal(y, operations[0].Data.Scale.Y);
+        }
+
+        [Theory]
+        [InlineData(0d, 10d, 0d)]
+        [InlineData(0.5d, 5d, 10d)]
+        [InlineData(1d, 0d, 20d)]
+        public void Can_Interpolate_Skew(double progress, double x, double y)
+        {
+            var from = TransformOperations.Parse("skewX(10deg)");
+            var to = TransformOperations.Parse("skewY(20deg)");
+
+            var interpolated = TransformOperations.Interpolate(from, to, progress);
+
+            var operations = interpolated.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Skew, operations[0].Type);
+            Assert.Equal(MathUtilities.Deg2Rad(x), operations[0].Data.Skew.X);
+            Assert.Equal(MathUtilities.Deg2Rad(y), operations[0].Data.Skew.Y);
+        }
+
+        [Theory]
+        [InlineData(0d, 10d)]
+        [InlineData(0.5d, 15d)]
+        [InlineData(1d, 20d)]
+        public void Can_Interpolate_Rotation(double progress, double angle)
+        {
+            var from = TransformOperations.Parse("rotate(10deg)");
+            var to = TransformOperations.Parse("rotate(20deg)");
+
+            var interpolated = TransformOperations.Interpolate(from, to, progress);
+
+            var operations = interpolated.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Rotate, operations[0].Type);
+            Assert.Equal(MathUtilities.Deg2Rad(angle), operations[0].Data.Rotate.Angle);
+        }
+
+        [Fact]
+        public void Interpolation_Fallback_To_Matrix()
+        {
+            double progress = 0.5d;
+
+            var from = TransformOperations.Parse("rotate(45deg)");
+            var to = TransformOperations.Parse("translate(100px, 100px) rotate(1215deg)");
+
+            var interpolated = TransformOperations.Interpolate(from, to, progress);
+
+            var operations = interpolated.Operations;
+
+            Assert.Single(operations);
+            Assert.Equal(TransformOperation.OperationType.Matrix, operations[0].Type);
+        }
+
+        [Fact]
+        public void Order_Of_Operations_Is_Preserved_No_Prefix()
+        {
+            var from = TransformOperations.Parse("scale(1)");
+            var to = TransformOperations.Parse("translate(50px,50px) scale(0.5,0.5)");
+
+            var interpolated_0 = TransformOperations.Interpolate(from, to, 0);
+
+            Assert.True(interpolated_0.IsIdentity);
+
+            var interpolated_50 = TransformOperations.Interpolate(from, to, 0.5);
+
+            AssertMatrix(interpolated_50.Value, scaleX: 0.75, scaleY: 0.75, translateX: 12.5, translateY: 12.5);
+
+            var interpolated_100 = TransformOperations.Interpolate(from, to, 1);
+
+            AssertMatrix(interpolated_100.Value, scaleX: 0.5, scaleY: 0.5, translateX: 25, translateY: 25);
+        }
+
+        [Fact]
+        public void Order_Of_Operations_Is_Preserved_One_Prefix()
+        {
+            var from = TransformOperations.Parse("scale(1)");
+            var to = TransformOperations.Parse("scale(0.5,0.5) translate(50px,50px)");
+
+            var interpolated_0 = TransformOperations.Interpolate(from, to, 0);
+
+            Assert.True(interpolated_0.IsIdentity);
+
+            var interpolated_50 = TransformOperations.Interpolate(from, to, 0.5);
+
+            AssertMatrix(interpolated_50.Value, scaleX: 0.75, scaleY: 0.75, translateX: 25.0, translateY: 25);
+
+            var interpolated_100 = TransformOperations.Interpolate(from, to, 1);
+
+            AssertMatrix(interpolated_100.Value, scaleX: 0.5, scaleY: 0.5, translateX: 50, translateY: 50);
+        }
+
+        private static void AssertMatrix(Matrix matrix, double? angle = null, double? scaleX = null, double? scaleY = null, double? translateX = null, double? translateY = null)
+        {
+            Assert.True(Matrix.TryDecomposeTransform(matrix, out var composed));
+
+            if (angle.HasValue)
+            {
+                Assert.Equal(angle.Value, composed.Angle);
+            }
+
+            if (scaleX.HasValue)
+            {
+                Assert.Equal(scaleX.Value, composed.Scale.X);
+            }
+
+            if (scaleY.HasValue)
+            {
+                Assert.Equal(scaleY.Value, composed.Scale.Y);
+            }
+
+            if (translateX.HasValue)
+            {
+                Assert.Equal(translateX.Value, composed.Translate.X);
+            }
+
+            if (translateY.HasValue)
+            {
+                Assert.Equal(translateY.Value, composed.Translate.Y);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TypefaceTests.cs b/tests/Avalonia.Base.UnitTests/Media/TypefaceTests.cs
new file mode 100644
index 0000000000..826c1f292b
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TypefaceTests.cs
@@ -0,0 +1,27 @@
+using System;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media
+{
+    public class TypefaceTests
+    {
+        [Fact]
+        public void Exception_Should_Be_Thrown_If_FontWeight_LessThanEqualTo_Zero()
+        {
+            Assert.Throws<ArgumentException>(() => new Typeface("foo", (FontStyle)12, 0));
+        }
+
+        [Fact]
+        public void Should_Be_Equal()
+        {
+            Assert.Equal(new Typeface("Font A"), new Typeface("Font A"));
+        }
+
+        [Fact]
+        public void Should_Have_Equal_Hash()
+        {
+            Assert.Equal(new Typeface("Font A").GetHashCode(), new Typeface("Font A").GetHashCode());
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/UnicodeRangeSegmentTests.cs b/tests/Avalonia.Base.UnitTests/Media/UnicodeRangeSegmentTests.cs
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Media/UnicodeRangeSegmentTests.cs
rename to tests/Avalonia.Base.UnitTests/Media/UnicodeRangeSegmentTests.cs
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/UnicodeRangeTests.cs b/tests/Avalonia.Base.UnitTests/Media/UnicodeRangeTests.cs
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Media/UnicodeRangeTests.cs
rename to tests/Avalonia.Base.UnitTests/Media/UnicodeRangeTests.cs
diff --git a/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs b/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs
index 0caa984a22..aa5993f3b2 100644
--- a/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs
+++ b/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs
@@ -10,8 +10,8 @@ namespace Avalonia.Base.UnitTests
 {
     public class PriorityValueTests
     {
-        private static readonly IValueSink NullSink = new MockSink();
-        private static readonly IAvaloniaObject Owner = Mock.Of<IAvaloniaObject>();
+        private static readonly AvaloniaObject Owner = new AvaloniaObject();
+        private static readonly ValueStore ValueStore = new ValueStore(Owner);
         private static readonly StyledProperty<string> TestProperty = new StyledProperty<string>(
             "Test",
             typeof(PriorityValueTests),
@@ -23,12 +23,12 @@ namespace Avalonia.Base.UnitTests
             var target = new PriorityValue<string>(
                 Owner,
                 TestProperty,
-                NullSink,
+                ValueStore,
                 new ConstantValueEntry<string>(
                     TestProperty,
                     "1",
                     BindingPriority.StyleTrigger,
-                    NullSink));
+                    new(ValueStore)));
 
             Assert.Equal("1", target.GetValue().Value);
             Assert.Equal(BindingPriority.StyleTrigger, target.Priority);
@@ -40,7 +40,7 @@ namespace Avalonia.Base.UnitTests
             var target = new PriorityValue<string>(
                 Owner,
                 TestProperty,
-                NullSink);
+                ValueStore);
 
             target.SetValue("animation", BindingPriority.Animation);
             target.SetValue("local", BindingPriority.LocalValue);
@@ -60,7 +60,7 @@ namespace Avalonia.Base.UnitTests
             var target = new PriorityValue<string>(
                 Owner,
                 TestProperty,
-                NullSink);
+                ValueStore);
 
             target.SetValue("1", BindingPriority.LocalValue);
             target.SetValue("2", BindingPriority.LocalValue);
@@ -74,7 +74,7 @@ namespace Avalonia.Base.UnitTests
             var target = new PriorityValue<string>(
                 Owner,
                 TestProperty,
-                NullSink);
+                ValueStore);
 
             target.SetValue("1", BindingPriority.Style);
             target.SetValue("2", BindingPriority.Animation);
@@ -93,7 +93,7 @@ namespace Avalonia.Base.UnitTests
             var target = new PriorityValue<string>(
                 Owner,
                 TestProperty,
-                NullSink);
+                ValueStore);
 
             Assert.Equal(BindingPriority.Unset, target.Priority);
             target.SetValue("style", BindingPriority.Style);
@@ -109,7 +109,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Binding_With_Same_Priority_Should_Be_Appended()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
 
@@ -129,7 +129,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Binding_With_Higher_Priority_Should_Be_Appended()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
 
@@ -149,7 +149,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Binding_With_Lower_Priority_Should_Be_Prepended()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
 
@@ -169,7 +169,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Second_Binding_With_Lower_Priority_Should_Be_Inserted_In_Middle()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
             var source3 = new Source("3");
@@ -191,7 +191,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Competed_Binding_Should_Be_Removed()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
             var source3 = new Source("3");
@@ -214,7 +214,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Value_Should_Come_From_Last_Entry()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
             var source3 = new Source("3");
@@ -229,7 +229,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void LocalValue_Should_Override_LocalValue_Binding()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
 
             target.AddBinding(source1, BindingPriority.LocalValue).Start();
@@ -241,7 +241,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void LocalValue_Should_Override_Style_Binding()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
 
             target.AddBinding(source1, BindingPriority.Style).Start();
@@ -253,7 +253,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void LocalValue_Should_Not_Override_Animation_Binding()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
 
             target.AddBinding(source1, BindingPriority.Animation).Start();
@@ -265,7 +265,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void NonAnimated_Value_Should_Be_Correct_1()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
             var source3 = new Source("3");
@@ -281,7 +281,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void NonAnimated_Value_Should_Be_Correct_2()
         {
-            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var target = new PriorityValue<string>(Owner, TestProperty, ValueStore);
             var source1 = new Source("1");
             var source2 = new Source("2");
             var source3 = new Source("3");
@@ -310,16 +310,5 @@ namespace Avalonia.Base.UnitTests
 
             public void OnCompleted() => _observer.OnCompleted();
         }
-
-        private class MockSink : IValueSink
-        {
-            public void Completed<T>(StyledPropertyBase<T> property, IPriorityValueEntry entry, Optional<T> oldValue)
-            {
-            }
-
-            public void ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-            {
-            }
-        }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/RectTests.cs b/tests/Avalonia.Base.UnitTests/RectTests.cs
new file mode 100644
index 0000000000..95a438b287
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/RectTests.cs
@@ -0,0 +1,58 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class RectTests
+    {
+        [Fact]
+        public void Union_Should_Return_Correct_Value_For_Intersecting_Rects()
+        {
+            var result = new Rect(0, 0, 100, 100).Union(new Rect(50, 50, 100, 100));
+
+            Assert.Equal(new Rect(0, 0, 150, 150), result);
+        }
+
+        [Fact]
+        public void Union_Should_Return_Correct_Value_For_NonIntersecting_Rects()
+        {
+            var result = new Rect(0, 0, 100, 100).Union(new Rect(150, 150, 100, 100));
+
+            Assert.Equal(new Rect(0, 0, 250, 250), result);
+        }
+
+        [Fact]
+        public void Union_Should_Ignore_Empty_This_rect()
+        {
+            var result = new Rect(0, 0, 0, 0).Union(new Rect(150, 150, 100, 100));
+
+            Assert.Equal(new Rect(150, 150, 100, 100), result);
+        }
+
+        [Fact]
+        public void Union_Should_Ignore_Empty_Other_rect()
+        {
+            var result = new Rect(0, 0, 100, 100).Union(new Rect(150, 150, 0, 0));
+
+            Assert.Equal(new Rect(0, 0, 100, 100), result);
+        }
+
+        [Fact]
+        public void Normalize_Should_Reverse_Negative_Size()
+        {
+            var result = new Rect(new Point(100, 100), new Point(0, 0)).Normalize();
+
+            Assert.Equal(new Rect(0, 0, 100, 100), result);
+        }
+
+        [Fact]
+        public void Normalize_Should_Make_Invalid_Rects_Empty()
+        {
+            var result = new Rect(
+                double.NegativeInfinity, double.PositiveInfinity, 
+                double.PositiveInfinity, double.PositiveInfinity)
+                .Normalize();
+
+            Assert.Equal(Rect.Empty, result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/RelativePointTests.cs b/tests/Avalonia.Base.UnitTests/RelativePointTests.cs
new file mode 100644
index 0000000000..c242a504b9
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/RelativePointTests.cs
@@ -0,0 +1,23 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class RelativePointTests
+    {
+        [Fact]
+        public void Parse_Should_Accept_Absolute_Value()
+        {
+            var result = RelativePoint.Parse("4,5");
+
+            Assert.Equal(new RelativePoint(4, 5, RelativeUnit.Absolute), result);
+        }
+
+        [Fact]
+        public void Parse_Should_Accept_Relative_Value()
+        {
+            var result = RelativePoint.Parse("25%, 50%");
+
+            Assert.Equal(new RelativePoint(0.25, 0.5, RelativeUnit.Relative), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/RelativeRectComparer.cs b/tests/Avalonia.Base.UnitTests/RelativeRectComparer.cs
new file mode 100644
index 0000000000..3e0acddb02
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/RelativeRectComparer.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class RelativeRectComparer : IEqualityComparer<RelativeRect>
+    {
+        public bool Equals(RelativeRect a, RelativeRect b)
+        {
+            return a.Unit == b.Unit &&
+                   Math.Round(a.Rect.X, 3) == Math.Round(b.Rect.X, 3) &&
+                   Math.Round(a.Rect.Y, 3) == Math.Round(b.Rect.Y, 3) &&
+                   Math.Round(a.Rect.Width, 3) == Math.Round(b.Rect.Width, 3) &&
+                   Math.Round(a.Rect.Height, 3) == Math.Round(b.Rect.Height, 3);
+        }
+
+        public int GetHashCode(RelativeRect obj)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/RelativeRectTests.cs b/tests/Avalonia.Base.UnitTests/RelativeRectTests.cs
new file mode 100644
index 0000000000..ff53419d5c
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/RelativeRectTests.cs
@@ -0,0 +1,33 @@
+using System;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class RelativeRectTests
+    {
+        private static readonly RelativeRectComparer Compare = new RelativeRectComparer();
+        
+        [Fact]
+        public void Parse_Should_Accept_Absolute_Value()
+        {
+            var result = RelativeRect.Parse("4,5,50,60");
+
+            Assert.Equal(new RelativeRect(4, 5, 50, 60, RelativeUnit.Absolute), result, Compare);
+        }
+
+        [Fact]
+        public void Parse_Should_Accept_Relative_Value()
+        {
+            var result = RelativeRect.Parse("10%, 20%, 40%, 70%");
+
+            Assert.Equal(new RelativeRect(0.1, 0.2, 0.4, 0.7, RelativeUnit.Relative), result, Compare);
+        }
+
+        [Fact]
+        public void Parse_Should_Throw_Mixed_Values()
+        {
+            Assert.Throws<FormatException>(() =>
+                RelativeRect.Parse("10%, 20%, 40, 70%"));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/RenderTests_Culling.cs b/tests/Avalonia.Base.UnitTests/RenderTests_Culling.cs
new file mode 100644
index 0000000000..c7421c5827
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/RenderTests_Culling.cs
@@ -0,0 +1,197 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class RenderTests_Culling
+    {
+        [Fact]
+        public void In_Bounds_Control_Should_Be_Rendered()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                TestControl target;
+
+                var container = new Canvas
+                {
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
+                    {
+                        (target = new TestControl
+                        {
+                            Width = 10, Height = 10, [Canvas.LeftProperty] = 98, [Canvas.TopProperty] = 98,
+                        })
+                    }
+                };
+
+                Render(container);
+
+                Assert.True(target.Rendered);
+            }
+        }
+
+        [Fact]
+        public void Out_Of_Bounds_Control_Should_Not_Be_Rendered()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                TestControl target;
+
+                var container = new Canvas
+                {
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
+                    {
+                        (target = new TestControl
+                        {
+                            Width = 10,
+                            Height = 10,
+                            ClipToBounds = true,
+                            [Canvas.LeftProperty] = 110,
+                            [Canvas.TopProperty] = 110,
+                        })
+                    }
+                };
+
+                Render(container);
+
+                Assert.False(target.Rendered);
+            }
+        }
+
+        [Fact]
+        public void Out_Of_Bounds_Child_Control_Should_Not_Be_Rendered()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                TestControl target;
+
+                var container = new Canvas
+                {
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
+                    {
+                        new Canvas
+                        {
+                            Width = 100,
+                            Height = 100,
+                            [Canvas.LeftProperty] = 50,
+                            [Canvas.TopProperty] = 50,
+                            Children =
+                            {
+                                (target = new TestControl
+                                {
+                                    Width = 10,
+                                    Height = 10,
+                                    ClipToBounds = true,
+                                    [Canvas.LeftProperty] = 50,
+                                    [Canvas.TopProperty] = 50,
+                                })
+                            }
+                        }
+                    }
+                };
+
+                Render(container);
+
+                Assert.False(target.Rendered);
+            }
+        }
+
+        [Fact]
+        public void RenderTransform_Should_Be_Respected()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                TestControl target;
+
+                var container = new Canvas
+                {
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
+                    {
+                        (target = new TestControl
+                        {
+                            Width = 10,
+                            Height = 10,
+                            [Canvas.LeftProperty] = 110,
+                            [Canvas.TopProperty] = 110,
+                            RenderTransform = new TranslateTransform(-100, -100),
+                        })
+                    }
+                };
+
+                Render(container);
+
+                Assert.True(target.Rendered);
+            }
+        }
+
+        [Fact]
+        public void Negative_Margin_Should_Be_Respected()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                TestControl target;
+
+                var container = new Canvas
+                {
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
+                    {
+                        new Border
+                        {
+                            Margin = new Thickness(100, 100, 0, 0),
+                            Child = target = new TestControl
+                            {
+                                Width = 10, Height = 10, Margin = new Thickness(-100, -100, 0, 0),
+                            }
+                        }
+                    }
+                };
+
+                Render(container);
+
+                Assert.True(target.Rendered);
+            }
+        }
+
+        private void Render(IControl control)
+        {
+            var ctx = CreateDrawingContext();
+            control.Measure(Size.Infinity);
+            control.Arrange(new Rect(control.DesiredSize));
+            ImmediateRenderer.Render(control, ctx);
+        }
+
+        private DrawingContext CreateDrawingContext()
+        {
+            return new DrawingContext(Mock.Of<IDrawingContextImpl>());
+        }
+
+        private class TestControl : Control
+        {
+            public bool Rendered { get; private set; }
+
+            public override void Render(DrawingContext context)
+            {
+                Rendered = true;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CustomHitTestBorder.cs b/tests/Avalonia.Base.UnitTests/Rendering/CustomHitTestBorder.cs
new file mode 100644
index 0000000000..fece152713
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CustomHitTestBorder.cs
@@ -0,0 +1,16 @@
+using Avalonia.Controls;
+using Avalonia.Rendering;
+
+namespace Avalonia.Base.UnitTests.Rendering
+{
+    internal class CustomHitTestBorder : Border, ICustomHitTest
+    {
+        public bool HitTest(Point point)
+        {
+            // Move hit testing window halfway to the left
+            return Bounds
+                .WithX(Bounds.X - Bounds.Width / 2)  
+                .Contains(point);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests.cs
new file mode 100644
index 0000000000..c345b9a7ea
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests.cs
@@ -0,0 +1,779 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Subjects;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Threading;
+using Avalonia.UnitTests;
+using Avalonia.Media.Imaging;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering
+{
+    public class DeferredRendererTests
+    {
+        [Fact]
+        public void First_Frame_Calls_SceneBuilder_UpdateAll()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var root = new TestRoot();
+                var sceneBuilder = MockSceneBuilder(root);
+
+                CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
+
+                sceneBuilder.Verify(x => x.UpdateAll(It.IsAny<Scene>()));
+            }
+        }
+
+        [Fact]
+        public void Frame_Does_Not_Call_SceneBuilder_If_No_Dirty_Controls()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+                var root = new TestRoot();
+                var sceneBuilder = MockSceneBuilder(root);
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder.Object);
+
+                target.Start();
+                IgnoreFirstFrame(target, sceneBuilder);
+                RunFrame(target);
+
+                sceneBuilder.Verify(x => x.UpdateAll(It.IsAny<Scene>()), Times.Never);
+                sceneBuilder.Verify(x => x.Update(It.IsAny<Scene>(), It.IsAny<Visual>()), Times.Never);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_Dirty_Controls_In_Order()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                Border border;
+                Decorator decorator;
+                Canvas canvas;
+
+                var root = new TestRoot
+                {
+                    Child = decorator = new Decorator
+                    {
+                        Child = border = new Border { Child = canvas = new Canvas() }
+                    }
+                };
+
+                var sceneBuilder = MockSceneBuilder(root);
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder.Object,
+                    dispatcher: dispatcher);
+
+                target.Start();
+                IgnoreFirstFrame(target, sceneBuilder);
+                target.AddDirty(border);
+                target.AddDirty(canvas);
+                target.AddDirty(root);
+                target.AddDirty(decorator);
+
+                var result = new List<IVisual>();
+
+                sceneBuilder.Setup(x => x.Update(It.IsAny<Scene>(), It.IsAny<IVisual>()))
+                    .Callback<Scene, IVisual>((_, v) => result.Add(v));
+
+                RunFrame(target);
+
+                Assert.Equal(new List<IVisual> { root, decorator, border, canvas }, result);
+            }
+        }
+
+        [Fact]
+        public void Should_Add_Dirty_Rect_On_Child_Remove()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                Decorator decorator;
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = decorator = new Decorator
+                    {
+                        Child = border = new Border { Width = 50, Height = 50, Background = Brushes.Red, },
+                    }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
+
+                decorator.Child = null;
+
+                RunFrame(target);
+
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(decorator);
+                var dirty = scene.Layers[0].Dirty.ToList();
+
+                Assert.Equal(1, dirty.Count);
+                Assert.Equal(new Rect(25, 25, 50, 50), dirty[0]);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_VisualNode_Order_On_Child_Remove_Insert()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                StackPanel stack;
+                Canvas canvas1;
+                Canvas canvas2;
+
+                var root = new TestRoot
+                {
+                    Child = stack = new StackPanel
+                    {
+                        Children = { (canvas1 = new Canvas()), (canvas2 = new Canvas()), }
+                    }
+                };
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
+
+                stack.Children.Remove(canvas2);
+                stack.Children.Insert(0, canvas2);
+
+                RunFrame(target);
+
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(stack);
+
+                Assert.Same(stackNode.Children[0].Visual, canvas2);
+                Assert.Same(stackNode.Children[1].Visual, canvas1);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_VisualNode_Order_On_Child_Move()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                StackPanel stack;
+                Canvas canvas1;
+                Canvas canvas2;
+
+                var root = new TestRoot
+                {
+                    Child = stack = new StackPanel
+                    {
+                        Children = { (canvas1 = new Canvas()), (canvas2 = new Canvas()), }
+                    }
+                };
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
+
+                stack.Children.Move(1, 0);
+
+                RunFrame(target);
+
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(stack);
+
+                Assert.Same(stackNode.Children[0].Visual, canvas2);
+                Assert.Same(stackNode.Children[1].Visual, canvas1);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_VisualNode_Order_On_ZIndex_Change()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                StackPanel stack;
+                Canvas canvas1;
+                Canvas canvas2;
+
+                var root = new TestRoot
+                {
+                    Child = stack = new StackPanel
+                    {
+                        Children =
+                        {
+                            (canvas1 = new Canvas { ZIndex = 1 }), (canvas2 = new Canvas { ZIndex = 2 }),
+                        }
+                    }
+                };
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
+
+                canvas1.ZIndex = 3;
+
+                RunFrame(target);
+
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(stack);
+
+                Assert.Same(stackNode.Children[0].Visual, canvas2);
+                Assert.Same(stackNode.Children[1].Visual, canvas1);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_VisualNode_Order_On_ZIndex_Change_With_Dirty_Ancestor()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                StackPanel stack;
+                Canvas canvas1;
+                Canvas canvas2;
+
+                var root = new TestRoot
+                {
+                    Child = stack = new StackPanel
+                    {
+                        Children =
+                        {
+                            (canvas1 = new Canvas { ZIndex = 1 }), (canvas2 = new Canvas { ZIndex = 2 }),
+                        }
+                    }
+                };
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
+
+                root.InvalidateVisual();
+                canvas1.ZIndex = 3;
+
+                RunFrame(target);
+
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(stack);
+
+                Assert.Same(stackNode.Children[0].Visual, canvas2);
+                Assert.Same(stackNode.Children[1].Visual, canvas1);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_VisualNodes_When_Child_Moved_To_New_Parent()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                Decorator moveFrom;
+                Decorator moveTo;
+                Canvas moveMe;
+
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            (moveFrom = new Decorator { Child = moveMe = new Canvas(), }),
+                            (moveTo = new Decorator()),
+                        }
+                    }
+                };
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
+
+                moveFrom.Child = null;
+                moveTo.Child = moveMe;
+
+                RunFrame(target);
+
+                var scene = target.UnitTestScene();
+                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
+                var moveToNode = (VisualNode)scene.FindNode(moveTo);
+
+                Assert.Empty(moveFromNode.Children);
+                Assert.Equal(1, moveToNode.Children.Count);
+                Assert.Same(moveMe, moveToNode.Children[0].Visual);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_VisualNodes_When_Child_Moved_To_New_Parent_And_New_Root()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                Decorator moveFrom;
+                Decorator moveTo;
+                Canvas moveMe;
+
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children = { (moveFrom = new Decorator { Child = moveMe = new Canvas(), }) }
+                    }
+                };
+
+                var otherRoot = new TestRoot { Child = new StackPanel { Children = { (moveTo = new Decorator()) } } };
+
+                var sceneBuilder = new SceneBuilder();
+
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
+
+                var otherSceneBuilder = new SceneBuilder();
+
+                var otherTarget = new DeferredRenderer(
+                    otherRoot,
+                    loop.Object,
+                    sceneBuilder: otherSceneBuilder,
+                    dispatcher: dispatcher);
+
+                root.Renderer = target;
+                otherRoot.Renderer = otherTarget;
+
+                target.Start();
+                otherTarget.Start();
+
+                RunFrame(target);
+                RunFrame(otherTarget);
+
+                moveFrom.Child = null;
+                moveTo.Child = moveMe;
+
+                RunFrame(target);
+                RunFrame(otherTarget);
+
+                var scene = target.UnitTestScene();
+                var otherScene = otherTarget.UnitTestScene();
+
+                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
+                var moveToNode = (VisualNode)otherScene.FindNode(moveTo);
+
+                Assert.Empty(moveFromNode.Children);
+                Assert.Equal(1, moveToNode.Children.Count);
+                Assert.Same(moveMe, moveToNode.Children[0].Visual);
+            }
+        }
+
+        [Fact]
+        public void Should_Push_Opacity_For_Controls_With_Less_Than_1_Opacity()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var root = new TestRoot
+                {
+                    Width = 100, Height = 100, Child = new Border { Background = Brushes.Red, Opacity = 0.5, }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var target = CreateTargetAndRunFrame(root);
+                var context = GetLayerContext(target, root);
+                var animation = new BehaviorSubject<double>(0.5);
+
+                context.Verify(x => x.PushOpacity(0.5), Times.Once);
+                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Once);
+                context.Verify(x => x.PopOpacity(), Times.Once);
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Draw_Controls_With_0_Opacity()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new Border
+                    {
+                        Background = Brushes.Red,
+                        Opacity = 0,
+                        Child = new Border { Background = Brushes.Green, }
+                    }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var target = CreateTargetAndRunFrame(root);
+                var context = GetLayerContext(target, root);
+                var animation = new BehaviorSubject<double>(0.5);
+
+                context.Verify(x => x.PushOpacity(0.5), Times.Never);
+                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Never);
+                context.Verify(x => x.PopOpacity(), Times.Never);
+            }
+        }
+
+        [Fact]
+        public void Should_Push_Opacity_Mask()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new Border { Background = Brushes.Red, OpacityMask = Brushes.Green, }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var target = CreateTargetAndRunFrame(root);
+                var context = GetLayerContext(target, root);
+                var animation = new BehaviorSubject<double>(0.5);
+
+                context.Verify(x => x.PushOpacityMask(Brushes.Green, new Rect(0, 0, 100, 100)), Times.Once);
+                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Once);
+                context.Verify(x => x.PopOpacityMask(), Times.Once);
+            }
+        }
+
+        [Fact]
+        public void Should_Create_Layer_For_Root()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var root = new TestRoot();
+                var rootLayer = new Mock<IRenderTargetBitmapImpl>();
+
+                var sceneBuilder = new Mock<ISceneBuilder>();
+
+                sceneBuilder.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
+                    .Callback<Scene>(scene =>
+                    {
+                        scene.Size = root.ClientSize;
+                        scene.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize));
+                    });
+
+                var renderInterface = new Mock<IPlatformRenderInterface>();
+                var target = CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
+
+                Assert.Single(target.Layers);
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Should_Create_And_Delete_Layers_For_Controls_With_Animated_Opacity()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new Border
+                    {
+                        Background = Brushes.Red,
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Green, Child = new Canvas(), Opacity = 0.9,
+                        }
+                    }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var timer = new Mock<IRenderTimer>();
+                var target = CreateTargetAndRunFrame(root, timer);
+
+                Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+                RunFrame(target);
+
+                Assert.Equal(new IVisual[] { root, border }, target.Layers.Select(x => x.LayerRoot));
+
+                animation.OnCompleted();
+                RunFrame(target);
+
+                Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Should_Not_Create_Layer_For_Childless_Control_With_Animated_Opacity()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new Border
+                    {
+                        Background = Brushes.Red, Child = border = new Border { Background = Brushes.Green, }
+                    }
+                };
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var timer = new Mock<IRenderTimer>();
+                var target = CreateTargetAndRunFrame(root, timer);
+
+                Assert.Single(target.Layers);
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Should_Not_Push_Opacity_For_Transparent_Layer_Root_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = border = new Border { Background = Brushes.Red, Child = new Canvas(), }
+                };
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var target = CreateTargetAndRunFrame(root);
+                var context = GetLayerContext(target, border);
+
+                context.Verify(x => x.PushOpacity(0.5), Times.Never);
+                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Once);
+                context.Verify(x => x.PopOpacity(), Times.Never);
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Should_Draw_Transparent_Layer_With_Correct_Opacity()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = border = new Border { Background = Brushes.Red, Child = new Canvas(), }
+                };
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var target = CreateTargetAndRunFrame(root);
+                var context = Mock.Get(target.RenderTarget.CreateDrawingContext(null));
+                var borderLayer = target.Layers[border].Bitmap;
+
+                context.Verify(x => x.DrawBitmap(borderLayer, 0.5, It.IsAny<Rect>(), It.IsAny<Rect>(),
+                    BitmapInterpolationMode.Default));
+            }
+        }
+
+        [Fact]
+        public void Can_Dirty_Control_In_SceneInvalidated()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border1;
+                Border border2;
+
+                var root = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            (border1 = new Border { Background = Brushes.Red, Child = new Canvas(), }),
+                            (border2 = new Border { Background = Brushes.Red, Child = new Canvas(), }),
+                        }
+                    }
+                };
+
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var target = CreateTargetAndRunFrame(root);
+                var invalidated = false;
+
+                target.SceneInvalidated += (s, e) =>
+                {
+                    invalidated = true;
+                    target.AddDirty(border2);
+                };
+
+                target.AddDirty(border1);
+                target.Paint(new Rect(root.DesiredSize));
+
+                Assert.True(invalidated);
+                Assert.True(((IRenderLoopTask)target).NeedsUpdate);
+            }
+        }
+
+        private DeferredRenderer CreateTargetAndRunFrame(
+            TestRoot root,
+            Mock<IRenderTimer> timer = null,
+            ISceneBuilder sceneBuilder = null,
+            IDispatcher dispatcher = null)
+        {
+            timer = timer ?? new Mock<IRenderTimer>();
+            dispatcher = dispatcher ?? new ImmediateDispatcher();
+            var target = new DeferredRenderer(
+                root,
+                new RenderLoop(timer.Object, dispatcher),
+                sceneBuilder: sceneBuilder,
+                dispatcher: dispatcher);
+            root.Renderer = target;
+            target.Start();
+            RunFrame(target);
+            return target;
+        }
+
+        private Mock<IDrawingContextImpl> GetLayerContext(DeferredRenderer renderer, IControl layerRoot)
+        {
+            return Mock.Get(renderer.Layers[layerRoot].Bitmap.Item.CreateDrawingContext(null));
+        }
+
+        private void IgnoreFirstFrame(IRenderLoopTask task, Mock<ISceneBuilder> sceneBuilder)
+        {
+            RunFrame(task);
+            sceneBuilder.Invocations.Clear();
+        }
+
+        private void RunFrame(IRenderLoopTask task)
+        {
+            task.Update(TimeSpan.Zero);
+            task.Render();
+        }
+
+        private IRenderTargetBitmapImpl CreateLayer()
+        {
+            return Mock.Of<IRenderTargetBitmapImpl>(x =>
+                x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()) == Mock.Of<IDrawingContextImpl>());
+        }
+
+        private Mock<ISceneBuilder> MockSceneBuilder(IRenderRoot root)
+        {
+            var result = new Mock<ISceneBuilder>();
+            result.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
+                .Callback<Scene>(x => x.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize)));
+            return result;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
new file mode 100644
index 0000000000..33c7b3e0f8
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
@@ -0,0 +1,545 @@
+using System;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Shapes;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering
+{
+    public class DeferredRendererTests_HitTesting
+    {
+        [Fact]
+        public void HitTest_Should_Find_Controls_At_Point()
+        {
+            using (TestApplication())
+            {
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(new[] { root.Child }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Empty_Controls_At_Point()
+        {
+            using (TestApplication())
+            {
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Empty(result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Invisible_Controls_At_Point()
+        {
+            using (TestApplication())
+            {
+                Border visible;
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        IsVisible = false,
+                        Child = visible = new Border
+                        {
+                            Background = Brushes.Red,
+                            HorizontalAlignment = HorizontalAlignment.Stretch,
+                            VerticalAlignment = VerticalAlignment.Stretch,
+                        }
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Empty(result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Control_Outside_Point()
+        {
+            using (TestApplication())
+            {
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(10, 10), root, null);
+
+                Assert.Empty(result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Return_Top_Controls_First()
+        {
+            using (TestApplication())
+            {
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Children =
+                        {
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            },
+                            new Border
+                            {
+                                Width = 50,
+                                Height = 50,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            }
+                        }
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(new[] { container.Children[1], container.Children[0] }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Return_Top_Controls_First_With_ZIndex()
+        {
+            using (TestApplication())
+            {
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Children =
+                        {
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 100,
+                                ZIndex = 1,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            },
+                            new Border
+                            {
+                                Width = 50,
+                                Height = 50,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            },
+                            new Border
+                            {
+                                Width = 75,
+                                Height = 75,
+                                ZIndex = 2,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            }
+                        }
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(new[] { container.Children[2], container.Children[0], container.Children[1] }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Find_Control_Translated_Outside_Parent_Bounds()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Background = Brushes.Red,
+                        ClipToBounds = false,
+                        Children =
+                        {
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 100,
+                                ZIndex = 1,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Top,
+                                Child = target = new Border
+                                {
+                                    Width = 50,
+                                    Height = 50,
+                                    Background = Brushes.Red,
+                                    HorizontalAlignment = HorizontalAlignment.Left,
+                                    VerticalAlignment = VerticalAlignment.Top,
+                                    RenderTransform = new TranslateTransform(110, 110),
+                                }
+                            },
+                        }
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                container.Measure(Size.Infinity);
+                container.Arrange(new Rect(container.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(120, 120), root, null);
+
+                Assert.Equal(new IVisual[] { target, container }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Control_Outside_Parent_Bounds_When_Clipped()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 100,
+                        Height = 200,
+                        Background = Brushes.Red,
+                        Children =
+                        {
+                            new Panel()
+                            {
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                Margin = new Thickness(0, 100, 0, 0),
+                                ClipToBounds = true,
+                                Children =
+                                {
+                                    (target = new Border()
+                                    {
+                                        Width = 100,
+                                        Height = 100,
+                                        Background = Brushes.Red,
+                                        Margin = new Thickness(0, -100, 0, 0)
+                                    })
+                                }
+                            }
+                        }
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(50, 50), root, null);
+
+                Assert.Equal(new[] { container }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Control_Outside_Scroll_Viewport()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                Border item1;
+                Border item2;
+                ScrollContentPresenter scroll;
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 100,
+                        Height = 200,
+                        Background = Brushes.Red,
+                        Children =
+                        {
+                            (target = new Border()
+                            {
+                                Name = "b1",
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                            }),
+                            new Border()
+                            {
+                                Name = "b2",
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                Margin = new Thickness(0, 100, 0, 0),
+                                Child = scroll = new ScrollContentPresenter()
+                                {
+                                    CanHorizontallyScroll = true,
+                                    CanVerticallyScroll = true,
+                                    Content = new StackPanel()
+                                    {
+                                        Children =
+                                        {
+                                            (item1 = new Border()
+                                            {
+                                                Name = "b3",
+                                                Width = 100,
+                                                Height = 100,
+                                                Background = Brushes.Red,
+                                            }),
+                                            (item2 = new Border()
+                                            {
+                                                Name = "b4",
+                                                Width = 100,
+                                                Height = 100,
+                                                Background = Brushes.Red,
+                                            }),
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                };
+
+                scroll.UpdateChild();
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+                
+                root.Renderer.Paint(Rect.Empty);
+                var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
+
+                Assert.Equal(item1, result);
+
+                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
+
+                Assert.Equal(target, result);
+
+                scroll.Offset = new Vector(0, 100);
+
+                // We don't have LayoutManager set up so do the layout pass manually.
+                scroll.Parent.InvalidateArrange();
+                container.InvalidateArrange();
+                container.Arrange(new Rect(container.DesiredSize));
+
+                root.Renderer.Paint(Rect.Empty);
+                result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
+                Assert.Equal(item2, result);
+
+                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
+                Assert.Equal(target, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Path_When_Outside_Fill()
+        {
+            using (TestApplication())
+            {
+                Path path;
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = path = new Path
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Fill = Brushes.Red,
+                        Data = StreamGeometry.Parse("M100,0 L0,100 100,100")
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+                Assert.Equal(new[] { path }, result);
+
+                result = root.Renderer.HitTest(new Point(10, 10), root, null);
+                Assert.Empty(result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Respect_Geometry_Clip()
+        {
+            using (TestApplication())
+            {
+                Border border;
+                Canvas canvas;
+                var root = new TestRoot
+                {
+                    Width = 400,
+                    Height = 400,
+                    Child = border = new Border
+                    {
+                        Background = Brushes.Red,
+                        Clip = StreamGeometry.Parse("M100,0 L0,100 100,100"),
+                        Width = 200,
+                        Height = 200,
+                        Child = canvas = new Canvas
+                        {
+                            Background = Brushes.Yellow,
+                            Margin = new Thickness(10),
+                        }
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+                Assert.Equal(new Rect(100, 100, 200, 200), border.Bounds);
+
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+
+                var result = root.Renderer.HitTest(new Point(200, 200), root, null);
+                Assert.Equal(new IVisual[] { canvas, border }, result);
+
+                result = root.Renderer.HitTest(new Point(110, 110), root, null);
+                Assert.Empty(result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Accommodate_ICustomHitTest()
+        {
+            using (TestApplication())
+            {
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 300,
+                    Height = 200,
+                    Child = border = new CustomHitTestBorder
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                }; 
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(75, 100), root, null);
+                Assert.Equal(new[] { border }, result);
+
+                result = root.Renderer.HitTest(new Point(125, 100), root, null);
+                Assert.Equal(new[] { border }, result);
+
+                result = root.Renderer.HitTest(new Point(175, 100), root, null);
+                Assert.Empty(result);
+            }
+        }
+
+        private IDisposable TestApplication()
+        {
+            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests.cs
new file mode 100644
index 0000000000..84bb9b00cd
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests.cs
@@ -0,0 +1,320 @@
+using System.Collections.Generic;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering
+{
+    public class ImmediateRendererTests
+    {
+        [Fact]
+        public void AddDirty_Call_RenderRoot_Invalidate()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var visual = new Mock<Visual>();
+                var child = new Mock<Visual>() { CallBase = true };
+                var renderRoot = visual.As<IRenderRoot>();
+
+                visual.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(0, 0, 400, 400));
+
+                child.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(10, 10, 100, 100));
+                child.As<IVisual>().Setup(v => v.VisualParent).Returns(visual.Object);
+
+                var target = new ImmediateRenderer(visual.Object);
+
+                target.AddDirty(child.Object);
+
+                renderRoot.Verify(v => v.Invalidate(new Rect(10, 10, 100, 100)));
+            }
+        }
+
+        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
+        public void AddDirty_With_RenderTransform_Call_RenderRoot_Invalidate()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var visual = new Mock<Visual>();
+                var child = new Mock<Visual>() { CallBase = true };
+                var renderRoot = visual.As<IRenderRoot>();
+
+                visual.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(0, 0, 400, 400));
+
+                child.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(100, 100, 100, 100));
+                child.As<IVisual>().Setup(v => v.VisualParent).Returns(visual.Object);
+                child.Object.RenderTransform = new ScaleTransform() { ScaleX = 2, ScaleY = 2 };
+
+                var target = new ImmediateRenderer(visual.Object);
+
+                target.AddDirty(child.Object);
+
+                renderRoot.Verify(v => v.Invalidate(new Rect(50, 50, 200, 200)));
+            }
+        }
+
+        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
+        public void AddDirty_For_Child_Moved_Should_Invalidate_Previous_Bounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var visual = new Mock<Visual>() { CallBase = true };
+                var child = new Mock<Visual>() { CallBase = true };
+                var renderRoot = visual.As<IRenderRoot>();
+                var renderTarget = visual.As<IRenderTarget>();
+
+                renderRoot.Setup(r => r.CreateRenderTarget()).Returns(renderTarget.Object);
+
+                renderTarget.Setup(r => r.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()))
+                    .Returns(Mock.Of<IDrawingContextImpl>());
+
+                visual.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(0, 0, 400, 400));
+
+                visual.As<IVisual>().Setup(v => v.VisualChildren)
+                    .Returns(new AvaloniaList<IVisual>() { child.As<IVisual>().Object });
+
+                Rect childBounds = new Rect(0, 0, 100, 100);
+                child.As<IVisual>().Setup(v => v.Bounds).Returns(() => childBounds);
+                child.As<IVisual>().Setup(v => v.VisualParent).Returns(visual.Object);
+                child.As<IVisual>().Setup(v => v.VisualChildren).Returns(new AvaloniaList<IVisual>());
+
+                var invalidationCalls = new List<Rect>();
+
+                renderRoot.Setup(v => v.Invalidate(It.IsAny<Rect>())).Callback<Rect>(v => invalidationCalls.Add(v));
+
+                var target = new ImmediateRenderer(visual.Object);
+
+                target.AddDirty(child.Object);
+
+                Assert.Equal(new Rect(0, 0, 100, 100), invalidationCalls[0]);
+
+                target.Paint(new Rect(0, 0, 100, 100));
+
+                //move child 100 pixels bottom/right
+                childBounds = new Rect(100, 100, 100, 100);
+
+                //renderer should invalidate old child bounds with new one
+                //as on old area there can be artifacts
+                target.AddDirty(child.Object);
+
+                //invalidate first old position
+                Assert.Equal(new Rect(0, 0, 100, 100), invalidationCalls[1]);
+
+                //then new position
+                Assert.Equal(new Rect(100, 100, 100, 100), invalidationCalls[2]);
+            }
+        }
+
+        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
+        public void Should_Render_Child_In_Parent_With_RenderTransform()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var targetMock = new Mock<Control>() { CallBase = true };
+                var target = targetMock.Object;
+                target.Width = 100;
+                target.Height = 50;
+
+                var child = new Panel()
+                {
+                    RenderTransform = new RotateTransform() { Angle = 90 },
+                    Children = { new Panel() { Children = { target } } }
+                };
+
+                var visualTarget = targetMock.As<IVisual>();
+                int rendered = 0;
+                visualTarget.Setup(v => v.Render(It.IsAny<DrawingContext>())).Callback(() => rendered++);
+
+                var root = new TestRoot(child);
+                root.Renderer = new ImmediateRenderer(root);
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                root.Measure(new Size(50, 100));
+                root.Arrange(new Rect(new Size(50, 100)));
+
+                root.Renderer.Paint(root.Bounds);
+
+                Assert.Equal(1, rendered);
+            }
+        }
+
+        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
+        public void Should_Render_Child_In_Parent_With_RenderTransform2()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var targetMock = new Mock<Control>() { CallBase = true };
+                var target = targetMock.Object;
+
+                target.Width = 100;
+                target.Height = 50;
+                target.HorizontalAlignment = HorizontalAlignment.Center;
+                target.VerticalAlignment = VerticalAlignment.Center;
+
+                var child = new Panel()
+                {
+                    RenderTransform = new RotateTransform() { Angle = 90 },
+                    Children = { new Panel() { Children = { target } } }
+                };
+
+                var visualTarget = targetMock.As<IVisual>();
+                int rendered = 0;
+                visualTarget.Setup(v => v.Render(It.IsAny<DrawingContext>())).Callback(() => rendered++);
+
+                var root = new TestRoot(child);
+                root.Renderer = new ImmediateRenderer(root);
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                root.Measure(new Size(300, 100));
+                root.Arrange(new Rect(new Size(300, 100)));
+                root.Renderer.Paint(root.Bounds);
+
+                Assert.Equal(1, rendered);
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Clip_Children_With_RenderTransform_When_In_Bounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                const int RootWidth = 300;
+                const int RootHeight = 300;
+
+                var rootGrid = new Grid { Width = RootWidth, Height = RootHeight, ClipToBounds = true };
+
+                var stackPanel = new StackPanel
+                {
+                    Orientation = Orientation.Horizontal,
+                    VerticalAlignment = VerticalAlignment.Top,
+                    HorizontalAlignment = HorizontalAlignment.Right,
+                    Margin = new Thickness(0, 10, 0, 0),
+                    RenderTransformOrigin = new RelativePoint(new Point(0, 0), RelativeUnit.Relative),
+                    RenderTransform = new TransformGroup
+                    {
+                        Children = { new RotateTransform { Angle = 90 }, new TranslateTransform { X = 240 } }
+                    }
+                };
+
+                rootGrid.Children.Add(stackPanel);
+
+                TestControl CreateControl()
+                    => new TestControl
+                    {
+                        Width = 80, Height = 40, Margin = new Thickness(0, 0, 5, 0), ClipToBounds = true
+                    };
+
+                var control1 = CreateControl();
+                var control2 = CreateControl();
+                var control3 = CreateControl();
+
+                stackPanel.Children.Add(control1);
+                stackPanel.Children.Add(control2);
+                stackPanel.Children.Add(control3);
+
+                var root = new TestRoot(rootGrid);
+                root.Renderer = new ImmediateRenderer(root);
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                var rootSize = new Size(RootWidth, RootHeight);
+                root.Measure(rootSize);
+                root.Arrange(new Rect(rootSize));
+
+                root.Renderer.Paint(root.Bounds);
+
+                Assert.True(control1.Rendered);
+                Assert.True(control2.Rendered);
+                Assert.True(control3.Rendered);
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Render_Clipped_Child_With_RenderTransform_When_Not_In_Bounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                const int RootWidth = 300;
+                const int RootHeight = 300;
+
+                var rootGrid = new Grid { Width = RootWidth, Height = RootHeight, ClipToBounds = true };
+
+                var stackPanel = new StackPanel
+                {
+                    Orientation = Orientation.Horizontal,
+                    VerticalAlignment = VerticalAlignment.Top,
+                    HorizontalAlignment = HorizontalAlignment.Right,
+                    Margin = new Thickness(0, 10, 0, 0),
+                    RenderTransformOrigin = new RelativePoint(new Point(0, 0), RelativeUnit.Relative),
+                    RenderTransform = new TransformGroup
+                    {
+                        Children = { new RotateTransform { Angle = 90 }, new TranslateTransform { X = 280 } }
+                    }
+                };
+
+                rootGrid.Children.Add(stackPanel);
+
+                TestControl CreateControl()
+                    => new TestControl
+                    {
+                        Width = 160, Height = 40, Margin = new Thickness(0, 0, 5, 0), ClipToBounds = true
+                    };
+
+                var control1 = CreateControl();
+                var control2 = CreateControl();
+                var control3 = CreateControl();
+
+                stackPanel.Children.Add(control1);
+                stackPanel.Children.Add(control2);
+                stackPanel.Children.Add(control3);
+
+                var root = new TestRoot(rootGrid);
+                root.Renderer = new ImmediateRenderer(root);
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                var rootSize = new Size(RootWidth, RootHeight);
+                root.Measure(rootSize);
+                root.Arrange(new Rect(rootSize));
+
+                root.Renderer.Paint(root.Bounds);
+
+                Assert.True(control1.Rendered);
+                Assert.True(control2.Rendered);
+                Assert.False(control3.Rendered);
+            }
+        }
+
+        [Fact]
+        public void Static_Render_Method_Does_Not_Update_TransformedBounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var target = new Border();
+                var expected = new TransformedBounds(new Rect(1, 2, 3, 4), new Rect(4, 5, 6, 7), Matrix.CreateRotation(0.8));
+
+                ((IVisual)target).TransformedBounds = expected;
+
+                var renderTarget = Mock.Of<IRenderTarget>(x => 
+                    x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()) == Mock.Of<IDrawingContextImpl>());
+                ImmediateRenderer.Render(target, renderTarget);
+
+                Assert.Equal(expected, target.TransformedBounds);
+            }
+        }
+
+        private class TestControl : Control
+        {
+            public bool Rendered { get; private set; }
+
+            public override void Render(DrawingContext context)
+                => Rendered = true;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
new file mode 100644
index 0000000000..1a9822e259
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
@@ -0,0 +1,458 @@
+using System;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering
+{
+    public class ImmediateRendererTests_HitTesting
+    {
+        [Fact]
+        public void HitTest_Should_Find_Controls_At_Point()
+        {
+            using (TestApplication())
+            {
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(new[] { root.Child, root }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Invisible_Controls_At_Point()
+        {
+            using (TestApplication())
+            {
+                Border visible;
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        IsVisible = false,
+                        Child = visible = new Border
+                        {
+                            Background = Brushes.Red,
+                            HorizontalAlignment = HorizontalAlignment.Stretch,
+                            VerticalAlignment = VerticalAlignment.Stretch,
+                        }
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(new[] { root }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Control_Outside_Point()
+        {
+            using (TestApplication())
+            {
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(10, 10), root, null);
+
+                Assert.Equal(new[] { root }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Return_Top_Controls_First()
+        {
+            using (TestApplication())
+            {
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Children =
+                        {
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            },
+                            new Border
+                            {
+                                Width = 50,
+                                Height = 50,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            }
+                        }
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(new[] { container.Children[1], container.Children[0], container, root }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Return_Top_Controls_First_With_ZIndex()
+        {
+            using (TestApplication())
+            {
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Children =
+                        {
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 100,
+                                ZIndex = 1,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            },
+                            new Border
+                            {
+                                Width = 50,
+                                Height = 50,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            },
+                            new Border
+                            {
+                                Width = 75,
+                                Height = 75,
+                                ZIndex = 2,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            }
+                        }
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
+
+                Assert.Equal(
+                    new[] 
+                    {
+                        container.Children[2],
+                        container.Children[0],
+                        container.Children[1],
+                        container,
+                        root
+                    }, 
+                    result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Find_Control_Translated_Outside_Parent_Bounds()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 200,
+                        Height = 200,
+                        Background = Brushes.Red,
+                        ClipToBounds = false,
+                        Children =
+                        {
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 100,
+                                ZIndex = 1,
+                                Background = Brushes.Red,
+                                HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Top,
+                                Child = target = new Border
+                                {
+                                    Width = 50,
+                                    Height = 50,
+                                    Background = Brushes.Red,
+                                    HorizontalAlignment = HorizontalAlignment.Left,
+                                    VerticalAlignment = VerticalAlignment.Top,
+                                    RenderTransform = new TranslateTransform(110, 110),
+                                }
+                            },
+                        }
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                container.Measure(Size.Infinity);
+                container.Arrange(new Rect(container.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(120, 120), root, null);
+
+                Assert.Equal(new IVisual[] { target, container }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Control_Outside_Parent_Bounds_When_Clipped()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 100,
+                        Height = 200,
+                        Background = Brushes.Red,
+                        Children =
+                        {
+                            new Panel()
+                            {
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                Margin = new Thickness(0, 100, 0, 0),
+                                ClipToBounds = true,
+                                Children =
+                                {
+                                    (target = new Border()
+                                    {
+                                        Width = 100,
+                                        Height = 100,
+                                        Background = Brushes.Red,
+                                        Margin = new Thickness(0, -100, 0, 0)
+                                    })
+                                }
+                            }
+                        }
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(50, 50), root, null);
+
+                Assert.Equal(new IVisual[] { container, root }, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Not_Find_Control_Outside_Scroll_Viewport()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                Border item1;
+                Border item2;
+                ScrollContentPresenter scroll;
+                Panel container;
+                var root = new TestRoot
+                {
+                    Child = container = new Panel
+                    {
+                        Width = 100,
+                        Height = 200,
+                        Background = Brushes.Red,
+                        Children =
+                        {
+                            (target = new Border()
+                            {
+                                Name = "b1",
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                            }),
+                            new Border()
+                            {
+                                Name = "b2",
+                                Width = 100,
+                                Height = 100,
+                                Background = Brushes.Red,
+                                Margin = new Thickness(0, 100, 0, 0),
+                                Child = scroll = new ScrollContentPresenter()
+                                {
+                                    CanHorizontallyScroll = true,
+                                    CanVerticallyScroll = true,
+                                    Content = new StackPanel()
+                                    {
+                                        Children =
+                                        {
+                                            (item1 = new Border()
+                                            {
+                                                Name = "b3",
+                                                Width = 100,
+                                                Height = 100,
+                                                Background = Brushes.Red,
+                                            }),
+                                            (item2 = new Border()
+                                            {
+                                                Name = "b4",
+                                                Width = 100,
+                                                Height = 100,
+                                                Background = Brushes.Red,
+                                            }),
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                };
+
+                scroll.UpdateChild();
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(container.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
+
+                Assert.Equal(item1, result);
+
+                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
+
+                Assert.Equal(target, result);
+
+                scroll.Offset = new Vector(0, 100);
+
+                // We don't have LayoutManager set up so do the layout pass manually.
+                scroll.Parent.InvalidateArrange();
+                container.InvalidateArrange();
+                container.Arrange(new Rect(container.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
+                Assert.Equal(item2, result);
+
+                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
+                Assert.Equal(target, result);
+            }
+        }
+
+        [Fact]
+        public void HitTest_Should_Accommodate_ICustomHitTest()
+        {
+            using (TestApplication())
+            {
+                Border border;
+
+                var root = new TestRoot
+                {
+                    Width = 300,
+                    Height = 200,
+                    Child = border = new CustomHitTestBorder
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                };
+
+                root.Renderer = new ImmediateRenderer(root);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+                root.Renderer.Paint(new Rect(root.ClientSize));
+
+                var result = root.Renderer.HitTest(new Point(75, 100), root, null).First();
+                Assert.Equal(border, result);
+
+                result = root.Renderer.HitTest(new Point(125, 100), root, null).First();
+                Assert.Equal(border, result);
+
+                result = root.Renderer.HitTest(new Point(175, 100), root, null).First();
+                Assert.Equal(root, result);
+            }
+        }
+
+        private IDisposable TestApplication()
+        {
+            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/RenderLoopTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/RenderLoopTests.cs
new file mode 100644
index 0000000000..6855a378b4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/RenderLoopTests.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Rendering;
+using Avalonia.Threading;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering
+{
+    public class RenderLoopTests
+    {
+        [Fact]
+        public void RenderLoop_Update_Runs_On_Dispatcher()
+        {
+            var dispatcher = new Mock<IDispatcher>();
+
+            bool inDispatcher = false;
+
+            dispatcher.Setup(
+                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
+                .Callback((Action a, DispatcherPriority _) =>
+                {
+                    inDispatcher = true;
+                    a();
+                    inDispatcher = false;
+                });
+
+            var timer = new Mock<IRenderTimer>();
+
+            var loop = new RenderLoop(timer.Object, dispatcher.Object);
+
+            var renderTask = new Mock<IRenderLoopTask>();
+
+            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
+            renderTask.Setup(t => t.Update(It.IsAny<TimeSpan>()))
+                .Callback((TimeSpan _) => Assert.True(inDispatcher));
+
+            loop.Add(renderTask.Object);
+
+            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
+
+            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Once());
+        }
+
+        [Fact]
+        public void RenderLoop_Does_Not_Update_When_No_Tasks_Need_Update()
+        {
+            var dispatcher = new Mock<IDispatcher>();
+            dispatcher.Setup(
+                d => d.InvokeAsync(It.IsAny<Action>(), DispatcherPriority.Render))
+                .Callback((Action a, DispatcherPriority _) => a())
+                .Returns(Task.CompletedTask);
+
+            var timer = new Mock<IRenderTimer>();
+            var loop = new RenderLoop(timer.Object, dispatcher.Object);
+            var renderTask = new Mock<IRenderLoopTask>();
+            renderTask.Setup(t => t.NeedsUpdate).Returns(false);
+
+            loop.Add(renderTask.Object);
+            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
+            
+            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Never());
+        }
+
+        [Fact]
+        public void RenderLoop_Render_Runs_Off_Dispatcher()
+        {
+            var dispatcher = new Mock<IDispatcher>();
+            bool inDispatcher = false;
+            dispatcher.Setup(
+                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
+                .Callback((Action a, DispatcherPriority _) =>
+                {
+                    inDispatcher = true;
+                    a();
+                    inDispatcher = false;
+                });
+
+            var timer = new Mock<IRenderTimer>();
+            var loop = new RenderLoop(timer.Object, dispatcher.Object);
+
+            var renderTask = new Mock<IRenderLoopTask>();
+
+            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
+            renderTask.Setup(t => t.Render())
+                .Callback(() => Assert.False(inDispatcher));
+
+            loop.Add(renderTask.Object);
+            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
+
+            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Once());
+        }
+        
+        [Fact]
+        public void RenderLoop_Passes_Tick_Count_To_Update()
+        {
+            var dispatcher = new Mock<IDispatcher>();
+            dispatcher.Setup(
+                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
+                .Callback((Action a, DispatcherPriority _) => a());
+
+            var timer = new Mock<IRenderTimer>();
+            var loop = new RenderLoop(timer.Object, dispatcher.Object);
+            var renderTask = new Mock<IRenderLoopTask>();
+            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
+
+            loop.Add(renderTask.Object);
+            var time = new TimeSpan(123456789L);
+            timer.Raise(t => t.Tick += null, time);
+
+            renderTask.Verify(t => t.Update(time), Times.Once());
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
new file mode 100644
index 0000000000..8f307978f2
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
@@ -0,0 +1,225 @@
+using System.Linq;
+using Avalonia.Media;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.UnitTests;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{
+    public class DeferredDrawingContextImplTests
+    {
+        [Fact]
+        public void Should_Add_VisualNode()
+        {
+            var parent = new VisualNode(new TestRoot(), null);
+            var child = new VisualNode(Mock.Of<IVisual>(), parent);
+            var layers = new SceneLayers(parent.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            target.BeginUpdate(parent);
+            target.BeginUpdate(child);
+
+            Assert.Equal(1, parent.Children.Count);
+            Assert.Same(child, parent.Children[0]);
+        }
+
+        [Fact]
+        public void Should_Not_Replace_Identical_VisualNode()
+        {
+            var parent = new VisualNode(new TestRoot(), null);
+            var child = new VisualNode(Mock.Of<IVisual>(), parent);
+            var layers = new SceneLayers(parent.Visual);
+
+            parent.AddChild(child);
+
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            target.BeginUpdate(parent);
+            target.BeginUpdate(child);
+
+            Assert.Equal(1, parent.Children.Count);
+            Assert.Same(child, parent.Children[0]);
+        }
+
+        [Fact]
+        public void Should_Replace_Different_VisualNode()
+        {
+            var parent = new VisualNode(new TestRoot(), null);
+            var child1 = new VisualNode(Mock.Of<IVisual>(), parent);
+            var child2 = new VisualNode(Mock.Of<IVisual>(), parent);
+            var layers = new SceneLayers(parent.Visual);
+
+            parent.AddChild(child1);
+
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            target.BeginUpdate(parent);
+            target.BeginUpdate(child2);
+
+            Assert.Equal(1, parent.Children.Count);
+            Assert.Same(child2, parent.Children[0]);
+        }
+
+        [Fact]
+        public void TrimChildren_Should_Trim_Children()
+        {
+            var root = new TestRoot();
+            var node = new VisualNode(root, null) { LayerRoot = root };
+
+            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
+            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
+            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
+            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
+
+            var layers = new SceneLayers(root);
+            var target = new DeferredDrawingContextImpl(null, layers);
+            var child1 = new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root };
+            var child2 = new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root };
+
+            target.BeginUpdate(node);
+            using (target.BeginUpdate(child1)) { }
+            using (target.BeginUpdate(child2)) { }
+            target.TrimChildren();
+
+            Assert.Equal(2, node.Children.Count);
+        }
+
+        [Fact]
+        public void Should_Add_DrawOperations()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            node.LayerRoot = node.Visual;
+
+            using (target.BeginUpdate(node))
+            {
+                target.DrawRectangle(Brushes.Red, new Pen(Brushes.Green, 1), new Rect(0, 0, 100, 100));
+            }
+
+            Assert.Equal(1, node.DrawOperations.Count);
+            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
+        }
+
+        [Fact]
+        public void Should_Not_Replace_Identical_DrawOperation()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default));
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            node.LayerRoot = node.Visual;
+            node.AddDrawOperation(operation);
+
+            using (target.BeginUpdate(node))
+            {
+                target.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100));
+            }
+
+            Assert.Equal(1, node.DrawOperations.Count);
+            Assert.Same(operation.Item, node.DrawOperations.Single().Item);
+
+            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
+        }
+
+        [Fact]
+        public void Should_Replace_Different_DrawOperation()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default));
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            node.LayerRoot = node.Visual;
+            node.AddDrawOperation(operation);
+
+            using (target.BeginUpdate(node))
+            {
+                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
+            }
+
+            Assert.Equal(1, node.DrawOperations.Count);
+            Assert.NotSame(operation, node.DrawOperations.Single());
+
+            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
+        }
+
+        [Fact]
+        public void Should_Update_DirtyRects()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            var operation = new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default);
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            node.LayerRoot = node.Visual;
+
+            using (target.BeginUpdate(node))
+            {
+                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
+            }
+
+            Assert.Equal(new Rect(0, 0, 100, 100), layers.Single().Dirty.Single());
+        }
+
+        [Fact]
+        public void Should_Trim_DrawOperations()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            node.LayerRoot = node.Visual;
+
+            for (var i = 0; i < 4; ++i)
+            {
+                var drawOperation = new Mock<IDrawOperation>();
+                using (var r = RefCountable.Create(drawOperation.Object))
+                {
+                    node.AddDrawOperation(r);
+                }
+            }
+
+            var drawOperations = node.DrawOperations.Select(op => op.Item).ToList();
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            using (target.BeginUpdate(node))
+            {
+                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 10, 100));
+                target.DrawRectangle(Brushes.Blue, null, new Rect(0, 0, 20, 100));
+            }
+
+            Assert.Equal(2, node.DrawOperations.Count);
+
+            foreach (var i in drawOperations)
+            {
+                Mock.Get(i).Verify(x => x.Dispose());
+            }
+        }
+
+        [Fact]
+        public void Trimmed_DrawOperations_Releases_Reference()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default));
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            node.LayerRoot = node.Visual;
+            node.AddDrawOperation(operation);
+            Assert.Equal(2, operation.RefCount);
+
+            using (target.BeginUpdate(node))
+            {
+                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
+            }
+
+            Assert.Equal(1, node.DrawOperations.Count);
+            Assert.NotSame(operation, node.DrawOperations.Single());
+            Assert.Equal(1, operation.RefCount);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
new file mode 100644
index 0000000000..2fac968206
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
@@ -0,0 +1,102 @@
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
+using Avalonia.Media.Imaging;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{  
+    public class DrawOperationTests
+    {
+        [Fact]
+        public void Empty_Bounds_Remain_Empty()
+        {
+            var target = new TestDrawOperation(Rect.Empty, Matrix.Identity, null);
+
+            Assert.Equal(Rect.Empty, target.Bounds);
+        }
+
+        [Theory]
+        [InlineData(10, 10, 10, 10, 1, 1, 1, 9, 9, 12, 12)]
+        [InlineData(10, 10, 10, 10, 1, 1, 2, 9, 9, 12, 12)]
+        [InlineData(10, 10, 10, 10, 1.5, 1.5, 1, 14, 14, 17, 17)]
+        public void Rectangle_Bounds_Are_Snapped_To_Pixels(
+            double x,
+            double y,
+            double width,
+            double height,
+            double scaleX,
+            double scaleY,
+            double? penThickness,
+            double expectedX,
+            double expectedY,
+            double expectedWidth,
+            double expectedHeight)
+        {
+            var target = new TestRectangleDrawOperation(
+                new Rect(x, y, width, height),
+                Matrix.CreateScale(scaleX, scaleY),
+                penThickness.HasValue ? new Pen(Brushes.Black, penThickness.Value) : null);
+            Assert.Equal(new Rect(expectedX, expectedY, expectedWidth, expectedHeight), target.Bounds);
+        }
+
+        [Fact]
+        public void Image_Node_Releases_Reference_To_Bitmap_On_Dispose()
+        {
+            var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>());
+            var imageNode = new ImageNode(
+                Matrix.Identity,
+                bitmap,
+                1,
+                new Rect(1, 1, 1, 1),
+                new Rect(1, 1, 1, 1),
+                BitmapInterpolationMode.Default);
+
+            Assert.Equal(2, bitmap.RefCount);
+
+            imageNode.Dispose();
+
+            Assert.Equal(1, bitmap.RefCount);
+        }
+
+        [Fact]
+        public void HitTest_On_Geometry_Node_With_Zero_Transform_Does_Not_Throw()
+        {
+            var geometry = Mock.Of<IGeometryImpl>();
+            var geometryNode = new GeometryNode(
+                new Matrix(),
+                Brushes.Black,
+                null,
+                geometry, default);
+
+            geometryNode.HitTest(new Point());
+        }
+
+        private class TestRectangleDrawOperation : RectangleNode
+        {
+            public TestRectangleDrawOperation(Rect bounds, Matrix transform, Pen pen) 
+                : base(transform, pen.Brush, pen, bounds, new BoxShadows())
+            {
+
+            }
+
+            public override bool HitTest(Point p) => false;
+
+            public override void Render(IDrawingContextImpl context) { }
+        }
+
+        private class TestDrawOperation : DrawOperation
+        {
+            public TestDrawOperation(Rect bounds, Matrix transform, Pen pen)
+                :base(bounds, transform)
+            {
+            }
+
+            public override bool HitTest(Point p) => false;
+
+            public override void Render(IDrawingContextImpl context) { }
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/EllipseNodeTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/EllipseNodeTests.cs
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/EllipseNodeTests.cs
rename to tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/EllipseNodeTests.cs
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/LineNodeTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/LineNodeTests.cs
similarity index 100%
rename from tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/LineNodeTests.cs
rename to tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/LineNodeTests.cs
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
new file mode 100644
index 0000000000..01afe85b8b
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -0,0 +1,990 @@
+using System.Linq;
+using System.Reactive.Subjects;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.UnitTests;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{
+    public partial class SceneBuilderTests
+    {
+        [Fact]
+        public void Should_Build_Initial_Scene()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                TextBlock textBlock;
+                var tree = new TestRoot
+                {
+                    Child = border = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        Child = textBlock = new TextBlock
+                        {
+                            TextWrapping = TextWrapping.NoWrap,
+                            Text = "Hello World",
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var result = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(result);
+
+                Assert.Same(tree, ((VisualNode)result.Root).LayerRoot);
+                Assert.Equal(1, result.Root.Children.Count);
+
+                var borderNode = (VisualNode)result.Root.Children[0];
+                Assert.Same(borderNode, result.FindNode(border));
+                Assert.Same(border, borderNode.Visual);
+                Assert.Equal(1, borderNode.Children.Count);
+                Assert.Equal(1, borderNode.DrawOperations.Count);
+
+                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0].Item;
+                Assert.Equal(Brushes.Red, backgroundNode.Brush);
+
+                var textBlockNode = borderNode.Children[0];
+                Assert.Same(textBlockNode, result.FindNode(textBlock));
+                Assert.Same(textBlock, textBlockNode.Visual);
+                Assert.Equal(1, textBlockNode.DrawOperations.Count);
+
+                var textNode = (GlyphRunNode)textBlockNode.DrawOperations[0].Item;
+                Assert.NotNull(textNode.GlyphRun);
+            }
+        }
+
+        [Fact]
+        public void Should_Respect_Margin_For_ClipBounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 200,
+                    Height = 300,
+                    Child = new Border
+                    {
+                        Margin = new Thickness(10, 20, 30, 40),
+                        Child = canvas = new Canvas
+                        {
+                            ClipToBounds = true,
+                            Background = Brushes.AliceBlue,
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var result = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(result);
+
+                var canvasNode = result.FindNode(canvas);
+                Assert.Equal(new Rect(10, 20, 160, 240), canvasNode.ClipBounds);
+
+                // Initial ClipBounds are correct, make sure they're still correct after updating canvas.
+                result = result.CloneScene();
+                Assert.True(sceneBuilder.Update(result, canvas));
+
+                canvasNode = result.FindNode(canvas);
+                Assert.Equal(new Rect(10, 20, 160, 240), canvasNode.ClipBounds);
+            }
+        }
+
+        [Fact]
+        public void ClipBounds_Should_Be_Intersection_With_Parent_ClipBounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                var tree = new TestRoot
+                {
+                    Width = 200,
+                    Height = 300,
+                    Child = new Canvas
+                    {
+                        ClipToBounds = true,
+                        Width = 100,
+                        Height = 100,
+                        HorizontalAlignment = HorizontalAlignment.Left,
+                        VerticalAlignment = VerticalAlignment.Top,
+                        Children =
+                        {
+                            (border = new Border
+                            {
+                                Background = Brushes.AliceBlue,
+                                ClipToBounds = true,
+                                Width = 100,
+                                Height = 100,
+                                [Canvas.LeftProperty] = 50,
+                                [Canvas.TopProperty] = 50,
+                            })
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(50, 50, 50, 50), borderNode.ClipBounds);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_Descendent_ClipBounds_When_Margin_Changed()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 200,
+                    Height = 300,
+                    Child = canvas = new Canvas
+                    {
+                        ClipToBounds = true,
+                        Width = 100,
+                        Height = 100,
+                        HorizontalAlignment = HorizontalAlignment.Left,
+                        VerticalAlignment = VerticalAlignment.Top,
+                        Children =
+                        {
+                            (border = new Border
+                            {
+                                Background = Brushes.AliceBlue,
+                                ClipToBounds = true,
+                                Width = 100,
+                                Height = 100,
+                                [Canvas.LeftProperty] = 50,
+                                [Canvas.TopProperty] = 50,
+                            })
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(50, 50, 50, 50), borderNode.ClipBounds);
+
+                canvas.Width = canvas.Height = 125;
+                canvas.Measure(Size.Infinity);
+                canvas.Arrange(new Rect(tree.DesiredSize));
+
+                // Initial ClipBounds are correct, make sure they're still correct after updating canvas.
+                scene = scene.CloneScene();
+                Assert.True(sceneBuilder.Update(scene, canvas));
+
+                borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(50, 50, 75, 75), borderNode.ClipBounds);
+            }
+        }
+
+        [Fact]
+        public void Should_Respect_ZIndex()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border front;
+                Border back;
+                var tree = new TestRoot
+                {
+                    Child = new Panel
+                    {
+                        Children =
+                        {
+                            (front = new Border
+                            {
+                                ZIndex = 1,
+                            }),
+                            (back = new Border
+                            {
+                                ZIndex = 0,
+                            }),
+                        }
+                    }
+                };
+
+                var result = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(result);
+
+                var panelNode = result.FindNode(tree.Child);
+                var expected = new IVisual[] { back, front };
+                var actual = panelNode.Children.OfType<IVisualNode>().Select(x => x.Visual).ToArray();
+                Assert.Equal(expected, actual);
+            }
+        }
+
+        [Fact]
+        public void Should_Respect_Uniform_ZIndex()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Panel panel;
+
+                var tree = new TestRoot
+                {
+                    Child = panel = new Panel()
+                };
+
+                for (var i = 0; i < 128; i++)
+                {
+                    panel.Children.Add(new Border());
+                }
+
+                var result = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(result);
+
+                var panelNode = result.FindNode(tree.Child);
+                var expected = panel.Children.ToArray();
+                var actual = panelNode.Children.OfType<IVisualNode>().Select(x => x.Visual).ToArray();
+                Assert.Equal(expected, actual);
+            }
+        }
+
+        [Fact]
+        public void ClipBounds_Should_Be_In_Global_Coordinates()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border target;
+                var tree = new TestRoot
+                {
+                    Child = new Decorator
+                    {
+                        Margin = new Thickness(24, 26),
+                        Child = target = new Border
+                        {
+                            ClipToBounds = true,
+                            Margin = new Thickness(26, 24),
+                            Width = 100,
+                            Height = 100,
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var result = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(result);
+
+                var targetNode = result.FindNode(target);
+
+                Assert.Equal(new Rect(50, 50, 100, 100), targetNode.ClipBounds);
+            }
+        }
+
+        [Fact]
+        public void Transform_For_Control_With_RenderTransform_Should_Be_Correct_After_Update()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                var tree = new TestRoot
+                {
+                    Width = 400,
+                    Height = 200,
+                    Child = new Decorator
+                    {
+                        Width = 200,
+                        Height = 100,
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            HorizontalAlignment = HorizontalAlignment.Right,
+                            Width = 100,
+                            RenderTransform = new ScaleTransform(0.5, 1),
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var expectedTransform = Matrix.CreateScale(0.5, 1) * Matrix.CreateTranslation(225, 50);
+                var borderNode = scene.FindNode(border);
+                Assert.Equal(expectedTransform, borderNode.Transform);
+
+                scene = scene.CloneScene();
+                Assert.True(sceneBuilder.Update(scene, border));
+
+                borderNode = scene.FindNode(border);
+                Assert.Equal(expectedTransform, borderNode.Transform);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_Border_Background_Node()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                TextBlock textBlock;
+                var tree = new TestRoot
+                {
+                    Child = border = new Border
+                    {
+                        Width = 100,
+                        Height = 100,
+                        Background = Brushes.Red,
+                        Child = textBlock = new TextBlock
+                        {
+                            Foreground = Brushes.Green,
+                            Text = "Hello World",
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var initial = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(initial);
+
+                var initialBackgroundNode = initial.FindNode(border).Children[0];
+                var initialTextNode = initial.FindNode(textBlock).DrawOperations[0];
+
+                Assert.NotNull(initialBackgroundNode);
+                Assert.NotNull(initialTextNode);
+
+                border.Background = Brushes.Green;
+
+                var result = initial.CloneScene();
+                sceneBuilder.Update(result, border);
+
+                var borderNode = (VisualNode)result.Root.Children[0];
+                Assert.Same(border, borderNode.Visual);
+
+                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0].Item;
+                Assert.NotSame(initialBackgroundNode, backgroundNode);
+                Assert.Equal(Brushes.Green, backgroundNode.Brush);
+
+                var textBlockNode = (VisualNode)borderNode.Children[0];
+                Assert.Same(textBlock, textBlockNode.Visual);
+
+                var textNode = (GlyphRunNode)textBlockNode.DrawOperations[0].Item;
+                Assert.Same(initialTextNode.Item, textNode);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_When_Control_Added()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = border = new Border
+                    {
+                        Background = Brushes.Red,
+                    }
+                };
+
+                Canvas canvas;
+                var decorator = new Decorator
+                {
+                    Child = canvas = new Canvas(),
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var initial = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(initial);
+
+                border.Child = decorator;
+                var result = initial.CloneScene();
+
+                Assert.True(sceneBuilder.Update(result, decorator));
+
+                // Updating canvas should result in no-op as it should have been updated along 
+                // with decorator as part of the add opeation.
+                Assert.False(sceneBuilder.Update(result, canvas));
+
+                var borderNode = (VisualNode)result.Root.Children[0];
+                Assert.Equal(1, borderNode.Children.Count);
+                Assert.Equal(1, borderNode.DrawOperations.Count);
+
+                var decoratorNode = (VisualNode)borderNode.Children[0];
+                Assert.Same(decorator, decoratorNode.Visual);
+                Assert.Same(decoratorNode, result.FindNode(decorator));
+
+                var canvasNode = (VisualNode)decoratorNode.Children[0];
+                Assert.Same(canvas, canvasNode.Visual);
+                Assert.Same(canvasNode, result.FindNode(canvas));
+            }
+        }
+
+        [Fact]
+        public void Should_Update_When_Control_Removed()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                Decorator decorator;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = border = new Border
+                    {
+                        Background = Brushes.Red,
+                        Child = decorator = new Decorator
+                        {
+                            Child = canvas = new Canvas
+                            {
+                                Background = Brushes.AliceBlue,
+                            }
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var initial = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(initial);
+
+                border.Child = null;
+                var result = initial.CloneScene();
+
+                Assert.True(sceneBuilder.Update(result, decorator));
+                Assert.False(sceneBuilder.Update(result, canvas));
+
+                var borderNode = (VisualNode)result.Root.Children[0];
+                Assert.Equal(0, borderNode.Children.Count);
+                Assert.Equal(1, borderNode.DrawOperations.Count);
+
+                Assert.Null(result.FindNode(decorator));
+                Assert.Equal(new Rect(0, 0, 100, 100), result.Layers.Single().Dirty.Single());
+            }
+        }
+
+        [Fact]
+        public void Should_Update_When_Control_Moved()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator moveFrom;
+                Decorator moveTo;
+                Canvas moveMe;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            (moveFrom = new Decorator
+                            {
+                                Child = moveMe = new Canvas(),
+                            }),
+                            (moveTo = new Decorator()),
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
+                var moveToNode = (VisualNode)scene.FindNode(moveTo);
+
+                Assert.Equal(1, moveFromNode.Children.Count);
+                Assert.Same(moveMe, moveFromNode.Children[0].Visual);
+                Assert.Empty(moveToNode.Children);
+
+                moveFrom.Child = null;
+                moveTo.Child = moveMe;
+
+                scene = scene.CloneScene();
+                moveFromNode = (VisualNode)scene.FindNode(moveFrom);
+                moveToNode = (VisualNode)scene.FindNode(moveTo);
+
+                moveFromNode.SortChildren(scene);
+                moveToNode.SortChildren(scene);
+                sceneBuilder.Update(scene, moveFrom);
+                sceneBuilder.Update(scene, moveTo);
+                sceneBuilder.Update(scene, moveMe);
+
+                Assert.Empty(moveFromNode.Children);
+                Assert.Equal(1, moveToNode.Children.Count);
+                Assert.Same(moveMe, moveToNode.Children[0].Visual);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_When_Control_Made_Invisible()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = decorator = new Decorator
+                    {
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Child = canvas = new Canvas(),
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var initial = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(initial);
+
+                border.IsVisible = false;
+                var result = initial.CloneScene();
+
+                Assert.True(sceneBuilder.Update(result, border));
+                Assert.False(sceneBuilder.Update(result, canvas));
+
+                var decoratorNode = (VisualNode)result.Root.Children[0];
+                Assert.Equal(0, decoratorNode.Children.Count);
+
+                Assert.Null(result.FindNode(border));
+                Assert.Null(result.FindNode(canvas));
+                Assert.Equal(new Rect(0, 0, 100, 100), result.Layers.Single().Dirty.Single());
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Dispose_Active_VisualNode_When_Control_Reparented_And_Child_Made_Invisible()
+        {
+            // Issue #3115
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                StackPanel panel;
+                Border border1;
+                Border border2;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = panel = new StackPanel
+                    {
+                        Children =
+                        {
+                            (border1 = new Border
+                            {
+                                Background = Brushes.Red,
+                            }),
+                            (border2 = new Border
+                            {
+                                Background = Brushes.Green,
+                            }),
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var decorator = new Decorator();
+                tree.Child = null;
+                decorator.Child = panel;
+                tree.Child = decorator;
+                border1.IsVisible = false;
+
+                scene = scene.CloneScene();
+                sceneBuilder.Update(scene, decorator);
+
+                var panelNode = (VisualNode)scene.FindNode(panel);
+                Assert.Equal(2, panelNode.Children.Count);
+                Assert.False(panelNode.Children[0].Disposed);
+                Assert.False(panelNode.Children[1].Disposed);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_ClipBounds_For_Negative_Margin()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = decorator = new Decorator
+                    {
+                        Margin = new Thickness(0, 10, 0, 0),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            ClipToBounds = true,
+                            Margin = new Thickness(0, -5, 0, 0),
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(0, 5, 100, 95), borderNode.ClipBounds);
+
+                border.Margin = new Thickness(0, -8, 0, 0);
+                layout.ExecuteLayoutPass();
+
+                scene = scene.CloneScene();
+                sceneBuilder.Update(scene, border);
+
+                borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(0, 2, 100, 98), borderNode.ClipBounds);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_Descendent_Tranform_When_Margin_Changed()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = decorator = new Decorator
+                    {
+                        Margin = new Thickness(0, 10, 0, 0),
+                        Child = border = new Border
+                        {
+                            Child = canvas = new Canvas(),
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderNode = scene.FindNode(border);
+                var canvasNode = scene.FindNode(canvas);
+                Assert.Equal(Matrix.CreateTranslation(0, 10), borderNode.Transform);
+                Assert.Equal(Matrix.CreateTranslation(0, 10), canvasNode.Transform);
+
+                decorator.Margin = new Thickness(0, 20, 0, 0);
+                layout.ExecuteLayoutPass();
+
+                scene = scene.CloneScene();
+                sceneBuilder.Update(scene, decorator);
+
+                borderNode = scene.FindNode(border);
+                canvasNode = scene.FindNode(canvas);
+                Assert.Equal(Matrix.CreateTranslation(0, 20), borderNode.Transform);
+                Assert.Equal(Matrix.CreateTranslation(0, 20), canvasNode.Transform);
+            }
+        }
+
+        [Fact]
+        public void DirtyRects_Should_Contain_Old_And_New_Bounds_When_Margin_Changed()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = decorator = new Decorator
+                    {
+                        Margin = new Thickness(0, 10, 0, 0),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Child = canvas = new Canvas(),
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderNode = scene.FindNode(border);
+                var canvasNode = scene.FindNode(canvas);
+                Assert.Equal(Matrix.CreateTranslation(0, 10), borderNode.Transform);
+                Assert.Equal(Matrix.CreateTranslation(0, 10), canvasNode.Transform);
+
+                decorator.Margin = new Thickness(0, 20, 0, 0);
+                layout.ExecuteLayoutPass();
+
+                scene = scene.CloneScene();
+
+                sceneBuilder.Update(scene, decorator);
+
+                var rects = scene.Layers.Single().Dirty.ToArray();
+                Assert.Equal(new[] { new Rect(0, 10, 100, 90) }, rects);
+            }
+        }
+
+        [Fact]
+        public void Resizing_Scene_Should_Add_DirtyRects()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Child = decorator = new Decorator
+                    {
+                        Margin = new Thickness(0, 10, 0, 0),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Child = canvas = new Canvas(),
+                        }
+                    }
+                };
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                Assert.Equal(new Size(100, 100), scene.Size);
+
+                tree.ClientSize = new Size(110, 120);
+                scene = scene.CloneScene();
+                sceneBuilder.Update(scene, tree);
+
+                Assert.Equal(new Size(110, 120), scene.Size);
+
+                var expected = new[]
+                {
+                    new Rect(100, 0, 10, 100),
+                    new Rect(0, 100, 110, 20),
+                };
+
+                Assert.Equal(expected, scene.Layers[tree].Dirty.ToArray());
+                
+                // Layers are disabled. See #2244
+                // Assert.Equal(expected, scene.Layers[border].Dirty.ToArray());
+            }
+        }
+
+        [Fact]
+        public void Setting_Opacity_Should_Add_Descendent_Bounds_To_DirtyRects()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                var tree = new TestRoot
+                {
+                    Child = decorator = new Decorator
+                    {
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Width = 100,
+                            Height = 100,
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                decorator.Opacity = 0.5;
+                scene = scene.CloneScene();
+                sceneBuilder.Update(scene, decorator);
+
+                Assert.NotEmpty(scene.Layers.Single().Dirty);
+                var dirty = scene.Layers.Single().Dirty.Single();
+                Assert.Equal(new Rect(0, 0, 100, 100), dirty);
+            }
+        }
+
+        [Fact]
+        public void Should_Set_GeometryClip()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var clip = StreamGeometry.Parse("M100,0 L0,100 100,100");
+                Decorator decorator;
+                var tree = new TestRoot
+                {
+                    Child = decorator = new Decorator
+                    {
+                        Clip = clip,
+                    }
+                };
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var decoratorNode = scene.FindNode(decorator);
+                Assert.Same(clip.PlatformImpl, decoratorNode.GeometryClip);
+            }
+        }
+
+        [Fact]
+        public void Disposing_Scene_Releases_DrawOperation_References()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>(
+                    x => x.PixelSize == new PixelSize(100, 100) &&
+                    x.Dpi == new Vector(96, 96)));
+
+                Image img;
+                var tree = new TestRoot
+                {
+                    Child = img = new Image
+                    {
+                        Source = new Bitmap(bitmap),
+                        Height = 100,
+                        Width = 100
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(new Size(100, 100)));
+
+                Assert.Equal(2, bitmap.RefCount);
+                IRef<IDrawOperation> operation;
+
+                using (var scene = new Scene(tree))
+                {
+                    var sceneBuilder = new SceneBuilder();
+                    sceneBuilder.UpdateAll(scene);
+                    operation = scene.FindNode(img).DrawOperations[0];
+                    Assert.Equal(1, operation.RefCount);
+
+                    Assert.Equal(3, bitmap.RefCount);
+                }
+                Assert.Equal(0, operation.RefCount);
+                Assert.Equal(2, bitmap.RefCount);
+            }
+        }
+
+        [Fact]
+        public void Replacing_Control_Releases_DrawOperation_Reference()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>(
+                    x => x.PixelSize == new PixelSize(100, 100) &&
+                    x.Dpi == new Vector(96, 96)));
+
+                Image img;
+                var tree = new TestRoot
+                {
+                    Child = img = new Image
+                    {
+                        Source = new Bitmap(bitmap),
+                        Width = 100,
+                        Height = 100
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(new Size(100, 100)));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var operation = scene.FindNode(img).DrawOperations[0];
+
+                tree.Child = new Decorator();
+
+                using (var result = scene.CloneScene())
+                {
+                    sceneBuilder.Update(result, img);
+                    scene.Dispose();
+
+                    Assert.Equal(0, operation.RefCount);
+                    Assert.Equal(2, bitmap.RefCount);
+                }
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
new file mode 100644
index 0000000000..9f5a0363ed
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
@@ -0,0 +1,258 @@
+using System.Linq;
+using System.Reactive.Subjects;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Media;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{
+    public partial class SceneBuilderTests
+    {
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Control_With_Animated_Opacity_And_Children_Should_Start_New_Layer()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Padding = new Thickness(10),
+                    Width = 100,
+                    Height = 120,
+                    Child = decorator = new Decorator
+                    {
+                        Padding = new Thickness(11),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Padding = new Thickness(12),
+                            Child = canvas = new Canvas()
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var rootNode = (VisualNode)scene.Root;
+                var borderNode = (VisualNode)scene.FindNode(border);
+                var canvasNode = (VisualNode)scene.FindNode(canvas);
+
+                Assert.Same(tree, rootNode.LayerRoot);
+                Assert.Same(border, borderNode.LayerRoot);
+                Assert.Same(border, canvasNode.LayerRoot);
+                Assert.Equal(0.5, scene.Layers[border].Opacity);
+
+                Assert.Equal(2, scene.Layers.Count());
+                Assert.Empty(scene.Layers.Select(x => x.LayerRoot).Except(new IVisual[] { tree, border }));
+
+                animation.OnCompleted();
+                scene = scene.CloneScene();
+
+                sceneBuilder.Update(scene, border);
+
+                rootNode = (VisualNode)scene.Root;
+                borderNode = (VisualNode)scene.FindNode(border);
+                canvasNode = (VisualNode)scene.FindNode(canvas);
+
+                Assert.Same(tree, rootNode.LayerRoot);
+                Assert.Same(tree, borderNode.LayerRoot);
+                Assert.Same(tree, canvasNode.LayerRoot);
+                Assert.Single(scene.Layers);
+
+                var rootDirty = scene.Layers[tree].Dirty;
+
+                Assert.Single(rootDirty);
+                Assert.Equal(new Rect(21, 21, 58, 78), rootDirty.Single());
+            }
+        }
+
+        [Fact]
+        public void Control_With_Animated_Opacity_And_No_Children_Should_Not_Start_New_Layer()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                var tree = new TestRoot
+                {
+                    Padding = new Thickness(10),
+                    Width = 100,
+                    Height = 120,
+                    Child = decorator = new Decorator
+                    {
+                        Padding = new Thickness(11),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                Assert.Single(scene.Layers);
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Removing_Control_With_Animated_Opacity_Should_Remove_Layers()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Padding = new Thickness(10),
+                    Width = 100,
+                    Height = 120,
+                    Child = decorator = new Decorator
+                    {
+                        Padding = new Thickness(11),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Padding = new Thickness(12),
+                            Child = canvas = new Canvas
+                            {
+                                Children = { new TextBlock() },
+                            }
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+                canvas.Bind(Canvas.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                Assert.Equal(3, scene.Layers.Count);
+
+                decorator.Child = null;
+                scene = scene.CloneScene();
+
+                sceneBuilder.Update(scene, border);
+
+                Assert.Equal(1, scene.Layers.Count);
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void Hiding_Transparent_Control_Should_Remove_Layers()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Decorator decorator;
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Padding = new Thickness(10),
+                    Width = 100,
+                    Height = 120,
+                    Child = decorator = new Decorator
+                    {
+                        Padding = new Thickness(11),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Padding = new Thickness(12),
+                            Child = canvas = new Canvas
+                            {
+                                Children = { new TextBlock() },
+                            }
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+                canvas.Bind(Canvas.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                Assert.Equal(3, scene.Layers.Count);
+
+                border.IsVisible = false;
+                scene = scene.CloneScene();
+
+                sceneBuilder.Update(scene, border);
+
+                Assert.Equal(1, scene.Layers.Count);
+            }
+        }
+
+        [Fact(Skip = "Layers are disabled. See #2244")]
+        public void GeometryClip_Should_Affect_Child_Layers()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var clip = StreamGeometry.Parse("M100,0 L0,100 100,100");
+                Decorator decorator;
+                Border border;
+                var tree = new TestRoot
+                {
+                    Child = decorator = new Decorator
+                    {
+                        Clip = clip,
+                        Margin = new Thickness(12, 16),
+                        Child = border = new Border
+                        {
+                            Opacity = 0.5,
+                            Child = new Canvas(),
+                        }
+                    }
+                };
+
+                var layout = tree.LayoutManager;
+                layout.ExecuteInitialLayoutPass();
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderLayer = scene.Layers[border];
+                Assert.Equal(
+                    Matrix.CreateTranslation(12, 16),
+                    ((MockStreamGeometryImpl)borderLayer.GeometryClip).Transform);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneLayersTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneLayersTests.cs
new file mode 100644
index 0000000000..9d25a3aa44
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneLayersTests.cs
@@ -0,0 +1,35 @@
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{
+    public class SceneLayersTests
+    {
+        [Fact]
+        public void Layers_Should_Be_Ordered()
+        {
+            Border border;
+            Decorator decorator;
+            var root = new TestRoot
+            {
+                Child = border = new Border
+                {
+                    Child = decorator = new Decorator(),
+                }
+            };
+
+            var target = new SceneLayers(root);
+            target.Add(root);
+            target.Add(decorator);
+            target.Add(border);
+
+            var result = target.Select(x => x.LayerRoot).ToArray();
+
+            Assert.Equal(new IVisual[] { root, border, decorator }, result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneTests.cs
new file mode 100644
index 0000000000..18ff31f676
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/SceneTests.cs
@@ -0,0 +1,33 @@
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{
+    public class SceneTests
+    {
+        [Fact]
+        public void Cloning_Scene_Should_Retain_Layers_But_Not_DirtyRects()
+        {
+            Decorator decorator;
+            var tree = new TestRoot
+            {
+                Child = decorator = new Decorator(),
+            };
+
+            var scene = new Scene(tree);
+            scene.Layers.Add(tree);
+            scene.Layers.Add(decorator);
+
+            scene.Layers[tree].Dirty.Add(new Rect(0, 0, 100, 100));
+            scene.Layers[decorator].Dirty.Add(new Rect(0, 0, 50, 100));
+
+            scene = scene.CloneScene();
+            Assert.Equal(2, scene.Layers.Count());
+            Assert.Empty(scene.Layers[0].Dirty);
+            Assert.Empty(scene.Layers[1].Dirty);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs
new file mode 100644
index 0000000000..93266c428c
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs
@@ -0,0 +1,123 @@
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.SceneGraph
+{
+    public class VisualNodeTests
+    {
+        [Fact]
+        public void Empty_Children_Collections_Should_Be_Shared()
+        {
+            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
+            var node2 = new VisualNode(Mock.Of<IVisual>(), null);
+
+            Assert.Same(node1.Children, node2.Children);
+        }
+
+        [Fact]
+        public void Adding_Child_Should_Create_Collection()
+        {
+            var node = new VisualNode(Mock.Of<IVisual>(), null);
+            var collection = node.Children;
+
+            node.AddChild(Mock.Of<IVisualNode>(x => x.Parent == node));
+
+            Assert.NotSame(collection, node.Children);
+        }
+
+        [Fact]
+        public void Empty_DrawOperations_Collections_Should_Be_Shared()
+        {
+            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
+            var node2 = new VisualNode(Mock.Of<IVisual>(), null);
+
+            Assert.Same(node1.DrawOperations, node2.DrawOperations);
+        }
+
+        [Fact]
+        public void Adding_DrawOperation_Should_Create_Collection()
+        {
+            var node = new VisualNode(Mock.Of<IVisual>(), null);
+            var collection = node.DrawOperations;
+
+            node.AddDrawOperation(RefCountable.Create(Mock.Of<IDrawOperation>()));
+
+            Assert.NotSame(collection, node.DrawOperations);
+        }
+
+        [Fact]
+        public void Cloned_Nodes_Should_Share_DrawOperations_Collection()
+        {
+            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
+            node1.AddDrawOperation(RefCountable.Create(Mock.Of<IDrawOperation>()));
+
+            var node2 = node1.Clone(null);
+
+            Assert.Same(node1.DrawOperations, node2.DrawOperations);
+        }
+
+        [Fact]
+        public void Adding_DrawOperation_To_Cloned_Node_Should_Create_New_Collection()
+        {
+            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
+            var operation1 = RefCountable.Create(Mock.Of<IDrawOperation>());
+            node1.AddDrawOperation(operation1);
+
+            var node2 = node1.Clone(null);
+            var operation2 = RefCountable.Create(Mock.Of<IDrawOperation>());
+            node2.ReplaceDrawOperation(0, operation2);
+
+            Assert.NotSame(node1.DrawOperations, node2.DrawOperations);
+            Assert.Equal(1, node1.DrawOperations.Count);
+            Assert.Equal(1, node2.DrawOperations.Count);
+            Assert.Same(operation1.Item, node1.DrawOperations[0].Item);
+            Assert.Same(operation2.Item, node2.DrawOperations[0].Item);
+        }
+
+        [Fact]
+        public void DrawOperations_In_Cloned_Node_Are_Cloned()
+        {
+            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
+            var operation1 = RefCountable.Create(Mock.Of<IDrawOperation>());
+            node1.AddDrawOperation(operation1);
+
+            var node2 = node1.Clone(null);
+            var operation2 = RefCountable.Create(Mock.Of<IDrawOperation>());
+            node2.AddDrawOperation(operation2);
+            
+            Assert.Same(node1.DrawOperations[0].Item, node2.DrawOperations[0].Item);
+            Assert.NotSame(node1.DrawOperations[0], node2.DrawOperations[0]);
+        }
+
+        [Fact]
+        public void SortChildren_Does_Not_Throw_On_Null_Children()
+        {
+            var node = new VisualNode(Mock.Of<IVisual>(), null);
+            var scene = new Scene(Mock.Of<IVisual>());
+
+            node.SortChildren(scene);
+        }
+
+        [Fact]
+        public void TrimChildren_Should_Work_Correctly()
+        {
+            var parent = new VisualNode(Mock.Of<IVisual>(), null);
+            var child1 = new VisualNode(Mock.Of<IVisual>(), parent);
+            var child2 = new VisualNode(Mock.Of<IVisual>(), parent);
+            var child3 = new VisualNode(Mock.Of<IVisual>(), parent);
+
+            parent.AddChild(child1);
+            parent.AddChild(child2);
+            parent.AddChild(child3);
+            parent.TrimChildren(2);
+
+            Assert.Equal(2, parent.Children.Count);
+            Assert.False(child1.Disposed);
+            Assert.False(child2.Disposed);
+            Assert.True(child3.Disposed);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/Utilities/TileBrushCalculatorTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/Utilities/TileBrushCalculatorTests.cs
new file mode 100644
index 0000000000..349fd0a6d0
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/Utilities/TileBrushCalculatorTests.cs
@@ -0,0 +1,138 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Rendering.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering.Utilities
+{
+    public class TileBrushCalculatorTests
+    {
+        [Fact]
+        public void NoTile_Fill_1x()
+        {
+            var result = new TileBrushCalculator(
+                TileMode.None,
+                Stretch.Fill,
+                AlignmentX.Center,
+                AlignmentY.Center,
+                RelativeRect.Fill,
+                RelativeRect.Fill,
+                new Size(100, 100),
+                new Size(100, 100));
+
+            Assert.False(result.NeedsIntermediate);
+            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
+            Assert.Equal(new Rect(0, 0, 100, 100), result.DestinationRect);
+        }
+
+        [Fact]
+        public void NoTile_Fill_2x()
+        {
+            var result = new TileBrushCalculator(
+                TileMode.None,
+                Stretch.Fill,
+                AlignmentX.Center,
+                AlignmentY.Center,
+                RelativeRect.Fill,
+                RelativeRect.Fill,
+                new Size(100, 100),
+                new Size(200, 200));
+
+            // TODO: This doesn't need an intermediate render target.
+            Assert.True(result.NeedsIntermediate);
+            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
+            Assert.Equal(new Rect(0, 0, 200, 200), result.DestinationRect);
+        }
+
+        [Fact]
+        public void NoTile_Uniform_CenterHoriz()
+        {
+            var result = new TileBrushCalculator(
+                TileMode.None,
+                Stretch.Uniform,
+                AlignmentX.Center,
+                AlignmentY.Center,
+                RelativeRect.Fill,
+                RelativeRect.Fill,
+                new Size(100, 100),
+                new Size(200, 100));
+
+            Assert.True(result.NeedsIntermediate);
+            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
+            Assert.Equal(new Rect(0, 0, 200, 100), result.DestinationRect);
+            Assert.Equal(new Size(200, 100), result.IntermediateSize);
+            Assert.Equal(Matrix.CreateTranslation(50, 0), result.IntermediateTransform);
+        }
+
+        [Fact]
+        public void NoTile_Uniform_CenterVert()
+        {
+            var result = new TileBrushCalculator(
+                TileMode.None,
+                Stretch.Uniform,
+                AlignmentX.Center,
+                AlignmentY.Center,
+                RelativeRect.Fill,
+                RelativeRect.Fill,
+                new Size(100, 100),
+                new Size(100, 200));
+
+            Assert.True(result.NeedsIntermediate);
+            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
+            Assert.Equal(new Rect(0, 0, 100, 200), result.DestinationRect);
+            Assert.Equal(new Size(100, 200), result.IntermediateSize);
+            Assert.Equal(Matrix.CreateTranslation(0, 50), result.IntermediateTransform);
+        }
+
+        [Fact]
+        public void NoTile_NoStretch_BottomRightQuarterDest()
+        {
+            var result = new TileBrushCalculator(
+                TileMode.None,
+                Stretch.None,
+                AlignmentX.Center,
+                AlignmentY.Center,
+                RelativeRect.Fill,
+                new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
+                new Size(800, 800),
+                new Size(400, 400));
+
+            Assert.True(result.NeedsIntermediate);
+            Assert.Equal(new Rect(0, 0, 800, 800), result.SourceRect);
+            Assert.Equal(new Rect(200, 200, 200, 200), result.DestinationRect);
+            Assert.Equal(new Size(400, 400), result.IntermediateSize);
+            Assert.Equal(new Rect(200, 200, 200, 200), result.IntermediateClip);
+            Assert.Equal(Matrix.CreateTranslation(-100, -100), result.IntermediateTransform);
+        }
+
+        [Fact]
+        public void Tile_NoStretch_BottomRightQuarterSource_CenterQuarterDest()
+        {
+            var result = new TileBrushCalculator(
+                TileMode.Tile,
+                Stretch.None,
+                AlignmentX.Center,
+                AlignmentY.Center,
+                new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
+                new RelativeRect(0.25, 0.25, 0.5, 0.5, RelativeUnit.Relative),
+                new Size(800, 800),
+                new Size(400, 400));
+
+            var b = new VisualBrush
+            {
+                TileMode = TileMode.Tile,
+                Stretch = Stretch.None,
+                SourceRect = new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
+                DestinationRect = new RelativeRect(0.25, 0.25, 0.5, 0.5, RelativeUnit.Relative),
+                Visual = new Border { Width = 400, Height = 400 },
+            };
+
+            Assert.True(result.NeedsIntermediate);
+            Assert.Equal(new Rect(400, 400, 400, 400), result.SourceRect);
+            Assert.Equal(new Rect(100, 100, 200, 200), result.DestinationRect);
+            Assert.Equal(new Size(200, 200), result.IntermediateSize);
+            Assert.Equal(new Rect(0, 0, 200, 200), result.IntermediateClip);
+            Assert.Equal(Matrix.CreateTranslation(-500, -500), result.IntermediateTransform);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/SizeTests.cs b/tests/Avalonia.Base.UnitTests/SizeTests.cs
new file mode 100644
index 0000000000..9b8125748a
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/SizeTests.cs
@@ -0,0 +1,23 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class SizeTests
+    {
+        [Fact]
+        public void Should_Produce_Correct_Aspect_Ratio()
+        {
+            var result = new Size(3, 2).AspectRatio;
+
+            Assert.Equal(1.5, result);
+        }
+
+        [Fact]
+        public void Dividing_Should_Produce_Scaling_Factor()
+        {
+            var result = new Size(15, 10) / new Size(5, 5);
+
+            Assert.Equal(new Vector(3, 2), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/ResourceDictionaryTests.cs b/tests/Avalonia.Base.UnitTests/Styling/ResourceDictionaryTests.cs
new file mode 100644
index 0000000000..86b1b897d4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/ResourceDictionaryTests.cs
@@ -0,0 +1,251 @@
+using System;
+using Avalonia.Controls;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class ResourceDictionaryTests
+    {
+        [Fact]
+        public void Cannot_Add_Null_Key()
+        {
+            var target = new ResourceDictionary();
+            Assert.Throws<ArgumentNullException>(() => target.Add(null, "null"));
+        }
+
+        [Fact]
+        public void Can_Add_Null_Value()
+        {
+            var target = new ResourceDictionary();
+            target.Add("null", null);
+        }
+
+        [Fact]
+        public void TryGetResource_Should_Find_Resource()
+        {
+            var target = new ResourceDictionary
+            {
+                { "foo", "bar" },
+            };
+
+            Assert.True(target.TryGetResource("foo", out var result));
+            Assert.Equal("bar", result);
+        }
+
+        [Fact]
+        public void TryGetResource_Should_Find_Resource_From_Merged_Dictionary()
+        {
+            var target = new ResourceDictionary
+            {
+                MergedDictionaries =
+                {
+                    new ResourceDictionary
+                    {
+                        { "foo", "bar" },
+                    }
+                }
+            };
+
+            Assert.True(target.TryGetResource("foo", out var result));
+            Assert.Equal("bar", result);
+        }
+
+        [Fact]
+        public void TryGetResource_Should_Find_Resource_From_Itself_Before_Merged_Dictionary()
+        {
+            var target = new ResourceDictionary
+            {
+                { "foo", "bar" },
+            };
+
+            target.MergedDictionaries.Add(new ResourceDictionary
+            {
+                { "foo", "baz" },
+            });
+
+            Assert.True(target.TryGetResource("foo", out var result));
+            Assert.Equal("bar", result);
+        }
+
+        [Fact]
+        public void TryGetResource_Should_Find_Resource_From_Later_Merged_Dictionary()
+        {
+            var target = new ResourceDictionary
+            {
+                MergedDictionaries =
+                {
+                    new ResourceDictionary
+                    {
+                        { "foo", "bar" },
+                    },
+                    new ResourceDictionary
+                    {
+                        { "foo", "baz" },
+                    }
+                }
+            };
+
+            Assert.True(target.TryGetResource("foo", out var result));
+            Assert.Equal("baz", result);
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_AddOwner()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary { { "foo", "bar" } };
+
+            ((IResourceProvider)target).AddOwner(host.Object);
+
+            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_RemoveOwner()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary { { "foo", "bar" } };
+
+            ((IResourceProvider)target).AddOwner(host.Object);
+            host.Invocations.Clear();
+            ((IResourceProvider)target).RemoveOwner(host.Object);
+
+            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_Resource_Add()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object);
+
+            host.Invocations.Clear();
+            target.Add("foo", "bar");
+
+            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Add()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object);
+
+            host.Invocations.Clear();
+            target.MergedDictionaries.Add(new ResourceDictionary
+            {
+                { "foo", "bar" },
+            });
+
+            host.Verify(
+                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
+                Times.Once);
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Not_Be_Called_On_Empty_MergedDictionary_Add()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object);
+
+            host.Invocations.Clear();
+            target.MergedDictionaries.Add(new ResourceDictionary());
+
+            host.Verify(
+                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
+                Times.Never);
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Remove()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object)
+            {
+                MergedDictionaries =
+                {
+                    new ResourceDictionary { { "foo", "bar" } },
+                }
+            };
+
+            host.Invocations.Clear();
+            target.MergedDictionaries.RemoveAt(0);
+
+            host.Verify(
+                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
+                Times.Once);
+        }
+
+        [Fact]
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Resource_Add()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object)
+            {
+                MergedDictionaries =
+                {
+                    new ResourceDictionary(),
+                }
+            };
+
+            host.Invocations.Clear();
+            ((IResourceDictionary)target.MergedDictionaries[0]).Add("foo", "bar");
+
+            host.Verify(
+                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
+                Times.Once);
+        }
+
+        [Fact]
+        public void Sets_Added_MergedDictionary_Owner()
+        {
+            var host = new Mock<IResourceHost>();
+
+            var target = new ResourceDictionary(host.Object);
+            target.MergedDictionaries.Add(new ResourceDictionary());
+
+            Assert.Same(host.Object, target.Owner);
+            Assert.Same(host.Object, ((ResourceDictionary)target.MergedDictionaries[0]).Owner);
+        }
+
+        [Fact]
+        public void AddOwner_Sets_MergedDictionary_Owner()
+        {
+            var host = new Mock<IResourceHost>();
+
+            var target = new ResourceDictionary
+            {
+                MergedDictionaries =
+                {
+                    new ResourceDictionary(),
+                }
+            };
+
+            ((IResourceProvider)target).AddOwner(host.Object);
+
+            Assert.Same(host.Object, target.Owner);
+            Assert.Same(host.Object, ((ResourceDictionary)target.MergedDictionaries[0]).Owner);
+        }
+
+        [Fact]
+        public void RemoveOwner_Clears_MergedDictionary_Owner()
+        {
+            var host = new Mock<IResourceHost>();
+
+            var target = new ResourceDictionary(host.Object)
+            {
+                MergedDictionaries =
+                {
+                    new ResourceDictionary(),
+                }
+            };
+
+            ((IResourceProvider)target).RemoveOwner(host.Object);
+
+            Assert.Null(target.Owner);
+            Assert.Null(((ResourceDictionary)target.MergedDictionaries[0]).Owner);
+        }
+
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Child.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Child.cs
new file mode 100644
index 0000000000..66efe2cc7b
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Child.cs
@@ -0,0 +1,97 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Child
+    {
+        [Fact]
+        public void Child_Matches_Control_When_It_Is_Child_OfType()
+        {
+            var parent = new TestLogical1();
+            var child = new TestLogical2();
+
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical2>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(child).Result);
+        }
+
+        [Fact]
+        public void Child_Doesnt_Match_Control_When_It_Is_Grandchild_OfType()
+        {
+            var grandparent = new TestLogical1();
+            var parent = new TestLogical2();
+            var child = new TestLogical3();
+
+            parent.LogicalParent = grandparent;
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical3>();
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(child).Result);
+        }
+
+        [Fact]
+        public async Task Child_Matches_Control_When_It_Is_Child_OfType_And_Class()
+        {
+            var parent = new TestLogical1();
+            var child = new TestLogical2();
+
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Child().OfType<TestLogical2>();
+            var activator = selector.Match(child).Activator;
+            var result = new List<bool>();
+
+            Assert.False(await activator.Take(1));
+            parent.Classes.Add("foo");
+            Assert.True(await activator.Take(1));
+            parent.Classes.Remove("foo");
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public void Child_Doesnt_Match_Control_When_It_Has_No_Parent()
+        {
+            var control = new TestLogical3();
+            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical3>();
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(control).Result);
+        }
+
+        [Fact]
+        public void Child_Selector_Should_Have_Correct_String_Representation()
+        {
+            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical3>();
+
+            Assert.Equal("TestLogical1 > TestLogical3", selector.ToString());
+        }
+
+        public abstract class TestLogical : Control
+        {
+            public ILogical LogicalParent
+            {
+                get => Parent;
+                set => ((ISetLogicalParent)this).SetParent(value);
+            }
+        }
+
+        public class TestLogical1 : TestLogical
+        {
+        }
+
+        public class TestLogical2 : TestLogical
+        {
+        }
+
+        public class TestLogical3 : TestLogical
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Class.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Class.cs
new file mode 100644
index 0000000000..376e2b23d0
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Class.cs
@@ -0,0 +1,146 @@
+using System.Collections.Generic;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Class
+    {
+        [Fact]
+        public void Class_Selector_Should_Have_Correct_String_Representation()
+        {
+            var target = default(Selector).Class("foo");
+
+            Assert.Equal(".foo", target.ToString());
+        }
+
+        [Fact]
+        public void PesudoClass_Selector_Should_Have_Correct_String_Representation()
+        {
+            var target = default(Selector).Class(":foo");
+
+            Assert.Equal(":foo", target.ToString());
+        }
+
+        [Fact]
+        public async Task Class_Matches_Control_With_Class()
+        {
+            var control = new Control1
+            {
+                Classes = { "foo" },
+            };
+
+            var target = default(Selector).Class("foo");
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            Assert.True(await match.Activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Class_Doesnt_Match_Control_Without_Class()
+        {
+            var control = new Control1
+            {
+                Classes = { "bar" },
+            };
+
+            var target = default(Selector).Class("foo");
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            Assert.False(await match.Activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Class_Matches_Control_With_TemplatedParent()
+        {
+            var control = new Control1
+            {
+                Classes = { "foo" },
+                TemplatedParent = new Mock<ITemplatedControl>().Object,
+            };
+
+            var target = default(Selector).Class("foo");
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            Assert.True(await match.Activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Class_Tracks_Additions()
+        {
+            var control = new Control1();
+
+            var target = default(Selector).Class("foo");
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            control.Classes.Add("foo");
+            Assert.True(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Class_Tracks_Removals()
+        {
+            var control = new Control1
+            {
+                Classes = { "foo" },
+            };
+
+            var target = default(Selector).Class("foo");
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.True(await activator.Take(1));
+            control.Classes.Remove("foo");
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Multiple_Classes()
+        {
+            var control = new Control1();
+            var target = default(Selector).Class("foo").Class("bar");
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            control.Classes.Add("foo");
+            Assert.False(await activator.Take(1));
+            control.Classes.Add("bar");
+            Assert.True(await activator.Take(1));
+            control.Classes.Remove("bar");
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public void Only_Notifies_When_Result_Changes()
+        {
+            // Test for #1698
+            var control = new Control1
+            {
+                Classes = { "foo" },
+            };
+
+            var target = default(Selector).Class("foo");
+            var activator = target.Match(control).Activator;
+            var result = new List<bool>();
+
+            using (activator.Subscribe(x => result.Add(x)))
+            {
+                control.Classes.Add("bar");
+                control.Classes.Remove("foo");
+            }
+
+            Assert.Equal(new[] { true, false }, result);
+        }
+
+        public class Control1 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Descendent.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Descendent.cs
new file mode 100644
index 0000000000..6b52936ec5
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Descendent.cs
@@ -0,0 +1,128 @@
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Descendant
+    {
+        [Fact]
+        public void Descendant_Matches_Control_When_It_Is_Child_OfType()
+        {
+            var parent = new TestLogical1();
+            var child = new TestLogical2();
+
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Descendant().OfType<TestLogical2>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(child).Result);
+        }
+
+        [Fact]
+        public void Descendant_Matches_Control_When_It_Is_Descendant_OfType()
+        {
+            var grandparent = new TestLogical1();
+            var parent = new TestLogical2();
+            var child = new TestLogical3();
+
+            parent.LogicalParent = grandparent;
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Descendant().OfType<TestLogical3>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(child).Result);
+        }
+
+        [Fact]
+        public async Task Descendant_Matches_Control_When_It_Is_Descendant_OfType_And_Class()
+        {
+            var grandparent = new TestLogical1();
+            var parent = new TestLogical2();
+            var child = new TestLogical3();
+
+            grandparent.Classes.Add("foo");
+            parent.LogicalParent = grandparent;
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
+            var activator = selector.Match(child).Activator;
+
+            Assert.True(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Descendant_Doesnt_Match_Control_When_It_Is_Descendant_OfType_But_Wrong_Class()
+        {
+            var grandparent = new TestLogical1();
+            var parent = new TestLogical2();
+            var child = new TestLogical3();
+
+            grandparent.Classes.Add("bar");
+            parent.LogicalParent = grandparent;
+            parent.Classes.Add("foo");
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
+            var activator = selector.Match(child).Activator;
+
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Descendant_Matches_Any_Ancestor()
+        {
+            var grandparent = new TestLogical1();
+            var parent = new TestLogical1();
+            var child = new TestLogical3();
+
+            parent.LogicalParent = grandparent;
+            child.LogicalParent = parent;
+
+            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
+            var activator = selector.Match(child).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            parent.Classes.Add("foo");
+            Assert.True(await activator.Take(1));
+            grandparent.Classes.Add("foo");
+            Assert.True(await activator.Take(1));
+            parent.Classes.Remove("foo");
+            Assert.True(await activator.Take(1));
+            grandparent.Classes.Remove("foo");
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public void Descendant_Selector_Should_Have_Correct_String_Representation()
+        {
+            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
+
+            Assert.Equal("TestLogical1.foo TestLogical3", selector.ToString());
+        }
+
+        public abstract class TestLogical : Control
+        {
+            public ILogical LogicalParent
+            {
+                get => Parent;
+                set => ((ISetLogicalParent)this).SetParent(value);
+            }
+        }
+
+        public class TestLogical1 : TestLogical
+        {
+        }
+
+        public class TestLogical2 : TestLogical
+        {
+        }
+
+        public class TestLogical3 : TestLogical
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Multiple.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Multiple.cs
new file mode 100644
index 0000000000..258a4a44a1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Multiple.cs
@@ -0,0 +1,239 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Styling;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Multiple
+    {
+        [Fact]
+        public void Named_Template_Child_Of_Control_With_Two_Classes()
+        {
+            var template = new FuncControlTemplate((parent, scope) =>
+            {
+                return new Border
+                {
+                    Name = "border",
+                }.RegisterInNameScope(scope);
+            });
+
+            var control = new Button
+            {
+                Template = template,
+            };
+
+            control.ApplyTemplate();
+
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Class("foo")
+                .Class("bar")
+                .Template()
+                .Name("border");
+
+            var border = (Border)((IVisual)control).VisualChildren.Single();
+            var values = new List<bool>();
+            var match = selector.Match(border);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            match.Activator.Subscribe(x => values.Add(x));
+
+            Assert.Equal(new[] { false }, values);
+            control.Classes.AddRange(new[] { "foo", "bar" });
+            Assert.Equal(new[] { false, true }, values);
+            control.Classes.Remove("foo");
+            Assert.Equal(new[] { false, true, false }, values);
+        }
+
+        [Fact]
+        public void Named_OfType_Template_Child_Of_Control_With_Two_Classes_Wrong_Type()
+        {
+            var template = new FuncControlTemplate((parent, scope) =>
+            {
+                return new Border
+                {
+                    Name = "border",
+                }.RegisterInNameScope(scope);
+            });
+
+            var control = new Button
+            {
+                Template = template,
+            };
+
+            control.ApplyTemplate();
+
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Class("foo")
+                .Class("bar")
+                .Template()
+                .OfType<TextBlock>()
+                .Name("baz");
+
+            var border = (Border)((IVisual)control).VisualChildren.Single();
+            var values = new List<bool>();
+            var match = selector.Match(border);
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
+        }
+
+        [Fact]
+        public void Control_With_Class_Descendent_Of_Control_With_Two_Classes()
+        {
+            var textBlock = new TextBlock();
+            var control = new Button { Content = textBlock };
+
+            control.ApplyTemplate();
+
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Class("foo")
+                .Class("bar")
+                .Descendant()
+                .OfType<TextBlock>()
+                .Class("baz");
+
+            var values = new List<bool>();
+            var match = selector.Match(textBlock);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            match.Activator.Subscribe(x => values.Add(x));
+
+            Assert.Equal(new[] { false }, values);
+            control.Classes.AddRange(new[] { "foo", "bar" });
+            Assert.Equal(new[] { false }, values);
+            textBlock.Classes.Add("baz");
+            Assert.Equal(new[] { false, true }, values);
+        }
+
+        [Fact]
+        public void Named_Class_Template_Child_Of_Control()
+        {
+            var template = new FuncControlTemplate((parent, scope) =>
+            {
+                return new Border
+                {
+                    Name = "border",
+                }.RegisterInNameScope(scope);
+            });
+
+            var control = new Button
+            {
+                Template = template,
+            };
+
+            control.ApplyTemplate();
+
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Template()
+                .Name("border")
+                .Class("foo");
+
+            var border = (Border)((IVisual)control).VisualChildren.Single();
+            var values = new List<bool>();
+            var match = selector.Match(border);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            match.Activator.Subscribe(x => values.Add(x));
+
+            Assert.Equal(new[] { false }, values);
+            border.Classes.AddRange(new[] { "foo" });
+            Assert.Equal(new[] { false, true }, values);
+            border.Classes.Remove("foo");
+            Assert.Equal(new[] { false, true, false }, values);
+        }
+
+        [Fact]
+        public async Task Nested_PropertyEquals()
+        {
+            var control = new Canvas();
+            var parent = new Border { Child = control };
+
+            var target = default(Selector)
+                .OfType<Border>()
+                .PropertyEquals(Border.TagProperty, "foo")
+                .Child()
+                .OfType<Canvas>()
+                .PropertyEquals(Canvas.TagProperty, "bar");
+
+            var match = target.Match(control);
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+
+            var activator = match.Activator;
+
+            Assert.False(await activator.Take(1));
+            control.Tag = "bar";
+            Assert.False(await activator.Take(1));
+            parent.Tag = "foo";
+            Assert.True(await activator.Take(1));
+        }
+
+        [Fact]
+        public void TargetType_OfType()
+        {
+            var selector = default(Selector).OfType<Button>();
+
+            Assert.Equal(typeof(Button), selector.TargetType);
+        }
+
+        [Fact]
+        public void TargetType_OfType_Class()
+        {
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Class("foo");
+
+            Assert.Equal(typeof(Button), selector.TargetType);
+        }
+
+        [Fact]
+        public void TargetType_Is_Class()
+        {
+            var selector = default(Selector)
+                .Is<Button>()
+                .Class("foo");
+
+            Assert.Equal(typeof(Button), selector.TargetType);
+        }
+
+        [Fact]
+        public void TargetType_Child()
+        {
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Child()
+                .OfType<TextBlock>();
+
+            Assert.Equal(typeof(TextBlock), selector.TargetType);
+        }
+
+        [Fact]
+        public void TargetType_Descendant()
+        {
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Descendant()
+                .OfType<TextBlock>();
+
+            Assert.Equal(typeof(TextBlock), selector.TargetType);
+        }
+
+        [Fact]
+        public void TargetType_Template()
+        {
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Template()
+                .OfType<TextBlock>();
+
+            Assert.Equal(typeof(TextBlock), selector.TargetType);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Name.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Name.cs
new file mode 100644
index 0000000000..46b97cf384
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Name.cs
@@ -0,0 +1,58 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Name
+    {
+        [Fact]
+        public void Name_Matches_Control_With_Correct_Name()
+        {
+            var control = new Control1 { Name = "foo" };
+            var target = default(Selector).Name("foo");
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Name_Doesnt_Match_Control_Of_Wrong_Name()
+        {
+            var control = new Control1 { Name = "foo" };
+            var target = default(Selector).Name("bar");
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Name_Doesnt_Match_Control_With_TemplatedParent()
+        {
+            var control = new Control1 { TemplatedParent = new Mock<ITemplatedControl>().Object };
+            var target = default(Selector).Name("foo");
+            var activator = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Name_Has_Correct_String_Representation()
+        {
+            var target = default(Selector).Name("foo");
+
+            Assert.Equal("#foo", target.ToString());
+        }
+
+        [Fact]
+        public void Type_And_Name_Has_Correct_String_Representation()
+        {
+            var target = default(Selector).OfType<Control1>().Name("foo");
+
+            Assert.Equal("Control1#foo", target.ToString());
+        }
+
+        public class Control1 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
new file mode 100644
index 0000000000..d49fcf03a2
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
@@ -0,0 +1,275 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Avalonia.Styling.Activators;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Nesting
+    {
+        [Fact]
+        public void Nesting_Class_Doesnt_Match_Parent_OfType_Selector()
+        {
+            var control = new Control2();
+            Style nested;
+            var parent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => x.Nesting().Class("foo"))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
+        }
+
+        [Fact]
+        public void Or_Nesting_Class_Doesnt_Match_Parent_OfType_Selector()
+        {
+            var control = new Control2();
+            Style nested;
+            var parent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => Selectors.Or(
+                        x.Nesting().Class("foo"),
+                        x.Nesting().Class("bar")))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
+        }
+
+        [Fact]
+        public void Or_Nesting_Child_OfType_Doesnt_Match_Parent_OfType_Selector()
+        {
+            var control = new Control1();
+            var panel = new DockPanel { Children = { control } };
+            Style nested;
+            var parent = new Style(x => x.OfType<Panel>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => Selectors.Or(
+                        x.Nesting().Child().OfType<Control1>(),
+                        x.Nesting().Child().OfType<Control1>()))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, match.Result);
+        }
+
+        [Fact]
+        public void Double_Nesting_Class_Doesnt_Match_Grandparent_OfType_Selector()
+        {
+            var control = new Control2
+            {
+                Classes = { "foo", "bar" },
+            };
+
+            Style parent;
+            Style nested;
+            var grandparent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (parent = new Style(x => x.Nesting().Class("foo"))
+                    {
+                        Children =
+                        {
+                            (nested = new Style(x => x.Nesting().Class("bar")))
+                        }
+                    })
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
+        }
+
+        [Fact]
+        public void Nesting_Class_Matches()
+        {
+            var control = new Control1 { Classes = { "foo" } };
+            Style nested;
+            var parent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => x.Nesting().Class("foo"))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+
+            var sink = new ActivatorSink(match.Activator);
+
+            Assert.True(sink.Active);
+            control.Classes.Clear();
+            Assert.False(sink.Active);
+        }
+
+        [Fact]
+        public void Double_Nesting_Class_Matches()
+        {
+            var control = new Control1
+            {
+                Classes = { "foo", "bar" },
+            };
+
+            Style parent;
+            Style nested;
+            var grandparent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (parent = new Style(x => x.Nesting().Class("foo"))
+                    {
+                        Children =
+                        {
+                            (nested = new Style(x => x.Nesting().Class("bar")))
+                        }
+                    })
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+
+            var sink = new ActivatorSink(match.Activator);
+
+            Assert.True(sink.Active);
+            control.Classes.Remove("foo");
+            Assert.False(sink.Active);
+        }
+
+        [Fact]
+        public void Or_Nesting_Class_Matches()
+        {
+            var control = new Control1 { Classes = { "foo" } };
+            Style nested;
+            var parent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => Selectors.Or(
+                        x.Nesting().Class("foo"),
+                        x.Nesting().Class("bar")))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+
+            var sink = new ActivatorSink(match.Activator);
+
+            Assert.True(sink.Active);
+            control.Classes.Clear();
+            Assert.False(sink.Active);
+        }
+
+        [Fact]
+        public void Or_Nesting_Child_OfType_Matches()
+        {
+            var control = new Control1 { Classes = { "foo" } };
+            var panel = new Panel { Children = { control } };
+            Style nested;
+            var parent = new Style(x => x.OfType<Panel>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => Selectors.Or(
+                        x.Nesting().Child().OfType<Control1>(),
+                        x.Nesting().Child().OfType<Control1>()))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, match.Result);
+        }
+
+        [Fact]
+        public void Nesting_With_No_Parent_Style_Fails()
+        {
+            var control = new Control1();
+            var style = new Style(x => x.Nesting().OfType<Control1>());
+
+            Assert.Throws<InvalidOperationException>(() => style.Selector.Match(control, null));
+        }
+
+        [Fact]
+        public void Nesting_With_No_Parent_Selector_Fails()
+        {
+            var control = new Control1();
+            Style nested;
+            var parent = new Style
+            {
+                Children =
+                {
+                    (nested = new Style(x => x.Nesting().Class("foo"))),
+                }
+            };
+
+            Assert.Throws<InvalidOperationException>(() => nested.Selector.Match(control, parent));
+        }
+
+        [Fact]
+        public void Adding_Child_With_No_Nesting_Selector_Fails()
+        {
+            var parent = new Style(x => x.OfType<Control1>());
+            var child = new Style(x => x.Class("foo"));
+
+            Assert.Throws<InvalidOperationException>(() => parent.Children.Add(child));
+        }
+
+        [Fact]
+        public void Adding_Combinator_Selector_Child_With_No_Nesting_Selector_Fails()
+        {
+            var parent = new Style(x => x.OfType<Control1>());
+            var child = new Style(x => x.Class("foo").Descendant().Class("bar"));
+
+            Assert.Throws<InvalidOperationException>(() => parent.Children.Add(child));
+        }
+
+        [Fact]
+        public void Adding_Or_Selector_Child_With_No_Nesting_Selector_Fails()
+        {
+            var parent = new Style(x => x.OfType<Control1>());
+            var child = new Style(x => Selectors.Or(
+                x.Nesting().Class("foo"),
+                x.Class("bar")));
+
+            Assert.Throws<InvalidOperationException>(() => parent.Children.Add(child));
+        }
+
+        [Fact]
+        public void Can_Add_Child_Without_Nesting_Selector_To_Style_Without_Selector()
+        {
+            var parent = new Style();
+            var child = new Style(x => x.Class("foo"));
+
+            parent.Children.Add(child);
+        }
+
+        public class Control1 : Control
+        {
+        }
+
+        public class Control2 : Control
+        {
+        }
+
+        private class ActivatorSink : IStyleActivatorSink
+        {
+            public ActivatorSink(IStyleActivator source) => source.Subscribe(this);
+            public bool Active { get; private set; }
+            public void OnNext(bool value, int tag) => Active = value;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Not.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Not.cs
new file mode 100644
index 0000000000..fd1385ac47
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Not.cs
@@ -0,0 +1,111 @@
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Not
+    {
+        [Fact]
+        public void Not_Selector_Should_Have_Correct_String_Representation()
+        {
+            var target = default(Selector).Not(x => x.Class("foo"));
+
+            Assert.Equal(":not(.foo)", target.ToString());
+        }
+
+        [Fact]
+        public void Not_OfType_Matches_Control_Of_Incorrect_Type()
+        {
+            var control = new Control1();
+            var target = default(Selector).Not(x => x.OfType<Control1>());
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
+        }
+        
+        [Fact]
+        public void Not_OfType_Doesnt_Match_Control_Of_Correct_Type()
+        {
+            var control = new Control2();
+            var target = default(Selector).Not(x => x.OfType<Control1>());
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public async Task Not_Class_Doesnt_Match_Control_With_Class()
+        {
+            var control = new Control1
+            {
+                Classes = { "foo" },
+            };
+
+            var target = default(Selector).Not(x => x.Class("foo"));
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            Assert.False(await match.Activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Not_Class_Matches_Control_Without_Class()
+        {
+            var control = new Control1
+            {
+                Classes = { "bar" },
+            };
+
+            var target = default(Selector).Not(x => x.Class("foo"));
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            Assert.True(await match.Activator.Take(1));
+        }
+
+        [Fact]
+        public async Task OfType_Not_Class_Matches_Control_Without_Class()
+        {
+            var control = new Control1
+            {
+                Classes = { "bar" },
+            };
+
+            var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+            Assert.True(await match.Activator.Take(1));
+        }
+
+        [Fact]
+        public void OfType_Not_Class_Doesnt_Match_Control_Of_Wrong_Type()
+        {
+            var control = new Control2
+            {
+                Classes = { "foo" },
+            };
+
+            var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
+            var match = target.Match(control);
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
+        }
+
+        [Fact]
+        public void Returns_Correct_TargetType()
+        {
+            var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
+
+            Assert.Equal(typeof(Control1), target.TargetType);
+        }
+
+        public class Control1 : Control
+        {
+        }
+
+        public class Control2 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_NthChild.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_NthChild.cs
new file mode 100644
index 0000000000..7f645be4a9
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_NthChild.cs
@@ -0,0 +1,292 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_NthChild
+    {
+        [Theory]
+        [InlineData(2, 0, ":nth-child(2n)")]
+        [InlineData(2, 1, ":nth-child(2n+1)")]
+        [InlineData(1, 0, ":nth-child(1n)")]
+        [InlineData(4, -1, ":nth-child(4n-1)")]
+        [InlineData(0, 1, ":nth-child(1)")]
+        [InlineData(0, -1, ":nth-child(-1)")]
+        [InlineData(int.MaxValue, int.MinValue + 1, ":nth-child(2147483647n-2147483647)")]
+        public void Not_Selector_Should_Have_Correct_String_Representation(int step, int offset, string expected)
+        {
+            var target = default(Selector).NthChild(step, offset);
+
+            Assert.Equal(expected, target.ToString());
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(2, 0);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.False(await target.Match(b3).Activator!.Take(1));
+            Assert.True(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(2, 1);
+
+            Assert.True(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Negative_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(4, -1);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(1, 2);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.True(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step_With_Negative_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(1, -1);
+
+            Assert.True(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.True(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Zero_Step_With_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(0, 2);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.False(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Doesnt_Match_Control_In_Panel_With_Zero_Step_With_Negative_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthChild(0, -2);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.False(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Previous_Selector()
+        {
+            Border b1, b2;
+            Button b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new Control[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Button(),
+                b4 = new Button()
+            });
+
+            var previous = default(Selector).OfType<Border>();
+            var target = previous.NthChild(2, 0);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.Null(target.Match(b3).Activator);
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b3).Result);
+            Assert.Null(target.Match(b4).Activator);
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b4).Result);
+        }
+
+        [Fact]
+        public void Nth_Child_Doesnt_Match_Control_Out_Of_Panel_Parent()
+        {
+            Border b1;
+            var contentControl = new ContentControl();
+            contentControl.Content = b1 = new Border();
+
+            var target = default(Selector).NthChild(1, 0);
+
+            Assert.Equal(SelectorMatch.NeverThisInstance, target.Match(b1));
+        }
+
+
+        [Theory] // http://nthmaster.com/
+        [InlineData(+0, 8, false, false, false, false, false, false, false, true , false, false, false)]
+        [InlineData(+1, 6, false, false, false, false, false, true , true , true , true , true , true )]
+        [InlineData(-1, 9, true , true , true , true , true , true , true , true , true , false, false)]
+        public async Task Nth_Child_Master_Com_Test_Sigle_Selector(
+            int step, int offset, params bool[] items)
+        {
+            var panel = new StackPanel();
+            panel.Children.AddRange(items.Select(_ => new Border()));
+
+            var previous = default(Selector).OfType<Border>();
+            var target = previous.NthChild(step, offset);
+
+            var results = new bool[items.Length];
+            for (int index = 0; index < items.Length; index++)
+            {
+                var border = panel.Children[index];
+                results[index] = await target.Match(border).Activator!.Take(1);
+            }
+
+            Assert.Equal(items, results);
+        }
+
+        [Theory] // http://nthmaster.com/
+        [InlineData(+1, 4, -1, 8, false, false, false, true , true , true , true , true , false, false, false)]
+        [InlineData(+3, 1, +2, 0, false, false, false, true , false, false, false, false, false, true , false)]
+        public async Task Nth_Child_Master_Com_Test_Double_Selector(
+            int step1, int offset1, int step2, int offset2, params bool[] items)
+        {
+            var panel = new StackPanel();
+            panel.Children.AddRange(items.Select(_ => new Border()));
+
+            var previous = default(Selector).OfType<Border>();
+            var middle = previous.NthChild(step1, offset1);
+            var target = middle.NthChild(step2, offset2);
+
+            var results = new bool[items.Length];
+            for (int index = 0; index < items.Length; index++)
+            {
+                var border = panel.Children[index];
+                results[index] = await target.Match(border).Activator!.Take(1);
+            }
+
+            Assert.Equal(items, results);
+        }
+
+        [Theory] // http://nthmaster.com/
+        [InlineData(+1, 2, 2, 1, -1, 9, false, false, true , false, true , false, true , false, true , false, false)]
+        public async Task Nth_Child_Master_Com_Test_Triple_Selector(
+            int step1, int offset1, int step2, int offset2, int step3, int offset3, params bool[] items)
+        {
+            var panel = new StackPanel();
+            panel.Children.AddRange(items.Select(_ => new Border()));
+
+            var previous = default(Selector).OfType<Border>();
+            var middle1 = previous.NthChild(step1, offset1);
+            var middle2 = middle1.NthChild(step2, offset2);
+            var target = middle2.NthChild(step3, offset3);
+
+            var results = new bool[items.Length];
+            for (int index = 0; index < items.Length; index++)
+            {
+                var border = panel.Children[index];
+                results[index] = await target.Match(border).Activator!.Take(1);
+            }
+
+            Assert.Equal(items, results);
+        }
+
+        [Fact]
+        public void Returns_Correct_TargetType()
+        {
+            var target = new NthChildSelector(default(Selector).OfType<Control1>(), 1, 0);
+
+            Assert.Equal(typeof(Control1), target.TargetType);
+        }
+
+        public class Control1 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_NthLastChild.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_NthLastChild.cs
new file mode 100644
index 0000000000..821ed3d0ab
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_NthLastChild.cs
@@ -0,0 +1,221 @@
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_NthLastChild
+    {
+        [Theory]
+        [InlineData(2, 0, ":nth-last-child(2n)")]
+        [InlineData(2, 1, ":nth-last-child(2n+1)")]
+        [InlineData(1, 0, ":nth-last-child(1n)")]
+        [InlineData(4, -1, ":nth-last-child(4n-1)")]
+        [InlineData(0, 1, ":nth-last-child(1)")]
+        [InlineData(0, -1, ":nth-last-child(-1)")]
+        [InlineData(int.MaxValue, int.MinValue + 1, ":nth-last-child(2147483647n-2147483647)")]
+        public void Not_Selector_Should_Have_Correct_String_Representation(int step, int offset, string expected)
+        {
+            var target = default(Selector).NthLastChild(step, offset);
+
+            Assert.Equal(expected, target.ToString());
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(2, 0);
+
+            Assert.True(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(2, 1);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.False(await target.Match(b3).Activator!.Take(1));
+            Assert.True(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Negative_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(4, -1);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.False(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(1, 2);
+
+            Assert.True(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step_With_Negative_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(1, -2);
+
+            Assert.True(await target.Match(b1).Activator!.Take(1));
+            Assert.True(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.True(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Zero_Step_With_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(0, 2);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.True(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Doesnt_Match_Control_In_Panel_With_Zero_Step_With_Negative_Offset()
+        {
+            Border b1, b2, b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Border(),
+                b4 = new Border()
+            });
+
+            var target = default(Selector).NthLastChild(0, -2);
+
+            Assert.False(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.False(await target.Match(b3).Activator!.Take(1));
+            Assert.False(await target.Match(b4).Activator!.Take(1));
+        }
+
+        [Fact]
+        public async Task Nth_Child_Match_Control_In_Panel_With_Previous_Selector()
+        {
+            Border b1, b2;
+            Button b3, b4;
+            var panel = new StackPanel();
+            panel.Children.AddRange(new Control[]
+            {
+                b1 = new Border(),
+                b2 = new Border(),
+                b3 = new Button(),
+                b4 = new Button()
+            });
+
+            var previous = default(Selector).OfType<Border>();
+            var target = previous.NthLastChild(2, 0);
+
+            Assert.True(await target.Match(b1).Activator!.Take(1));
+            Assert.False(await target.Match(b2).Activator!.Take(1));
+            Assert.Null(target.Match(b3).Activator);
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b3).Result);
+            Assert.Null(target.Match(b4).Activator);
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b4).Result);
+        }
+
+        [Fact]
+        public void Nth_Child_Doesnt_Match_Control_Out_Of_Panel_Parent()
+        {
+            Border b1;
+            var contentControl = new ContentControl();
+            contentControl.Content = b1 = new Border();
+
+            var target = default(Selector).NthLastChild(1, 0);
+
+            Assert.Equal(SelectorMatch.NeverThisInstance, target.Match(b1));
+        }
+
+        [Fact]
+        public void Returns_Correct_TargetType()
+        {
+            var target = new NthLastChildSelector(default(Selector).OfType<Control1>(), 1, 0);
+
+            Assert.Equal(typeof(Control1), target.TargetType);
+        }
+
+        public class Control1 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_OfType.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_OfType.cs
new file mode 100644
index 0000000000..e86a323c71
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_OfType.cs
@@ -0,0 +1,54 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_OfType
+    {
+        [Fact]
+        public void OfType_Matches_Control_Of_Correct_Type()
+        {
+            var control = new Control1();
+            var target = default(Selector).OfType<Control1>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void OfType_Doesnt_Match_Control_Of_Wrong_Type()
+        {
+            var control = new Control2();
+            var target = default(Selector).OfType<Control1>();
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void OfType_Class_Doesnt_Match_Control_Of_Wrong_Type()
+        {
+            var control = new Control2();
+            var target = default(Selector).OfType<Control1>().Class("foo");
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void OfType_Matches_Control_With_TemplatedParent()
+        {
+            var control = new Control1 { TemplatedParent = new Mock<ITemplatedControl>().Object };
+            var target = default(Selector).OfType<Control1>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
+        }
+
+        public class Control1 : Control
+        {
+        }
+
+        public class Control2 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Or.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Or.cs
new file mode 100644
index 0000000000..fb5d54bd1f
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Or.cs
@@ -0,0 +1,105 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Or
+    {
+        [Fact]
+        public void Or_Selector_Should_Have_Correct_String_Representation()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>().Class("foo"),
+                default(Selector).OfType<Control2>().Class("bar"));
+
+            Assert.Equal("Control1.foo, Control2.bar", target.ToString());
+        }
+
+        [Fact]
+        public void Or_Selector_Matches_Control_Of_Correct_Type()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>(),
+                default(Selector).OfType<Control2>().Class("bar"));
+            var control = new Control1();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Or_Selector_Matches_Control_Of_Correct_Type_With_Class()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>(),
+                default(Selector).OfType<Control2>().Class("bar"));
+            var control = new Control2();
+
+            Assert.Equal(SelectorMatchResult.Sometimes, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Or_Selector_Doesnt_Match_Control_Of_Incorrect_Type()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>(),
+                default(Selector).OfType<Control2>().Class("bar"));
+            var control = new Control3();
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Or_Selector_Doesnt_Match_Control_With_Incorrect_Name()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>().Name("foo"),
+                default(Selector).OfType<Control2>().Name("foo"));
+            var control = new Control1 { Name = "bar" };
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void Returns_Correct_TargetType_When_Types_Same()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>().Class("foo"),
+                default(Selector).OfType<Control1>().Class("bar"));
+
+            Assert.Equal(typeof(Control1), target.TargetType);
+        }
+
+        [Fact]
+        public void Returns_Common_TargetType()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>().Class("foo"),
+                default(Selector).OfType<Control2>().Class("bar"));
+
+            Assert.Equal(typeof(Control), target.TargetType);
+        }
+
+        [Fact]
+        public void Returns_Null_TargetType_When_A_Selector_Has_No_TargetType()
+        {
+            var target = Selectors.Or(
+                default(Selector).OfType<Control1>().Class("foo"),
+                default(Selector).Class("bar"));
+
+            Assert.Equal(null, target.TargetType);
+        }
+
+        public class Control1 : Control
+        {
+        }
+
+        public class Control2 : Control
+        {
+        }
+
+        public class Control3 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_PropertyEquals.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_PropertyEquals.cs
new file mode 100644
index 0000000000..ee1b654ba8
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_PropertyEquals.cs
@@ -0,0 +1,134 @@
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_PropertyEquals
+    {
+        static SelectorTests_PropertyEquals()
+        {
+            //Ensure the attached properties are registered before run tests
+            System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(Grid).TypeHandle);
+            System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(Auth).TypeHandle);
+        }
+
+        class Auth
+        {
+            public readonly static AttachedProperty<string> NameProperty =
+                AvaloniaProperty.RegisterAttached<Auth, AvaloniaObject, string>("Name");
+
+            public static string GetName(AvaloniaObject avaloniaObject) =>
+                avaloniaObject.GetValue(NameProperty);
+
+            public static void SetName(AvaloniaObject avaloniaObject, string value) =>
+                avaloniaObject.SetValue(NameProperty, value);
+        }
+
+        [Fact]
+        public async Task PropertyEquals_Attached_Property_Matching_Value()
+        {
+            var target = new Markup.Parsers.SelectorParser((ns, type) =>
+            {
+                return (ns, type) switch
+                {
+                    ("", nameof(TextBlock)) => typeof(TextBlock),
+                    ("", nameof(Grid)) => typeof(Grid),
+                    _ => null
+                };
+            }).Parse("TextBlock[(Grid.Column)=1]");
+            
+
+            var control = new TextBlock();
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            Grid.SetColumn(control, 1);
+            Assert.True(await activator.Take(1));
+            Grid.SetColumn(control, 0);
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task PropertyEquals_Attached_Property_With_Namespace_Matching_Value()
+        {
+            var target = new Markup.Parsers.SelectorParser((ns, type) =>
+            {
+                return (ns, type) switch
+                {
+                    ("", nameof(TextBlock)) => typeof(TextBlock),
+                    ("l", nameof(Auth)) => typeof(Auth),
+                    _ => null
+                };
+            }).Parse("TextBlock[(l|Auth.Name)=Admin]");
+
+
+            var control = new TextBlock();
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            Auth.SetName(control, "Admin");
+            Assert.True(await activator.Take(1));
+            Auth.SetName(control, null);
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task PropertyEquals_Matches_When_Property_Has_Matching_Value()
+        {
+            var control = new TextBlock();
+            var target = default(Selector).PropertyEquals(TextBlock.TextProperty, "foo");
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            control.Text = "foo";
+            Assert.True(await activator.Take(1));
+            control.Text = null;
+            Assert.False(await activator.Take(1));
+        }
+
+        [Theory]
+        [InlineData("Bar", FooBar.Bar)]
+        [InlineData("352", 352)]
+        [InlineData("0.1", 0.1)]
+        public async Task PropertyEquals_Matches_When_Property_Has_Matching_Value_And_Different_Type(string literal, object value)
+        {
+            var control = new TextBlock();
+            var target = default(Selector).PropertyEquals(TextBlock.TagProperty, literal);
+            var activator = target.Match(control).Activator.ToObservable();
+
+            Assert.False(await activator.Take(1));
+            control.Tag = value;
+            Assert.True(await activator.Take(1));
+            control.Tag = null;
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public void OfType_PropertyEquals_Doesnt_Match_Control_Of_Wrong_Type()
+        {
+            var control = new TextBlock();
+            var target = default(Selector).OfType<Border>().PropertyEquals(TextBlock.TextProperty, "foo");
+
+            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
+        }
+
+        [Fact]
+        public void PropertyEquals_Selector_Should_Have_Correct_String_Representation()
+        {
+            var target = default(Selector)
+                .OfType<TextBlock>()
+                .PropertyEquals(TextBlock.TextProperty, "foo");
+
+            Assert.Equal("TextBlock[Text=foo]", target.ToString());
+        }
+
+        private enum FooBar
+        {
+            Foo,
+            Bar
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Template.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Template.cs
new file mode 100644
index 0000000000..8b4c988037
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Template.cs
@@ -0,0 +1,170 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Diagnostics;
+using Avalonia.Styling;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SelectorTests_Template
+    {
+        [Fact]
+        public void Control_In_Template_Is_Matched_With_Template_Selector()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            BuildVisualTree(target);
+
+            var border = (Border)target.Object.GetVisualChildren().Single();
+            var selector = default(Selector)
+                .OfType(target.Object.GetType())
+                .Template()
+                .OfType<Border>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(border).Result);
+        }
+
+        [Fact]
+        public void Control_Not_In_Template_Is_Not_Matched_With_Template_Selector()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            BuildVisualTree(target);
+
+            var border = (Border)target.Object.GetVisualChildren().Single();
+            border.SetValue(Control.TemplatedParentProperty, null);
+            var selector = default(Selector)
+                .OfType(target.Object.GetType())
+                .Template()
+                .OfType<Border>();
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(border).Result);
+        }
+
+        [Fact]
+        public void Control_In_Template_Of_Wrong_Type_Is_Not_Matched_With_Template_Selector()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            BuildVisualTree(target);
+
+            var border = (Border)target.Object.GetVisualChildren().Single();
+            var selector = default(Selector)
+                .OfType<Button>()
+                .Template()
+                .OfType<Border>();
+
+            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(border).Result);
+        }
+
+        [Fact]
+        public void Nested_Control_In_Template_Is_Matched_With_Template_Selector()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            BuildVisualTree(target);
+
+            var textBlock = (TextBlock)target.Object.VisualChildren.Single().VisualChildren.Single();
+            var selector = default(Selector)
+                .OfType(target.Object.GetType())
+                .Template()
+                .OfType<TextBlock>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(textBlock).Result);
+        }
+
+        [Fact]
+        public void Control_In_Template_Is_Matched_With_TypeOf_TemplatedControl()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            var styleKey = templatedControl.Object.GetType();
+            BuildVisualTree(target);
+
+            var border = (Border)target.Object.VisualChildren.Single();
+
+            var selector = default(Selector).OfType(styleKey).Template().OfType<Border>();
+
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(border).Result);
+        }
+
+        [Fact]
+        public async Task Control_In_Template_Is_Matched_With_Correct_TypeOf_And_Class_Of_TemplatedControl()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            var styleKey = templatedControl.Object.GetType();
+            BuildVisualTree(target);
+
+            styleable.Setup(x => x.StyleKey).Returns(styleKey);
+            styleable.Setup(x => x.Classes).Returns(new Classes("foo"));
+            var border = (Border)target.Object.VisualChildren.Single();
+            var selector = default(Selector).OfType(styleKey).Class("foo").Template().OfType<Border>();
+            var activator = selector.Match(border).Activator;
+
+            Assert.True(await activator.Take(1));
+        }
+
+        [Fact]
+        public async Task Control_In_Template_Is_Not_Matched_With_Correct_TypeOf_And_Wrong_Class_Of_TemplatedControl()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            BuildVisualTree(target);
+
+            styleable.Setup(x => x.Classes).Returns(new Classes("bar"));
+            var border = (Border)target.Object.VisualChildren.Single();
+            var selector = default(Selector).OfType(templatedControl.Object.GetType()).Class("foo").Template().OfType<Border>();
+            var activator = selector.Match(border).Activator;
+
+            Assert.False(await activator.Take(1));
+        }
+
+        [Fact]
+        public void Nested_Selector_Is_Unsubscribed()
+        {
+            var target = new Mock<IVisual>();
+            var templatedControl = target.As<ITemplatedControl>();
+            var styleable = target.As<IStyleable>();
+            BuildVisualTree(target);
+
+            styleable.Setup(x => x.Classes).Returns(new Classes("foo"));
+            var border = (Border)target.Object.VisualChildren.Single();
+            var selector = default(Selector).OfType(templatedControl.Object.GetType()).Class("foo").Template().OfType<Border>();
+            var activator = selector.Match(border).Activator;
+            var inccDebug = (INotifyCollectionChangedDebug)styleable.Object.Classes;
+
+            using (activator.Subscribe(_ => { }))
+            {
+                Assert.Single(inccDebug.GetCollectionChangedSubscribers());
+            }
+
+            Assert.Null(inccDebug.GetCollectionChangedSubscribers());
+        }
+
+        private void BuildVisualTree<T>(Mock<T> templatedControl) where T : class, IVisual
+        {
+            templatedControl.Setup(x => x.VisualChildren).Returns(new Controls.Controls
+            {
+                new Border
+                {
+                    [Control.TemplatedParentProperty] = templatedControl.Object,
+                    Child = new TextBlock
+                    {
+                        [Control.TemplatedParentProperty] = templatedControl.Object,
+                    },
+                },
+            });
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SetterTests.cs b/tests/Avalonia.Base.UnitTests/Styling/SetterTests.cs
new file mode 100644
index 0000000000..ed4c78aa3e
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/SetterTests.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Globalization;
+using System.Reactive.Subjects;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+using Avalonia.Diagnostics;
+using Avalonia.Styling;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class SetterTests
+    {
+        [Fact]
+        public void Cannot_Assign_Control_To_Value()
+        {
+            var target = new Setter();
+
+            Assert.Throws<InvalidOperationException>(() => target.Value = new Border());
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Binding_To_Property()
+        {
+            var control = new TextBlock();
+            var subject = new BehaviorSubject<object>("foo");
+            var descriptor = InstancedBinding.OneWay(subject);
+            var binding = Mock.Of<IBinding>(x => x.Initiate(control, TextBlock.TextProperty, null, false) == descriptor);
+            var style = Mock.Of<IStyle>();
+            var setter = new Setter(TextBlock.TextProperty, binding);
+
+            setter.Instance(control).Start(false);
+
+            Assert.Equal("foo", control.Text);
+        }
+
+        [Fact]
+        public void Setter_Should_Handle_Binding_Producing_UnsetValue()
+        {
+            var control = new TextBlock();
+            var subject = new BehaviorSubject<object>(AvaloniaProperty.UnsetValue);
+            var descriptor = InstancedBinding.OneWay(subject);
+            var binding = Mock.Of<IBinding>(x => x.Initiate(control, TextBlock.TagProperty, null, false) == descriptor);
+            var style = Mock.Of<IStyle>();
+            var setter = new Setter(TextBlock.TagProperty, binding);
+
+            setter.Instance(control).Start(false);
+
+            Assert.Equal("", control.Text);
+        }
+
+        [Fact]
+        public void Setter_Should_Materialize_Template_To_Property()
+        {
+            var control = new Decorator();
+            var template = new FuncTemplate<Canvas>(() => new Canvas());
+            var style = Mock.Of<IStyle>();
+            var setter = new Setter(Decorator.ChildProperty, template);
+
+            setter.Instance(control).Start(false);
+
+            Assert.IsType<Canvas>(control.Child);
+        }
+
+        [Fact]
+        public void Does_Not_Call_Converter_ConvertBack_On_OneWay_Binding()
+        {
+            var control = new Decorator { Name = "foo" };
+            var style = Mock.Of<IStyle>();
+            var binding = new Binding("Name", BindingMode.OneWay)
+            {
+                Converter = new TestConverter(),
+                RelativeSource = new RelativeSource(RelativeSourceMode.Self),
+            };
+            var setter = new Setter(Decorator.TagProperty, binding);
+
+            var instance = setter.Instance(control);
+            instance.Start(true);
+            instance.Activate();
+
+            Assert.Equal("foobar", control.Tag);
+
+            // Issue #1218 caused TestConverter.ConvertBack to throw here.
+            instance.Deactivate();
+            Assert.Null(control.Tag);
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Value_Without_Activator_With_Style_Priority()
+        {
+            var control = new Control();
+            var setter = new Setter(TextBlock.TagProperty, "foo");
+
+            setter.Instance(control).Start(false);
+
+            Assert.Equal("foo", control.Tag);
+            Assert.Equal(BindingPriority.Style, control.GetDiagnostic(TextBlock.TagProperty).Priority);
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Value_With_Activator_As_Binding_With_StyleTrigger_Priority()
+        {
+            var control = new Canvas();
+            var setter = new Setter(TextBlock.TagProperty, "foo");
+
+            var instance = setter.Instance(control);
+            instance.Start(true);
+            instance.Activate();
+
+            Assert.Equal("foo", control.Tag);
+            Assert.Equal(BindingPriority.StyleTrigger, control.GetDiagnostic(TextBlock.TagProperty).Priority);
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Binding_Without_Activator_With_Style_Priority()
+        {
+            var control = new Canvas();
+            var source = new { Foo = "foo" };
+            var setter = new Setter(TextBlock.TagProperty, new Binding
+            {
+                Source = source,
+                Path = nameof(source.Foo),
+            });
+
+            setter.Instance(control).Start(false);
+
+            Assert.Equal("foo", control.Tag);
+            Assert.Equal(BindingPriority.Style, control.GetDiagnostic(TextBlock.TagProperty).Priority);
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Binding_With_Activator_With_StyleTrigger_Priority()
+        {
+            var control = new Canvas();
+            var source = new { Foo = "foo" };
+            var setter = new Setter(TextBlock.TagProperty, new Binding
+            {
+                Source = source,
+                Path = nameof(source.Foo),
+            });
+
+            var instance = setter.Instance(control);
+            instance.Start(true);
+            instance.Activate();
+
+            Assert.Equal("foo", control.Tag);
+            Assert.Equal(BindingPriority.StyleTrigger, control.GetDiagnostic(TextBlock.TagProperty).Priority);
+        }
+
+        private IBinding CreateMockBinding(AvaloniaProperty property)
+        {
+            var subject = new Subject<object>();
+            var descriptor = InstancedBinding.OneWay(subject);
+            var binding = Mock.Of<IBinding>(x => 
+                x.Initiate(It.IsAny<IAvaloniaObject>(), property, null, false) == descriptor);
+            return binding;
+        }
+
+        private class TestConverter : IValueConverter
+        {
+            public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                return value.ToString() + "bar";
+            }
+
+            public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyleActivatorExtensions.cs b/tests/Avalonia.Base.UnitTests/Styling/StyleActivatorExtensions.cs
new file mode 100644
index 0000000000..f5b3bb40a3
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyleActivatorExtensions.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.Reactive;
+using Avalonia.Styling.Activators;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    internal static class StyleActivatorExtensions
+    {
+        public static IDisposable Subscribe(this IStyleActivator activator, Action<bool> action)
+        {
+            return activator.ToObservable().Subscribe(action);
+        }
+
+        public static async Task<bool> Take(this IStyleActivator activator, int value)
+        {
+            return await activator.ToObservable().Take(value);
+        }
+
+        public static IObservable<bool> ToObservable(this IStyleActivator activator)
+        {
+            if (activator == null)
+            {
+                throw new ArgumentNullException(nameof(activator));
+            }
+
+            return new ObservableAdapter(activator);
+        }
+
+        private class ObservableAdapter : LightweightObservableBase<bool>, IStyleActivatorSink
+        {
+            private readonly IStyleActivator _source;
+            
+            public ObservableAdapter(IStyleActivator source) => _source = source;
+            protected override void Initialize() => _source.Subscribe(this);
+            protected override void Deinitialize() => _source.Unsubscribe(this);
+
+            void IStyleActivatorSink.OnNext(bool value, int tag)
+            {
+                PublishNext(value);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs b/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs
new file mode 100644
index 0000000000..7aa86a1328
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs
@@ -0,0 +1,793 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class StyleTests
+    {
+        [Fact]
+        public void Style_With_Only_Type_Selector_Should_Update_Value()
+        {
+            Style style = new Style(x => x.OfType<Class1>())
+            {
+                Setters =
+                {
+                    new Setter(Class1.FooProperty, "Foo"),
+                },
+            };
+
+            var target = new Class1();
+
+            style.TryAttach(target, null);
+
+            Assert.Equal("Foo", target.Foo);
+        }
+
+        [Fact]
+        public void Style_With_Class_Selector_Should_Update_And_Restore_Value()
+        {
+            Style style = new Style(x => x.OfType<Class1>().Class("foo"))
+            {
+                Setters =
+                {
+                    new Setter(Class1.FooProperty, "Foo"),
+                },
+            };
+
+            var target = new Class1();
+
+            style.TryAttach(target, null);
+            Assert.Equal("foodefault", target.Foo);
+            target.Classes.Add("foo");
+            Assert.Equal("Foo", target.Foo);
+            target.Classes.Remove("foo");
+            Assert.Equal("foodefault", target.Foo);
+        }
+
+        [Fact]
+        public void Style_With_No_Selector_Should_Apply_To_Containing_Control()
+        {
+            Style style = new Style
+            {
+                Setters =
+                {
+                    new Setter(Class1.FooProperty, "Foo"),
+                },
+            };
+
+            var target = new Class1();
+
+            style.TryAttach(target, target);
+
+            Assert.Equal("Foo", target.Foo);
+        }
+
+        [Fact]
+        public void Style_With_No_Selector_Should_Not_Apply_To_Other_Control()
+        {
+            Style style = new Style
+            {
+                Setters =
+                {
+                    new Setter(Class1.FooProperty, "Foo"),
+                },
+            };
+
+            var target = new Class1();
+            var other = new Class1();
+
+            style.TryAttach(target, other);
+
+            Assert.Equal("foodefault", target.Foo);
+        }
+
+        [Fact]
+        public void LocalValue_Should_Override_Style()
+        {
+            Style style = new Style(x => x.OfType<Class1>())
+            {
+                Setters =
+                {
+                    new Setter(Class1.FooProperty, "Foo"),
+                },
+            };
+
+            var target = new Class1
+            {
+                Foo = "Original",
+            };
+
+            style.TryAttach(target, null);
+            Assert.Equal("Original", target.Foo);
+        }
+
+        [Fact]
+        public void Later_Styles_Should_Override_Earlier()
+        {
+            Styles styles = new Styles
+            {
+                new Style(x => x.OfType<Class1>().Class("foo"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, "Foo"),
+                    },
+                },
+
+                new Style(x => x.OfType<Class1>().Class("foo"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, "Bar"),
+                    },
+                }
+            };
+
+            var target = new Class1();
+
+            List<string> values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+
+            styles.TryAttach(target, null);
+            target.Classes.Add("foo");
+            target.Classes.Remove("foo");
+
+            Assert.Equal(new[] { "foodefault", "Foo", "Bar", "foodefault" }, values);
+        }
+
+        [Fact]
+        public void Later_Styles_Should_Override_Earlier_2()
+        {
+            Styles styles = new Styles
+            {
+                new Style(x => x.OfType<Class1>().Class("foo"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, "Foo"),
+                    },
+                },
+
+                new Style(x => x.OfType<Class1>().Class("bar"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, "Bar"),
+                    },
+                }
+            };
+
+            var target = new Class1();
+
+            List<string> values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+
+            styles.TryAttach(target, null);
+            target.Classes.Add("bar");
+            target.Classes.Add("foo");
+            target.Classes.Remove("foo");
+
+            Assert.Equal(new[] { "foodefault", "Bar" }, values);
+        }
+
+        [Fact]
+        public void Later_Styles_Should_Override_Earlier_3()
+        {
+            Styles styles = new Styles
+            {
+                new Style(x => x.OfType<Class1>().Class("foo"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, new Binding("Foo")),
+                    },
+                },
+
+                new Style(x => x.OfType<Class1>().Class("bar"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, new Binding("Bar")),
+                    },
+                }
+            };
+
+            var target = new Class1
+            {
+                DataContext = new
+                {
+                    Foo = "Foo",
+                    Bar = "Bar",
+                }
+            };
+
+            List<string> values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+
+            styles.TryAttach(target, null);
+            target.Classes.Add("bar");
+            target.Classes.Add("foo");
+            target.Classes.Remove("foo");
+
+            Assert.Equal(new[] { "foodefault", "Bar" }, values);
+        }
+
+        [Fact]
+        public void Inactive_Values_Should_Not_Be_Made_Active_During_Style_Attach()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+
+            var root = new TestRoot
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, "Foo"),
+                        },
+                    },
+
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, "Bar"),
+                        },
+                    }
+                }
+            };
+
+            var values = new List<string>();
+            var target = new Class1();
+
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+            root.Child = target;
+
+            Assert.Equal(new[] { "foodefault", "Bar" }, values);
+        }
+
+        [Fact]
+        public void Inactive_Bindings_Should_Not_Be_Made_Active_During_Style_Attach()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+
+            var root = new TestRoot
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, new Binding("Foo")),
+                        },
+                    },
+
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, new Binding("Bar")),
+                        },
+                    }
+                }
+            };
+
+            var values = new List<string>();
+            var target = new Class1
+            {
+                DataContext = new
+                {
+                    Foo = "Foo",
+                    Bar = "Bar",
+                }
+            };
+
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+            root.Child = target;
+
+            Assert.Equal(new[] { "foodefault", "Bar" }, values);
+        }
+
+        [Fact]
+        public void Inactive_Values_Should_Not_Be_Made_Active_During_Style_Detach()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+
+            var root = new TestRoot
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, "Foo"),
+                        },
+                    },
+
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, "Bar"),
+                        },
+                    }
+                }
+            };
+
+            var target = new Class1();
+            root.Child = target;
+
+            var values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+            root.Child = null;
+
+            Assert.Equal(new[] { "Bar", "foodefault" }, values);
+        }
+
+        [Fact]
+        public void Inactive_Values_Should_Not_Be_Made_Active_During_Style_Detach_2()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+
+            var root = new TestRoot
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<Class1>().Class("foo"))
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, "Foo"),
+                        },
+                    },
+
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, "Bar"),
+                        },
+                    }
+                }
+            };
+
+            var target = new Class1 { Classes = { "foo" } };
+            root.Child = target;
+
+            var values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+            root.Child = null;
+
+            Assert.Equal(new[] { "Foo", "foodefault" }, values);
+        }
+
+        [Fact]
+        public void Inactive_Bindings_Should_Not_Be_Made_Active_During_Style_Detach()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+
+            var root = new TestRoot
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, new Binding("Foo")),
+                        },
+                    },
+
+                    new Style(x => x.OfType<Class1>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Class1.FooProperty, new Binding("Bar")),
+                        },
+                    }
+                }
+            };
+
+            var target = new Class1
+            {
+                DataContext = new
+                {
+                    Foo = "Foo",
+                    Bar = "Bar",
+                }
+            };
+
+            root.Child = target;
+
+            var values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
+            root.Child = null;
+
+            Assert.Equal(new[] { "Bar", "foodefault" }, values);
+        }
+
+        [Fact]
+        public void Template_In_Non_Matching_Style_Is_Not_Built()
+        {
+            var instantiationCount = 0;
+            var template = new FuncTemplate<Class1>(() =>
+            {
+                ++instantiationCount;
+                return new Class1();
+            });
+
+            Styles styles = new Styles
+            {
+                new Style(x => x.OfType<Class1>().Class("foo"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.ChildProperty, template),
+                    },
+                },
+
+                new Style(x => x.OfType<Class1>())
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.ChildProperty, template),
+                    },
+                }
+            };
+
+            var target = new Class1();
+            styles.TryAttach(target, null);
+
+            Assert.NotNull(target.Child);
+            Assert.Equal(1, instantiationCount);
+        }
+
+        [Fact]
+        public void Template_In_Inactive_Style_Is_Not_Built()
+        {
+            var instantiationCount = 0;
+            var template = new FuncTemplate<Class1>(() =>
+            {
+                ++instantiationCount;
+                return new Class1();
+            });
+
+            Styles styles = new Styles
+            {
+                new Style(x => x.OfType<Class1>())
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.ChildProperty, template),
+                    },
+                },
+
+                new Style(x => x.OfType<Class1>())
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.ChildProperty, template),
+                    },
+                }
+            };
+
+            var target = new Class1();
+            target.BeginBatchUpdate();
+            styles.TryAttach(target, null);
+            target.EndBatchUpdate();
+
+            Assert.NotNull(target.Child);
+            Assert.Equal(1, instantiationCount);
+        }
+
+        [Fact]
+        public void Style_Should_Detach_When_Control_Removed_From_Logical_Tree()
+        {
+            Border border;
+
+            var style = new Style(x => x.OfType<Border>())
+            {
+                Setters =
+                {
+                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                }
+            };
+
+            var root = new TestRoot
+            {
+                Child = border = new Border(),
+            };
+
+            style.TryAttach(border, null);
+
+            Assert.Equal(new Thickness(4), border.BorderThickness);
+            root.Child = null;
+            Assert.Equal(new Thickness(0), border.BorderThickness);
+        }
+
+        [Fact]
+        public void Removing_Style_Should_Detach_From_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                var border = new Border();
+                var root = new TestRoot
+                {
+                    Styles =
+                    { 
+                        new Style(x => x.OfType<Border>())
+                        {
+                            Setters =
+                            {
+                                new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                            }
+                        }
+                    },
+                    Child = border,
+                };
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(4), border.BorderThickness);
+
+                root.Styles.RemoveAt(0);
+                Assert.Equal(new Thickness(0), border.BorderThickness);
+            }
+        }
+
+        [Fact]
+        public void Adding_Style_Should_Attach_To_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                var border = new Border();
+                var root = new TestRoot
+                {
+                    Styles =
+                    {
+                        new Style(x => x.OfType<Border>())
+                        {
+                            Setters =
+                            {
+                                new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                            }
+                        }
+                    },
+                    Child = border,
+                };
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(4), border.BorderThickness);
+
+                root.Styles.Add(new Style(x => x.OfType<Border>())
+                {
+                    Setters =
+                    {
+                        new Setter(Border.BorderThicknessProperty, new Thickness(6)),
+                    }
+                });
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(6), border.BorderThickness);
+            }
+        }
+
+        [Fact]
+        public void Removing_Style_With_Nested_Style_Should_Detach_From_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                var border = new Border();
+                var root = new TestRoot
+                {
+                    Styles =
+                    {
+                        new Styles
+                        {
+                            new Style(x => x.OfType<Border>())
+                            {
+                                Setters =
+                                {
+                                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                                }
+                            }
+                        }
+                    },
+                    Child = border,
+                };
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(4), border.BorderThickness);
+
+                root.Styles.RemoveAt(0);
+                Assert.Equal(new Thickness(0), border.BorderThickness);
+            }
+        }
+        
+        [Fact]
+        public void Adding_Nested_Style_Should_Attach_To_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                var border = new Border();
+                var root = new TestRoot
+                {
+                    Styles =
+                    {
+                        new Styles
+                        {
+                            new Style(x => x.OfType<Border>())
+                            {
+                                Setters =
+                                {
+                                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                                }
+                            }
+                        }
+                    },
+                    Child = border,
+                };
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(4), border.BorderThickness);
+
+                ((Styles)root.Styles[0]).Add(new Style(x => x.OfType<Border>())
+                {
+                    Setters =
+                    {
+                        new Setter(Border.BorderThicknessProperty, new Thickness(6)),
+                    }
+                });
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(6), border.BorderThickness);
+            }
+        }
+
+        [Fact]
+        public void Removing_Nested_Style_Should_Detach_From_Control()
+        {
+            using (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                var border = new Border();
+                var root = new TestRoot
+                {
+                    Styles =
+                    {
+                        new Styles
+                        {
+                            new Style(x => x.OfType<Border>())
+                            {
+                                Setters =
+                                {
+                                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                                }
+                            },
+                            new Style(x => x.OfType<Border>())
+                            {
+                                Setters =
+                                {
+                                    new Setter(Border.BorderThicknessProperty, new Thickness(6)),
+                                }
+                            },
+                        }
+                    },
+                    Child = border,
+                };
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(6), border.BorderThickness);
+
+                ((Styles)root.Styles[0]).RemoveAt(1);
+
+                root.Measure(Size.Infinity);
+                Assert.Equal(new Thickness(4), border.BorderThickness);
+            }
+        }
+
+        [Fact]
+        public void Should_Set_Owner_On_Assigned_Resources()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Style();
+            ((IResourceProvider)target).AddOwner(host.Object);
+
+            var resources = new Mock<IResourceDictionary>();
+            target.Resources = resources.Object;
+
+            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
+        }
+
+        [Fact]
+        public void Should_Set_Owner_On_Assigned_Resources_2()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Style();
+
+            var resources = new Mock<IResourceDictionary>();
+            target.Resources = resources.Object;
+
+            host.Invocations.Clear();
+            ((IResourceProvider)target).AddOwner(host.Object);
+            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
+        }
+
+        [Fact]
+        public void Nested_Style_Can_Be_Added()
+        {
+            var parent = new Style(x => x.OfType<Class1>());
+            var nested = new Style(x => x.Nesting().Class("foo"));
+
+            parent.Children.Add(nested);
+
+            Assert.Same(parent, nested.Parent);
+        }
+
+        [Fact]
+        public void Nested_Or_Style_Can_Be_Added()
+        {
+            var parent = new Style(x => x.OfType<Class1>());
+            var nested = new Style(x => Selectors.Or(
+                x.Nesting().Class("foo"),
+                x.Nesting().Class("bar")));
+
+            parent.Children.Add(nested);
+
+            Assert.Same(parent, nested.Parent);
+        }
+
+        [Fact]
+        public void Nested_Style_Without_Selector_Throws()
+        {
+            var parent = new Style(x => x.OfType<Class1>());
+            var nested = new Style();
+
+            Assert.Throws<InvalidOperationException>(() => parent.Children.Add(nested));
+        }
+
+        [Fact(Skip = "TODO")]
+        public void Nested_Style_Without_Nesting_Operator_Throws()
+        {
+            var parent = new Style(x => x.OfType<Class1>());
+            var nested = new Style(x => x.Class("foo"));
+
+            Assert.Throws<InvalidOperationException>(() => parent.Children.Add(nested));
+        }
+
+        private class Class1 : Control
+        {
+            public static readonly StyledProperty<string> FooProperty =
+                AvaloniaProperty.Register<Class1, string>(nameof(Foo), "foodefault");
+
+            public static readonly StyledProperty<Class1> ChildProperty =
+                AvaloniaProperty.Register<Class1, Class1>(nameof(Child));
+
+            public string Foo
+            {
+                get { return GetValue(FooProperty); }
+                set { SetValue(FooProperty, value); }
+            }
+
+            public Class1 Child
+            {
+                get => GetValue(ChildProperty);
+                set => SetValue(ChildProperty, value);
+            }
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests.cs
new file mode 100644
index 0000000000..bb4d590060
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests.cs
@@ -0,0 +1,636 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reactive.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.LogicalTree;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class StyledElementTests
+    {
+        [Fact]
+        public void Classes_Should_Initially_Be_Empty()
+        {
+            var target = new StyledElement();
+
+            Assert.Empty(target.Classes);
+        }
+
+        [Fact]
+        public void Setting_Parent_Should_Also_Set_InheritanceParent()
+        {
+            var parent = new Decorator();
+            var target = new TestControl();
+
+            parent.Child = target;
+
+            Assert.Equal(parent, target.Parent);
+            Assert.Equal(parent, target.InheritanceParent);
+        }
+
+        [Fact]
+        public void Setting_Parent_Should_Not_Set_InheritanceParent_If_Already_Set()
+        {
+            var parent = new Decorator();
+            var inheritanceParent = new Decorator();
+            var target = new TestControl();
+
+            ((ISetInheritanceParent)target).SetParent(inheritanceParent);
+            parent.Child = target;
+
+            Assert.Equal(parent, target.Parent);
+            Assert.Equal(inheritanceParent, target.InheritanceParent);
+        }
+
+        [Fact]
+        public void InheritanceParent_Should_Be_Cleared_When_Removed_From_Parent()
+        {
+            var parent = new Decorator();
+            var target = new TestControl();
+
+            parent.Child = target;
+            parent.Child = null;
+
+            Assert.Null(target.InheritanceParent);
+        }
+
+        [Fact]
+        public void InheritanceParent_Should_Be_Cleared_When_Removed_From_Parent_When_Has_Different_InheritanceParent()
+        {
+            var parent = new Decorator();
+            var inheritanceParent = new Decorator();
+            var target = new TestControl();
+
+            ((ISetInheritanceParent)target).SetParent(inheritanceParent);
+            parent.Child = target;
+            parent.Child = null;
+
+            Assert.Null(target.InheritanceParent);
+        }
+
+        [Fact]
+        public void Adding_Element_With_Null_Parent_To_Logical_Tree_Should_Throw()
+        {
+            var target = new Border();
+            var visualParent = new Panel();
+            var logicalParent = new Panel();
+            var root = new TestRoot();
+
+            // Set the logical parent...
+            ((ISetLogicalParent)target).SetParent(logicalParent);
+
+            // ...so that when it's added to `visualParent`, the parent won't be set again.
+            visualParent.Children.Add(target);
+
+            // Clear the logical parent. It's now a logical child of `visualParent` but doesn't have
+            // a logical parent itself.
+            ((ISetLogicalParent)target).SetParent(null);
+
+            // In this case, attaching the control to a logical tree should throw.
+            logicalParent.Children.Add(visualParent);
+            Assert.Throws<InvalidOperationException>(() => root.Child = logicalParent);
+        }
+
+        [Fact]
+        public void AttachedToLogicalTree_Should_Be_Called_When_Added_To_Tree()
+        {
+            var root = new TestRoot();
+            var parent = new Border();
+            var child = new Border();
+            var grandchild = new Border();
+            var parentRaised = false;
+            var childRaised = false;
+            var grandchildRaised = false;
+
+            parent.AttachedToLogicalTree += (s, e) => parentRaised = true;
+            child.AttachedToLogicalTree += (s, e) => childRaised = true;
+            grandchild.AttachedToLogicalTree += (s, e) => grandchildRaised = true;
+
+            parent.Child = child;
+            child.Child = grandchild;
+
+            Assert.False(parentRaised);
+            Assert.False(childRaised);
+            Assert.False(grandchildRaised);
+
+            root.Child = parent;
+
+            Assert.True(parentRaised);
+            Assert.True(childRaised);
+            Assert.True(grandchildRaised);
+        }
+        
+        [Fact]
+        public void AttachedToLogicalTree_Should_Be_Called_Before_Parent_Change_Signalled()
+        {
+            var root = new TestRoot();
+            var child = new Border();
+            var raised = new List<string>();
+
+            child.AttachedToLogicalTree += (s, e) =>
+            {
+                Assert.Equal(root, child.Parent);
+                raised.Add("attached");
+            };
+
+            child.GetObservable(StyledElement.ParentProperty).Skip(1).Subscribe(_ => raised.Add("parent"));
+
+            root.Child = child;
+
+            Assert.Equal(new[] { "attached", "parent" }, raised);
+        }
+
+        [Fact]
+        public void AttachedToLogicalTree_Should_Not_Be_Called_With_GlobalStyles_As_Root()
+        {
+            var globalStyles = Mock.Of<IGlobalStyles>();
+            var root = new TestRoot { StylingParent = globalStyles };
+            var child = new Border();
+            var raised = false;
+
+            child.AttachedToLogicalTree += (s, e) =>
+            {
+                Assert.Equal(root, e.Root);
+                raised = true;
+            };
+
+            root.Child = child;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void AttachedToLogicalTree_Should_Have_Source_Set()
+        {
+            var root = new TestRoot();
+            var canvas = new Canvas();
+            var border = new Border { Child = canvas };
+            var raised = 0;
+
+            void Attached(object sender, LogicalTreeAttachmentEventArgs e)
+            {
+                Assert.Same(border, e.Source);
+                ++raised;
+            }
+
+            border.AttachedToLogicalTree += Attached;
+            canvas.AttachedToLogicalTree += Attached;
+
+            root.Child = border;
+
+            Assert.Equal(2, raised);
+        }
+
+        [Fact]
+        public void AttachedToLogicalTree_Should_Have_Parent_Set()
+        {
+            var root = new TestRoot();
+            var canvas = new Canvas();
+            var border = new Border { Child = canvas };
+            var raised = 0;
+
+            void Attached(object sender, LogicalTreeAttachmentEventArgs e)
+            {
+                Assert.Same(root, e.Parent);
+                ++raised;
+            }
+
+            border.AttachedToLogicalTree += Attached;
+            canvas.AttachedToLogicalTree += Attached;
+
+            root.Child = border;
+
+            Assert.Equal(2, raised);
+        }
+
+        [Fact]
+        public void DetachedFromLogicalTree_Should_Be_Called_When_Removed_From_Tree()
+        {
+            var root = new TestRoot();
+            var parent = new Border();
+            var child = new Border();
+            var grandchild = new Border();
+            var parentRaised = false;
+            var childRaised = false;
+            var grandchildRaised = false;
+
+            parent.Child = child;
+            child.Child = grandchild;
+            root.Child = parent;
+
+            parent.DetachedFromLogicalTree += (s, e) => parentRaised = true;
+            child.DetachedFromLogicalTree += (s, e) => childRaised = true;
+            grandchild.DetachedFromLogicalTree += (s, e) => grandchildRaised = true;
+
+            root.Child = null;
+
+            Assert.True(parentRaised);
+            Assert.True(childRaised);
+            Assert.True(grandchildRaised);
+        }
+
+        [Fact]
+        public void DetachedFromLogicalTree_Should_Not_Be_Called_With_GlobalStyles_As_Root()
+        {
+            var globalStyles = Mock.Of<IGlobalStyles>();
+            var root = new TestRoot { StylingParent = globalStyles };
+            var child = new Border();
+            var raised = false;
+
+            child.DetachedFromLogicalTree += (s, e) =>
+            {
+                Assert.Equal(root, e.Root);
+                raised = true;
+            };
+
+            root.Child = child;
+            root.Child = null;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Parent_Should_Be_Null_When_DetachedFromLogicalTree_Called()
+        {
+            var target = new TestControl();
+            var root = new TestRoot(target);
+            var called = 0;
+
+            target.DetachedFromLogicalTree += (s, e) =>
+            {
+                Assert.Null(target.Parent);
+                Assert.Null(target.InheritanceParent);
+                ++called;
+            };
+
+            root.Child = null;
+
+            Assert.Equal(1, called);
+        }
+
+        [Fact]
+        public void Adding_Tree_To_IStyleRoot_Should_Style_Controls()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var root = new TestRoot();
+                var parent = new Border();
+                var child = new Border();
+                var grandchild = new Control();
+                var styler = new Mock<IStyler>();
+
+                AvaloniaLocator.CurrentMutable.Bind<IStyler>().ToConstant(styler.Object);
+
+                parent.Child = child;
+                child.Child = grandchild;
+
+                styler.Verify(x => x.ApplyStyles(It.IsAny<IStyleable>()), Times.Never());
+
+                root.Child = parent;
+
+                styler.Verify(x => x.ApplyStyles(parent), Times.Once());
+                styler.Verify(x => x.ApplyStyles(child), Times.Once());
+                styler.Verify(x => x.ApplyStyles(grandchild), Times.Once());
+            }
+        }
+
+        [Fact]
+        public void Styles_Not_Applied_Until_Initialization_Finished()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var root = new TestRoot();
+                var child = new Border();
+                var styler = new Mock<IStyler>();
+
+                AvaloniaLocator.CurrentMutable.Bind<IStyler>().ToConstant(styler.Object);
+
+                ((ISupportInitialize)child).BeginInit();
+                root.Child = child;
+                styler.Verify(x => x.ApplyStyles(It.IsAny<IStyleable>()), Times.Never());
+
+                ((ISupportInitialize)child).EndInit();
+                styler.Verify(x => x.ApplyStyles(child), Times.Once());
+            }
+        }
+
+        [Fact]
+        public void Name_Cannot_Be_Set_After_Added_To_Logical_Tree()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var root = new TestRoot();
+                var child = new Border();
+
+                root.Child = child;
+
+                Assert.Throws<InvalidOperationException>(() => child.Name = "foo");
+            }
+        }
+
+        [Fact]
+        public void Name_Can_Be_Set_While_Initializing()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var root = new TestRoot();
+                var child = new Border();
+
+                child.BeginInit();
+                root.Child = child;
+                child.Name = "foo";
+                child.EndInit();
+            }
+        }
+
+        [Fact]
+        public void StyleInstance_Is_Disposed_When_Control_Removed_From_Logical_Tree()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var root = new TestRoot();
+                var child = new Border();
+
+                root.Child = child;
+
+                var styleInstance = new Mock<IStyleInstance>();
+                ((IStyleable)child).StyleApplied(styleInstance.Object);
+
+                root.Child = null;
+
+                styleInstance.Verify(x => x.Dispose(), Times.Once);
+            }
+        }
+
+        [Fact]
+        public void EndInit_Should_Raise_Initialized()
+        {
+            var root = new TestRoot();
+            var target = new Border();
+            var called = false;
+
+            target.Initialized += (s, e) => called = true;
+            ((ISupportInitialize)target).BeginInit();
+            root.Child = target;
+            ((ISupportInitialize)target).EndInit();
+
+            Assert.True(called);
+            Assert.True(target.IsInitialized);
+        }
+
+        [Fact]
+        public void Attaching_To_Visual_Tree_Should_Raise_Initialized()
+        {
+            var root = new TestRoot();
+            var target = new Border();
+            var called = false;
+
+            target.Initialized += (s, e) => called = true;
+            root.Child = target;
+
+            Assert.True(called);
+            Assert.True(target.IsInitialized);
+        }
+
+        [Fact]
+        public void DataContextChanged_Should_Be_Called()
+        {
+            var root = new TestStackPanel
+            {
+                Name = "root",
+                Children =
+                {
+                    new TestControl
+                    {
+                        Name = "a1",
+                        Child = new TestControl
+                        {
+                            Name = "b1",
+                        }
+                    },
+                    new TestControl
+                    {
+                        Name = "a2",
+                        DataContext = "foo",
+                    },
+                }
+            };
+
+            var called = new List<string>();
+            void Record(object sender, EventArgs e) => called.Add(((StyledElement)sender).Name);
+
+            root.DataContextChanged += Record;
+
+            foreach (TestControl c in root.GetLogicalDescendants())
+            {
+                c.DataContextChanged += Record;
+            }
+
+            root.DataContext = "foo";
+
+            Assert.Equal(new[] { "root", "a1", "b1", }, called);
+        }
+
+        [Fact]
+        public void DataContext_Notifications_Should_Be_Called_In_Correct_Order()
+        {
+            var root = new TestStackPanel
+            {
+                Name = "root",
+                Children =
+                {
+                    new TestControl
+                    {
+                        Name = "a1",
+                        Child = new TestControl
+                        {
+                            Name = "b1",
+                        }
+                    },
+                    new TestControl
+                    {
+                        Name = "a2",
+                        DataContext = "foo",
+                    },
+                }
+            };
+
+            var called = new List<string>();
+
+            foreach (IDataContextEvents c in root.GetSelfAndLogicalDescendants())
+            {
+                c.DataContextBeginUpdate += (s, e) => called.Add("begin " + ((StyledElement)s).Name);
+                c.DataContextChanged += (s, e) => called.Add("changed " + ((StyledElement)s).Name);
+                c.DataContextEndUpdate += (s, e) => called.Add("end " + ((StyledElement)s).Name);
+            }
+
+            root.DataContext = "foo";
+
+            Assert.Equal(
+                new[] 
+                {
+                    "begin root",
+                    "begin a1",
+                    "begin b1",
+                    "changed root",
+                    "changed a1",
+                    "changed b1",
+                    "end b1",
+                    "end a1",
+                    "end root",
+                },
+                called);
+        }
+
+        [Fact]
+        public void Resources_Owner_Is_Set()
+        {
+            var target = new TestControl();
+
+            Assert.Same(target, ((ResourceDictionary)target.Resources).Owner);
+        }
+
+        [Fact]
+        public void Assigned_Resources_Parent_Is_Set()
+        {
+            var resources = new Mock<IResourceDictionary>();
+            var target = new TestControl { Resources = resources.Object };
+
+            resources.Verify(x => x.AddOwner(target));
+        }
+
+        [Fact]
+        public void Assigning_Resources_Raises_ResourcesChanged()
+        {
+            var resources = new ResourceDictionary { { "foo", "bar" } };
+            var target = new TestControl();
+            var raised = 0;
+
+            target.ResourcesChanged += (s, e) => ++raised;
+            target.Resources = resources;
+
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void Styles_Owner_Is_Set()
+        {
+            var target = new TestControl();
+
+            Assert.Same(target, target.Styles.Owner);
+        }
+
+        [Fact]
+        public void Adding_To_Logical_Tree_Raises_ResourcesChanged()
+        {
+            var target = new TestRoot();
+            var parent = new Decorator { Resources = { { "foo", "bar" } } };
+            var raised = 0;
+
+            target.ResourcesChanged += (s, e) => ++raised;
+
+            parent.Child = target;
+
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void SetParent_Does_Not_Crash_Due_To_Reentrancy()
+        {
+            // Issue #3708
+            var app = UnitTestApplication.Start(TestServices.StyledWindow);
+
+            ContentControl target;
+            var root = new TestRoot
+            {
+                DataContext = false,
+                Child = target = new ContentControl
+                {
+                    Styles =
+                    {
+                        new Style(x => x.OfType<ContentControl>())
+                        {
+                            Setters =
+                            {
+                                new Setter(
+                                    ContentControl.ContentProperty,
+                                    new FuncTemplate<IControl>(() => new TextBlock { Text = "Enabled" })),
+                            },
+                        },
+                        new Style(x => x.OfType<ContentControl>().Class(":disabled"))
+                        {
+                            Setters =
+                            {
+                                new Setter(
+                                    ContentControl.ContentProperty,
+                                    new FuncTemplate<IControl>(() => new TextBlock { Text = "Disabled" })),
+                            },
+                        },
+                    },
+                    [!ContentControl.IsEnabledProperty] = new Binding(),
+                }
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(0, 0, 100, 100));
+
+            var textBlock = Assert.IsType<TextBlock>(target.Content);
+            Assert.Equal("Disabled", textBlock.Text);
+
+            // #3708 was crashing here with AvaloniaInternalException.
+            root.Child = null;
+        }
+
+        private interface IDataContextEvents
+        {
+            event EventHandler DataContextBeginUpdate;
+            event EventHandler DataContextChanged;
+            event EventHandler DataContextEndUpdate;
+        }
+
+        private class TestControl : Decorator, IDataContextEvents
+        {
+            public event EventHandler DataContextBeginUpdate;
+            public event EventHandler DataContextEndUpdate;
+
+            public new IAvaloniaObject InheritanceParent => base.InheritanceParent;
+
+            protected override void OnDataContextBeginUpdate()
+            {
+                DataContextBeginUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextBeginUpdate();
+            }
+
+            protected override void OnDataContextEndUpdate()
+            {
+                DataContextEndUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextEndUpdate();
+            }
+        }
+
+        private class TestStackPanel : StackPanel, IDataContextEvents
+        {
+            public event EventHandler DataContextBeginUpdate;
+            public event EventHandler DataContextEndUpdate;
+
+            protected override void OnDataContextBeginUpdate()
+            {
+                DataContextBeginUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextBeginUpdate();
+            }
+
+            protected override void OnDataContextEndUpdate()
+            {
+                DataContextEndUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextEndUpdate();
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs
new file mode 100644
index 0000000000..69d37d1c54
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs
@@ -0,0 +1,211 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class StyledElementTests_Resources
+    {
+        [Fact]
+        public void FindResource_Should_Find_Control_Resource()
+        {
+            var target = new StyledElement
+            {
+                Resources =
+                {
+                    { "foo", "foo-value" },
+                }
+            };
+
+            Assert.Equal("foo-value", target.FindResource("foo"));
+        }
+
+        [Fact]
+        public void FindResource_Should_Find_Control_Resource_In_Parent()
+        {
+            Control target;
+
+            var root = new Decorator
+            {
+                Resources =
+                {
+                    { "foo", "foo-value" },
+                },
+                Child = target = new Control(),
+            };
+
+            Assert.Equal("foo-value", target.FindResource("foo"));
+        }
+
+        [Fact]
+        public void FindResource_Should_Find_Application_Resource()
+        {
+            Control target;
+
+            var app = new Application
+            {
+                Resources =
+                {
+                    { "foo", "foo-value" },
+                },
+            };
+
+            var root = new TestRoot
+            {
+                Child = target = new Control(),
+                StylingParent = app,
+            };
+
+            Assert.Equal("foo-value", target.FindResource("foo"));
+        }
+
+        [Fact]
+        public void FindResource_Should_Find_Style_Resource()
+        {
+            var target = new StyledElement
+            {
+                Styles =
+                {
+                    new Style
+                    {
+                        Resources =
+                        {
+                            { "foo", "foo-value" },
+                        }
+                    }
+                },
+                Resources =
+                {
+                    { "bar", "bar-value" },
+                },
+            };
+
+            Assert.Equal("foo-value", target.FindResource("foo"));
+        }
+
+        [Fact]
+        public void FindResource_Should_Find_Styles_Resource()
+        {
+            var target = new StyledElement
+            {
+                Styles =
+                {
+                    new Styles
+                    {
+                        Resources =
+                        {
+                            { "foo", "foo-value" },
+                        }
+                    }
+                },
+                Resources =
+                {
+                    { "bar", "bar-value" },
+                },
+            };
+
+            Assert.Equal("foo-value", target.FindResource("foo"));
+        }
+
+        [Fact]
+        public void FindResource_Should_Find_Application_Style_Resource()
+        {
+            Control target;
+
+            var app = new Application
+            {
+                Styles =
+                {
+                    new Style
+                    {
+                        Resources =
+                        {
+                            { "foo", "foo-value" },
+                        },
+                    }
+                },
+                Resources =
+                {
+                    { "bar", "bar-value" },
+                },
+            };
+
+            var root = new TestRoot
+            {
+                Child = target = new Control(),
+                StylingParent = app,
+            };
+
+            Assert.Equal("foo-value", target.FindResource("foo"));
+        }
+
+        [Fact]
+        public void Adding_Resource_Should_Call_Raise_ResourceChanged_On_Logical_Children()
+        {
+            Border child;
+
+            var target = new ContentControl
+            {
+                Content = child = new Border(),
+                Template = ContentControlTemplate(),
+            };
+
+            var raisedOnTarget = false;
+            var raisedOnChild = false;
+
+            target.Measure(Size.Infinity);
+            target.ResourcesChanged += (_, __) => raisedOnTarget = true;
+            child.ResourcesChanged += (_, __) => raisedOnChild = true;
+
+            target.Resources.Add("foo", "bar");
+
+            Assert.True(raisedOnTarget);
+            Assert.True(raisedOnChild);
+        }
+
+        [Fact]
+        public void Adding_Resource_To_Styles_Should_Raise_ResourceChanged()
+        {
+            var target = new Decorator();
+            var raised = false;
+
+            target.ResourcesChanged += (_, __) => raised = true;
+            target.Styles.Resources.Add("foo", "bar");
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Adding_Resource_To_Nested_Style_Should_Raise_ResourceChanged()
+        {
+            Style style;
+            var target = new StyledElement
+            {
+                Styles =
+                {
+                    (style = new Style()),
+                }
+            };
+
+            var raised = false;
+
+            target.ResourcesChanged += (_, __) => raised = true;
+            style.Resources.Add("foo", "bar");
+
+            Assert.True(raised);
+        }
+
+        private IControlTemplate ContentControlTemplate()
+        {
+            return new FuncControlTemplate<ContentControl>((x, scope) =>
+                new ContentPresenter
+                {
+                    Name = "PART_ContentPresenter",
+                    [!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
+                }.RegisterInNameScope(scope));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StylesTests.cs b/tests/Avalonia.Base.UnitTests/Styling/StylesTests.cs
new file mode 100644
index 0000000000..a6777c9466
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/StylesTests.cs
@@ -0,0 +1,115 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class StylesTests
+    {
+        [Fact]
+        public void Adding_Style_Should_Set_Owner()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Styles(host.Object);
+            var style = new Mock<IStyle>();
+            var rp = style.As<IResourceProvider>();
+
+            host.Invocations.Clear();
+            target.Add(style.Object);
+
+            rp.Verify(x => x.AddOwner(host.Object));
+        }
+
+        [Fact]
+        public void Removing_Style_Should_Clear_Owner()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Styles(host.Object);
+            var style = new Mock<IStyle>();
+            var rp = style.As<IResourceProvider>();
+
+            host.Invocations.Clear();
+            target.Add(style.Object);
+            target.Remove(style.Object);
+
+            rp.Verify(x => x.RemoveOwner(host.Object));
+        }
+
+        [Fact]
+        public void Should_Set_Owner_On_Assigned_Resources()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Styles();
+            ((IResourceProvider)target).AddOwner(host.Object);
+
+            var resources = new Mock<IResourceDictionary>();
+            target.Resources = resources.Object;
+
+            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
+        }
+
+        [Fact]
+        public void Should_Set_Owner_On_Assigned_Resources_2()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Styles();
+
+            var resources = new Mock<IResourceDictionary>();
+            target.Resources = resources.Object;
+
+            host.Invocations.Clear();
+            ((IResourceProvider)target).AddOwner(host.Object);
+            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
+        }
+
+        [Fact]
+        public void Should_Set_Owner_On_Child_Style()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Styles();
+            ((IResourceProvider)target).AddOwner(host.Object);
+
+            var style = new Mock<IStyle>();
+            var resourceProvider = style.As<IResourceProvider>();
+            target.Add(style.Object);
+
+            resourceProvider.Verify(x => x.AddOwner(host.Object), Times.Once);
+        }
+
+        [Fact]
+        public void Should_Set_Owner_On_Child_Style_2()
+        {
+            var host = new Mock<IResourceHost>();
+            var target = new Styles();
+
+            var style = new Mock<IStyle>();
+            var resourceProvider = style.As<IResourceProvider>();
+            target.Add(style.Object);
+
+            host.Invocations.Clear();
+            ((IResourceProvider)target).AddOwner(host.Object);
+            resourceProvider.Verify(x => x.AddOwner(host.Object), Times.Once);
+        }
+        [Fact]
+        public void Finds_Resource_In_Merged_Dictionary()
+        {
+            var target = new Styles
+            {
+                Resources = new ResourceDictionary
+                {
+                    MergedDictionaries =
+                    {
+                        new ResourceDictionary
+                        {
+                            { "foo", "bar" },
+                        }
+                    }
+                }
+            };
+
+            Assert.True(target.TryGetResource("foo", out var result));
+            Assert.Equal("bar", result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/TestObservable.cs b/tests/Avalonia.Base.UnitTests/Styling/TestObservable.cs
new file mode 100644
index 0000000000..05cf7ef3e1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/TestObservable.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Reactive.Disposables;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class TestObservable : IObservable<bool>
+    {
+        public int SubscribedCount { get; private set; }
+
+        public IDisposable Subscribe(IObserver<bool> observer)
+        {
+            ++SubscribedCount;
+            observer.OnNext(true);
+            return Disposable.Create(() => --SubscribedCount);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/TestObserver.cs b/tests/Avalonia.Base.UnitTests/Styling/TestObserver.cs
new file mode 100644
index 0000000000..46f26804f1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/TestObserver.cs
@@ -0,0 +1,59 @@
+using System;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    internal class TestObserver<T> : IObserver<T>
+    {
+        private bool _hasValue;
+
+        private T _value;
+
+        public bool Completed { get; private set; }
+
+        public Exception Error { get; private set; }
+
+        public T GetValue()
+        {
+            if (!_hasValue)
+            {
+                throw new Exception("Observable provided no value.");
+            }
+
+            if (Completed)
+            {
+                throw new Exception("Observable completed unexpectedly.");
+            }
+
+            if (Error != null)
+            {
+                throw new Exception("Observable errored unexpectedly.");
+            }
+
+            _hasValue = false;
+            return _value;
+        }
+
+        public void OnCompleted()
+        {
+            Completed = true;
+        }
+
+        public void OnError(Exception error)
+        {
+            Error = error;
+        }
+
+        public void OnNext(T value)
+        {
+            if (!_hasValue)
+            {
+                _value = value;
+                _hasValue = true;
+            }
+            else
+            {
+                throw new Exception("Observable pushed more than one value.");
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/TestSelectors.cs b/tests/Avalonia.Base.UnitTests/Styling/TestSelectors.cs
new file mode 100644
index 0000000000..bd60275d50
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/TestSelectors.cs
@@ -0,0 +1,17 @@
+using System;
+using Avalonia.Styling;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public static class TestSelectors
+    {
+        public static Selector SubscribeCheck(this Selector selector)
+        {
+            throw new NotImplementedException();
+            //return new Selector(
+            //    selector,
+            //    control => new SelectorMatch(((TestControlBase)control).SubscribeCheckObservable),
+            //    "");
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Styling/TestSubject.cs b/tests/Avalonia.Base.UnitTests/Styling/TestSubject.cs
new file mode 100644
index 0000000000..c162f24d59
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/TestSubject.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Reactive.Disposables;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    internal class TestSubject<T> : IObserver<T>, IObservable<T>
+    {
+        private readonly T _initial;
+
+        private readonly List<IObserver<T>> _subscribers = new List<IObserver<T>>();
+
+        public TestSubject(T initial)
+        {
+            _initial = initial;
+        }
+
+        public int SubscriberCount => _subscribers.Count;
+
+        public void OnCompleted()
+        {
+            foreach (IObserver<T> subscriber in _subscribers.ToArray())
+            {
+                subscriber.OnCompleted();
+            }
+        }
+
+        public void OnError(Exception error)
+        {
+            foreach (IObserver<T> subscriber in _subscribers.ToArray())
+            {
+                subscriber.OnError(error);
+            }
+        }
+
+        public void OnNext(T value)
+        {
+            foreach (IObserver<T> subscriber in _subscribers.ToArray())
+            {
+                subscriber.OnNext(value);
+            }
+        }
+
+        public IDisposable Subscribe(IObserver<T> observer)
+        {
+            _subscribers.Add(observer);
+            observer.OnNext(_initial);
+            return Disposable.Create(() => _subscribers.Remove(observer));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/TestVisual.cs b/tests/Avalonia.Base.UnitTests/TestVisual.cs
new file mode 100644
index 0000000000..fc9b9e22fb
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/TestVisual.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class ParamEventArgs<T> : EventArgs
+    {
+        public ParamEventArgs(T param)
+        {
+            Param = param;
+        }
+
+        public T Param { get; set; }
+    }
+
+    public class TestVisual : Visual
+    {
+        public IVisual Child
+        {
+            get
+            {
+                return ((IVisual)this).VisualChildren.FirstOrDefault();
+            }
+
+            set
+            {
+                if (Child != null)
+                {
+                    VisualChildren.Remove(Child);
+                }
+
+                if (value != null)
+                {
+                    VisualChildren.Add(value);
+                }
+            }
+        }
+
+        public void AddChild(Visual v)
+        {
+            VisualChildren.Add(v);
+        }
+
+        public void AddChildren(IEnumerable<Visual> v)
+        {
+            VisualChildren.AddRange(v);
+        }
+
+        public void RemoveChild(Visual v)
+        {
+            VisualChildren.Remove(v);
+        }
+
+        public void ClearChildren()
+        {
+            VisualChildren.Clear();
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/ThicknessTests.cs b/tests/Avalonia.Base.UnitTests/ThicknessTests.cs
new file mode 100644
index 0000000000..094acada26
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/ThicknessTests.cs
@@ -0,0 +1,39 @@
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class ThicknessTests
+    {
+        [Fact]
+        public void Parse_Parses_Single_Uniform_Size()
+        {
+            var result = Thickness.Parse("1.2");
+
+            Assert.Equal(new Thickness(1.2), result);
+        }
+
+        [Fact]
+        public void Parse_Parses_Horizontal_Vertical()
+        {
+            var result = Thickness.Parse("1.2,3.4");
+
+            Assert.Equal(new Thickness(1.2, 3.4), result);
+        }
+
+        [Fact]
+        public void Parse_Parses_Left_Top_Right_Bottom()
+        {
+            var result = Thickness.Parse("1.2, 3.4, 5, 6");
+
+            Assert.Equal(new Thickness(1.2, 3.4, 5, 6), result);
+        }
+
+        [Fact]
+        public void Parse_Accepts_Spaces()
+        {
+            var result = Thickness.Parse("1.2 3.4 5 6");
+
+            Assert.Equal(new Thickness(1.2, 3.4, 5, 6), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Utilities/ReadOnlySpanTests.cs b/tests/Avalonia.Base.UnitTests/Utilities/ReadOnlySpanTests.cs
new file mode 100644
index 0000000000..da30ee9d02
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Utilities/ReadOnlySpanTests.cs
@@ -0,0 +1,37 @@
+using System.Linq;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Utilities
+{
+    public class ReadOnlySpanTests
+    {
+        [Fact]
+        public void Should_Skip()
+        {
+            var buffer = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+
+            var slice = new ReadOnlySlice<int>(buffer);
+
+            var skipped = slice.Skip(2);
+
+            var expected = buffer.Skip(2);
+
+            Assert.Equal(expected, skipped);
+        }
+
+        [Fact]
+        public void Should_Take()
+        {
+            var buffer = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+
+            var slice = new ReadOnlySlice<int>(buffer);
+
+            var taken = slice.Take(8);
+
+            var expected = buffer.Take(8);
+
+            Assert.Equal(expected, taken);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs b/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
new file mode 100644
index 0000000000..5c3ac6adeb
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
@@ -0,0 +1,29 @@
+using System;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Utilities;
+
+public class UriExtensionsTests
+{
+    [Fact]
+    public void Assembly_Name_From_Query_Parsed()
+    {
+        const string key = "assembly";
+        const string value = "Avalonia.Themes.Default";
+
+        var uri = new Uri($"resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?{key}={value}");
+        var name = uri.GetAssemblyNameFromQuery();
+
+        Assert.Equal(value, name);
+    }
+
+    [Fact]
+    public void Assembly_Name_From_Empty_Query_Not_Parsed()
+    {
+        var uri = new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml");
+        var name = uri.GetAssemblyNameFromQuery();
+
+        Assert.Equal(string.Empty, name);
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Utilities/WeakHashListTests.cs b/tests/Avalonia.Base.UnitTests/Utilities/WeakHashListTests.cs
new file mode 100644
index 0000000000..9ae82e2be0
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Utilities/WeakHashListTests.cs
@@ -0,0 +1,66 @@
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Utilities;
+
+public class WeakHashListTests
+{
+    [Fact]
+    public void Is_Empty_Works()
+    {
+        var target = new WeakHashList<string>();
+        
+        Assert.True(target.IsEmpty);
+        
+        target.Add("1");
+        
+        Assert.False(target.IsEmpty);
+        
+        target.Remove("1");
+        
+        Assert.True(target.IsEmpty);
+
+        // Fill array storage.
+        var arrMaxSize = WeakHashList<string>.DefaultArraySize;
+
+        for (int i = 0; i < arrMaxSize; i++)
+        {
+            target.Add(i.ToString());
+        }
+        
+        Assert.False(target.IsEmpty);
+        
+        // This goes above array storage and upgrades to a dictionary.
+        target.Add(arrMaxSize.ToString());
+        
+        Assert.False(target.IsEmpty);
+
+        // Remove everything, this should still keep an empty dictionary.
+        for (int i = 0; i < arrMaxSize + 1; i++)
+        {
+            target.Remove(i.ToString());
+        }
+        
+        Assert.True(target.IsEmpty);
+    }
+
+    [Fact]
+    public void Array_Compact_After_Remove_Works()
+    {
+        var target = new WeakHashList<string>();
+        
+        // Use all slots in array storage.
+        var arrMaxSize = WeakHashList<string>.DefaultArraySize;
+
+        for (int i = 0; i < arrMaxSize; i++)
+        {
+            target.Add(i.ToString());
+        }
+        
+        // This should compact the array.
+        target.Remove("3");
+        
+        // And new value should fill empty space.
+        target.Add("42");
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/VectorTests.cs b/tests/Avalonia.Base.UnitTests/VectorTests.cs
new file mode 100644
index 0000000000..154b4a8e6c
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/VectorTests.cs
@@ -0,0 +1,118 @@
+using System;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class VectorTests
+    {
+        [Fact]
+        public void Length_Should_Return_Correct_Length_Of_Vector()
+        {
+            var vector = new Vector(2, 4);
+            var length = Math.Sqrt(2 * 2 + 4 * 4);
+
+            Assert.Equal(length, vector.Length);
+        }
+
+        [Fact]
+        public void Length_Squared_Should_Return_Correct_Length_Of_Vector()
+        {
+            var vectorA = new Vector(2, 4);
+            var squaredLengthA = 2 * 2 + 4 * 4;
+
+            Assert.Equal(squaredLengthA, vectorA.SquaredLength);
+        }
+
+        [Fact]
+        public void Normalize_Should_Return_Normalized_Vector()
+        {
+            // the length of a normalized vector must be 1
+
+            var vectorA = new Vector(13, 84);
+            var vectorB = new Vector(-34, 345);
+            var vectorC = new Vector(-34, -84);
+
+            Assert.Equal(1.0, vectorA.Normalize().Length);
+            Assert.Equal(1.0, vectorB.Normalize().Length);
+            Assert.Equal(1.0, vectorC.Normalize().Length);
+        }
+
+        [Fact]
+        public void Negate_Should_Return_Negated_Vector()
+        {
+            var vector = new Vector(2, 4);
+            var negated = new Vector(-2, -4);
+
+            Assert.Equal(negated, vector.Negate());
+        }
+
+        [Fact]
+        public void Dot_Should_Return_Correct_Value()
+        {
+            var a = new Vector(-6, 8.0);
+            var b = new Vector(5, 12.0);
+
+            Assert.Equal(66.0, Vector.Dot(a, b));
+        }
+
+        [Fact]
+        public void Cross_Should_Return_Correct_Value()
+        {
+            var a = new Vector(-6, 8.0);
+            var b = new Vector(5, 12.0);
+
+            Assert.Equal(-112.0, Vector.Cross(a, b));
+        }
+
+        [Fact]
+        public void Divied_By_Vector_Should_Return_Correct_Value()
+        {
+            var a = new Vector(10, 2);
+            var b = new Vector(5, 2);
+
+            var expected = new Vector(2, 1);
+
+            Assert.Equal(expected, Vector.Divide(a, b));
+        }
+
+        [Fact]
+        public void Divied_Should_Return_Correct_Value()
+        {
+            var vector = new Vector(10, 2);
+            var expected = new Vector(5, 1);
+
+            Assert.Equal(expected, Vector.Divide(vector, 2));
+        }
+
+        [Fact]
+        public void Multiply_By_Vector_Should_Return_Correct_Value()
+        {
+            var a = new Vector(10, 2);
+            var b = new Vector(2, 2);
+
+            var expected = new Vector(20, 4);
+
+            Assert.Equal(expected, Vector.Multiply(a, b));
+        }
+
+        [Fact]
+        public void Multiply_Should_Return_Correct_Value()
+        {
+            var vector = new Vector(10, 2);
+
+            var expected = new Vector(20, 4);
+
+            Assert.Equal(expected, Vector.Multiply(vector, 2));
+        }
+
+        [Fact]
+        public void Scale_Vector_Should_Be_Commutative()
+        {
+            var vector = new Vector(10, 2);
+
+            var expected = vector * 2;
+
+            Assert.Equal(expected, 2 * vector);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/VisualExtensionsTests.cs b/tests/Avalonia.Base.UnitTests/VisualExtensionsTests.cs
new file mode 100644
index 0000000000..4863c0fa61
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/VisualExtensionsTests.cs
@@ -0,0 +1,210 @@
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class VisualExtensionsTests
+    {
+        [Fact]
+        public void FindAncestorOfType_Finds_Direct_Parent()
+        {
+            StackPanel target;
+
+            var root = new TestRoot
+            {
+                Child = target = new StackPanel()
+            };
+
+            Assert.Equal(root, target.FindAncestorOfType<TestRoot>());
+        }
+
+        [Fact]
+        public void FindAncestorOfType_Finds_Ancestor_Of_Nested_Child()
+        {
+            Button target;
+
+            var root = new TestRoot
+            {
+                Child = new StackPanel
+                {
+                    Children =
+                    {
+                        new StackPanel
+                        {
+                            Children =
+                            {
+                                (target = new Button())
+                            }
+                        }
+                    }
+                }
+            };
+
+            Assert.Equal(root, target.FindAncestorOfType<TestRoot>());
+        }
+
+        [Fact]
+        public void FindDescendantOfType_Finds_Direct_Child()
+        {
+            StackPanel target;
+
+            var root = new TestRoot
+            {
+                Child = target = new StackPanel()
+            };
+
+            Assert.Equal(target, root.FindDescendantOfType<StackPanel>());
+        }
+
+        [Fact]
+        public void FindDescendantOfType_Finds_Nested_Child()
+        {
+            Button target;
+
+            var root = new TestRoot
+            {
+                Child = new StackPanel
+                {
+                    Children =
+                    {
+                        new StackPanel
+                        {
+                            Children =
+                            {
+                                (target = new Button())
+                            }
+                        }
+                    }
+                }
+            };
+
+            Assert.Equal(target, root.FindDescendantOfType<Button>());
+        }
+
+        [Fact]
+        public void FindCommonVisualAncestor_First_Is_Parent_Of_Second()
+        {
+            Control left, right;
+
+            var root = new TestRoot
+            {
+                Child = left = new Decorator
+                {
+                    Child = right = new Decorator()
+                }
+            };
+
+            var ancestor = left.FindCommonVisualAncestor(right);
+            Assert.Equal(left, ancestor);
+
+            ancestor = right.FindCommonVisualAncestor(left);
+            Assert.Equal(left, ancestor);
+        }
+
+        [Fact]
+        public void FindCommonVisualAncestor_Two_Subtrees_Uniform_Height()
+        {
+            Control left, right;
+
+            var root = new TestRoot
+            {
+                Child = new StackPanel
+                {
+                    Children =
+                    {
+                        new Decorator
+                        {
+                            Child = new Decorator
+                            {
+                                Child = left = new Decorator()
+                            }
+                        },
+                        new Decorator
+                        {
+                            Child = new Decorator
+                            {
+                                Child = right = new Decorator()
+                            }
+                        }
+                    }
+                }
+            };
+
+            var ancestor = left.FindCommonVisualAncestor(right);
+            Assert.Equal(root.Child, ancestor);
+
+            ancestor = right.FindCommonVisualAncestor(left);
+            Assert.Equal(root.Child, ancestor);
+        }
+
+        [Fact]
+        public void FindCommonVisualAncestor_Two_Subtrees_NonUniform_Height()
+        {
+            Control left, right;
+
+            var root = new TestRoot
+            {
+                Child = new StackPanel
+                {
+                    Children =
+                    {
+                        new Decorator
+                        {
+                            Child = new Decorator
+                            {
+                                Child = left = new Decorator()
+                            }
+                        },
+                        new Decorator
+                        {
+                            Child = new Decorator
+                            {
+                                Child = new Decorator
+                                {
+                                    Child = right = new Decorator()
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            var ancestor = left.FindCommonVisualAncestor(right);
+            Assert.Equal(root.Child, ancestor);
+
+            ancestor = right.FindCommonVisualAncestor(left);
+            Assert.Equal(root.Child, ancestor);
+        }
+
+        [Fact]
+        public void TranslatePoint_Should_Respect_RenderTransforms()
+        {
+            Border target;
+            var root = new TestRoot
+            {
+                Width = 100,
+                Height = 100,
+                Child = new Decorator
+                {
+                    Width = 50,
+                    Height = 50,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    RenderTransform = new TranslateTransform(25, 25),
+                    Child = target = new Border(),
+                }
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+
+            var result = target.TranslatePoint(new Point(0, 0), root);
+
+            Assert.Equal(new Point(50, 50), result);
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/VisualTests.cs b/tests/Avalonia.Base.UnitTests/VisualTests.cs
new file mode 100644
index 0000000000..382001229b
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/VisualTests.cs
@@ -0,0 +1,349 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Media;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class VisualTests
+    {
+        [Fact]
+        public void Added_Child_Should_Have_VisualParent_Set()
+        {
+            var target = new TestVisual();
+            var child = new Visual();
+
+            target.AddChild(child);
+
+            Assert.Equal(target, child.GetVisualParent());
+        }
+
+        [Fact]
+        public void Added_Child_Should_Notify_VisualParent_Changed()
+        {
+            var target = new TestVisual();
+            var child = new TestVisual();
+            var parents = new List<IVisual>();
+
+            child.GetObservable(Visual.VisualParentProperty).Subscribe(x => parents.Add(x));
+            target.AddChild(child);
+            target.RemoveChild(child);
+
+            Assert.Equal(new IVisual[] { null, target, null }, parents);
+        }
+
+        [Fact]
+        public void Removed_Child_Should_Have_VisualParent_Cleared()
+        {
+            var target = new TestVisual();
+            var child = new Visual();
+
+            target.AddChild(child);
+            target.RemoveChild(child);
+
+            Assert.Null(child.GetVisualParent());
+        }
+
+        [Fact]
+        public void Clearing_Children_Should_Clear_VisualParent()
+        {
+            var children = new[] { new Visual(), new Visual() };
+            var target = new TestVisual();
+
+            target.AddChildren(children);
+            target.ClearChildren();
+
+            var result = children.Select(x => x.GetVisualParent()).ToList();
+
+            Assert.Equal(new Visual[] { null, null }, result);
+        }
+
+        [Fact]
+        public void Adding_Children_Should_Fire_OnAttachedToVisualTree()
+        {
+            var child2 = new Decorator();
+            var child1 = new Decorator { Child = child2 };
+            var root = new TestRoot();
+            var called1 = false;
+            var called2 = false;
+
+            child1.AttachedToVisualTree += (s, e) =>
+            {
+                Assert.Equal(e.Parent, root);
+                Assert.Equal(e.Root, root);
+                called1 = true;
+            };
+
+            child2.AttachedToVisualTree += (s, e) =>
+            {
+                Assert.Equal(e.Parent, root);
+                Assert.Equal(e.Root, root);
+                called2 = true;
+            };
+
+            root.Child = child1;
+
+            Assert.True(called1);
+            Assert.True(called2);
+        }
+
+        [Fact]
+        public void Removing_Children_Should_Fire_OnDetachedFromVisualTree()
+        {
+            var child2 = new Decorator();
+            var child1 = new Decorator { Child = child2 };
+            var root = new TestRoot();
+            var called1 = false;
+            var called2 = false;
+
+            root.Child = child1;
+
+            child1.DetachedFromVisualTree += (s, e) =>
+            {
+                Assert.Equal(e.Parent, root);
+                Assert.Equal(e.Root, root);
+                called1 = true;
+            };
+
+            child2.DetachedFromVisualTree += (s, e) =>
+            {
+                Assert.Equal(e.Parent, root);
+                Assert.Equal(e.Root, root);
+                called2 = true;
+            };
+
+            root.Child = null;
+
+            Assert.True(called1);
+            Assert.True(called2);
+        }
+
+        [Fact]
+        public void Root_Should_Retun_Self_As_VisualRoot()
+        {
+            var root = new TestRoot();
+
+            Assert.Same(root, ((IVisual)root).VisualRoot);
+        }
+
+        [Fact]
+        public void Descendants_Should_RetunVisualRoot()
+        {
+            var root = new TestRoot();
+            var child1 = new Decorator();
+            var child2 = new Decorator();
+
+            root.Child = child1;
+            child1.Child = child2;
+
+            Assert.Same(root, ((IVisual)child1).VisualRoot);
+            Assert.Same(root, ((IVisual)child2).VisualRoot);
+        }
+
+        [Fact]
+        public void Attaching_To_Visual_Tree_Should_Invalidate_Visual()
+        {
+            var renderer = new Mock<IRenderer>();
+            var child = new Decorator();
+            var root = new TestRoot
+            {
+                Renderer = renderer.Object,
+            };
+
+            root.Child = child;
+
+            renderer.Verify(x => x.AddDirty(child));
+        }
+
+        [Fact]
+        public void Detaching_From_Visual_Tree_Should_Invalidate_Visual()
+        {
+            var renderer = new Mock<IRenderer>();
+            var child = new Decorator();
+            var root = new TestRoot
+            {
+                Renderer = renderer.Object,
+            };
+
+            root.Child = child;
+            renderer.Invocations.Clear();
+            root.Child = null;
+
+            renderer.Verify(x => x.AddDirty(child));
+        }
+
+        [Fact]
+        public void Adding_Already_Parented_Control_Should_Throw()
+        {
+            var root1 = new TestRoot();
+            var root2 = new TestRoot();
+            var child = new Canvas();
+
+            root1.Child = child;
+
+            Assert.Throws<InvalidOperationException>(() => root2.Child = child);
+            Assert.Empty(root2.GetVisualChildren());
+        }
+
+        [Fact]
+        public void TransformToVisual_Should_Work()
+        {
+            var child = new Decorator { Width = 100, Height = 100 };
+            var root = new TestRoot() { Child = child, Width = 400, Height = 400 };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(new Point(), root.DesiredSize));
+
+            var tr = child.TransformToVisual(root);
+
+            Assert.NotNull(tr);
+
+            var point = root.Bounds.TopLeft * tr;
+
+            //child is centered (400 - 100)/2
+            Assert.Equal(new Point(150, 150), point);
+        }
+
+        [Fact]
+        public void TransformToVisual_With_RenderTransform_Should_Work()
+        {
+            var child = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                RenderTransform = new ScaleTransform() { ScaleX = 2, ScaleY = 2 }
+            };
+            var root = new TestRoot() { Child = child, Width = 400, Height = 400 };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(new Point(), root.DesiredSize));
+
+            var tr = child.TransformToVisual(root);
+
+            Assert.NotNull(tr);
+
+            var point = root.Bounds.TopLeft * tr;
+
+            //child is centered (400 - 100*2 scale)/2
+            Assert.Equal(new Point(100, 100), point);
+        }
+
+        [Fact]
+        public void TransformToVisual_With_NonInvertible_RenderTransform_Should_Work()
+        {
+            var child = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                RenderTransform = new ScaleTransform() { ScaleX = 0, ScaleY = 0 }
+            };
+            var root = new TestRoot() { Child = child, Width = 400, Height = 400 };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(new Point(), root.DesiredSize));
+
+            var tr = root.TransformToVisual(child);
+
+            Assert.Null(tr);
+        }
+
+        [Fact]
+        public void Should_Not_Log_Binding_Error_When_Not_Attached_To_Logical_Tree()
+        {
+            var target = new Decorator { DataContext = "foo" };
+            var called = false;
+
+            LogCallback checkLogMessage = (level, area, src, mt, pv) =>
+            {
+                if (level >= Avalonia.Logging.LogEventLevel.Warning)
+                {
+                    called = true;
+                }
+            };
+
+            using (TestLogSink.Start(checkLogMessage))
+            {
+                target.Bind(Decorator.TagProperty, new Binding("Foo"));
+            }
+
+            Assert.False(called);
+        }
+
+        [Fact]
+        public void Should_Log_Binding_Error_When_Attached_To_Logical_Tree()
+        {
+            var target = new Decorator();
+            var root = new TestRoot { Child = target, DataContext = "foo" };
+            var called = false;
+
+            LogCallback checkLogMessage = (level, area, src, mt, pv) =>
+            {
+                if (level >= Avalonia.Logging.LogEventLevel.Warning)
+                {
+                    called = true;
+                }
+            };
+
+            using (TestLogSink.Start(checkLogMessage))
+            {
+                target.Bind(Decorator.TagProperty, new Binding("Foo"));
+            }
+
+            Assert.True(called);
+        }
+
+        [Fact]
+        public void Changing_ZIndex_Should_InvalidateVisual()
+        {
+            Canvas canvas1;
+            var renderer = new Mock<IRenderer>();
+            var root = new TestRoot
+            {
+                Child = new StackPanel
+                {
+                    Children =
+                    {
+                        (canvas1 = new Canvas()),
+                        new Canvas(),
+                    },
+                },
+            };
+
+            root.Renderer = renderer.Object;
+            canvas1.ZIndex = 10;
+
+            renderer.Verify(x => x.AddDirty(canvas1));
+        }
+
+        [Fact]
+        public void Changing_ZIndex_Should_Recalculate_Parent_Children()
+        {
+            Canvas canvas1;
+            StackPanel stackPanel;
+            var renderer = new Mock<IRenderer>();
+            var root = new TestRoot
+            {
+                Child = stackPanel = new StackPanel
+                {
+                    Children =
+                    {
+                        (canvas1 = new Canvas()),
+                        new Canvas(),
+                    },
+                },
+            };
+
+            root.Renderer = renderer.Object;
+            canvas1.ZIndex = 10;
+
+            renderer.Verify(x => x.RecalculateChildren(stackPanel));
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Base.UnitTests/VisualTree/MockRenderInterface.cs
new file mode 100644
index 0000000000..183177495a
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/VisualTree/MockRenderInterface.cs
@@ -0,0 +1,268 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Avalonia.Media.Imaging;
+
+namespace Avalonia.Base.UnitTests.VisualTree
+{
+    class MockRenderInterface : IPlatformRenderInterface
+    {
+        public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IStreamGeometryImpl CreateStreamGeometry()
+        {
+            return new MockStreamGeometry();
+        }
+
+        public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmap(Stream stream)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
+            BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height,
+            BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IWriteableBitmapImpl LoadWriteableBitmap(string fileName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IWriteableBitmapImpl LoadWriteableBitmap(Stream stream)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmap(string fileName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool SupportsIndividualRoundRects { get; set; }
+        public AlphaFormat DefaultAlphaFormat { get; }
+        public PixelFormat DefaultPixelFormat { get; }
+
+        public IFontManagerImpl CreateFontManager()
+        {
+            return new MockFontManagerImpl();
+        }
+
+        public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat fmt, AlphaFormat alphaFormat)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGeometryImpl CreateEllipseGeometry(Rect rect)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGeometryImpl CreateLineGeometry(Point p1, Point p2)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGeometryImpl CreateRectangleGeometry(Rect rect)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun, out Matrix scale)
+        {
+            throw new NotImplementedException();
+        }
+
+        class MockStreamGeometry : IStreamGeometryImpl
+        {
+            private MockStreamGeometryContext _impl = new MockStreamGeometryContext();
+            public Rect Bounds
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public double ContourLength { get; }
+
+            public IStreamGeometryImpl Clone()
+            {
+                return this;
+            }
+
+            public void Dispose()
+            {
+            }
+
+            public bool FillContains(Point point)
+            {
+                return _impl.FillContains(point);
+            }
+
+            public Rect GetRenderBounds(IPen pen)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IGeometryImpl Intersect(IGeometryImpl geometry)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IStreamGeometryContextImpl Open()
+            {
+                return _impl;
+            }
+
+            public bool StrokeContains(IPen pen, Point point)
+            {
+                throw new NotImplementedException();
+            }
+
+            public ITransformedGeometryImpl WithTransform(Matrix transform)
+            {
+                throw new NotImplementedException();
+            }
+
+            public bool TryGetPointAtDistance(double distance, out Point point)
+            {
+                throw new NotImplementedException();
+            }
+
+            public bool TryGetPointAndTangentAtDistance(double distance, out Point point, out Point tangent)
+            {
+                throw new NotImplementedException();
+            }
+
+            public bool TryGetSegment(double startDistance, double stopDistance, bool startOnBeginFigure, out IGeometryImpl segmentGeometry)
+            {
+                throw new NotImplementedException();
+            }
+
+            class MockStreamGeometryContext : IStreamGeometryContextImpl
+            {
+                private List<Point> points = new List<Point>();
+                public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
+                {
+                    throw new NotImplementedException();
+                }
+
+                public void BeginFigure(Point startPoint, bool isFilled)
+                {
+                    points.Add(startPoint);
+                }
+
+                public void CubicBezierTo(Point point1, Point point2, Point point3)
+                {
+                    throw new NotImplementedException();
+                }
+
+                public void Dispose()
+                {
+                }
+
+                public void EndFigure(bool isClosed)
+                {
+                }
+
+                public void LineTo(Point point)
+                {
+                    points.Add(point);
+                }
+
+                public void QuadraticBezierTo(Point control, Point endPoint)
+                {
+                    throw new NotImplementedException();
+                }
+
+                public void SetFillRule(FillRule fillRule)
+                {
+                }
+
+                public bool FillContains(Point point)
+                {
+                    // Use the algorithm from http://www.blackpawn.com/texts/pointinpoly/default.html
+                    // to determine if the point is in the geometry (since it will always be convex in this situation)
+                    for (int i = 0; i < points.Count; i++)
+                    {
+                        var a = points[i];
+                        var b = points[(i + 1) % points.Count];
+                        var c = points[(i + 2) % points.Count];
+
+                        Vector v0 = c - a;
+                        Vector v1 = b - a;
+                        Vector v2 = point - a;
+
+                        var dot00 = v0 * v0;
+                        var dot01 = v0 * v1;
+                        var dot02 = v0 * v2;
+                        var dot11 = v1 * v1;
+                        var dot12 = v1 * v2;
+
+
+                        var invDenom = 1 / (dot00 * dot11 - dot01 * dot01);
+                        var u = (dot11 * dot02 - dot01 * dot12) * invDenom;
+                        var v = (dot00 * dot12 - dot01 * dot02) * invDenom;
+                        if ((u >= 0) && (v >= 0) && (u + v < 1)) return true;
+                    }
+                    return false;
+                }
+            }
+        }
+    }
+
+}
diff --git a/tests/Avalonia.Base.UnitTests/VisualTree/TransformedBoundsTests.cs b/tests/Avalonia.Base.UnitTests/VisualTree/TransformedBoundsTests.cs
new file mode 100644
index 0000000000..d8158fd673
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/VisualTree/TransformedBoundsTests.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.VisualTree
+{
+    public class TransformedBoundsTests
+    {
+        [Fact]
+        public void Should_Track_Bounds()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var control = default(Rectangle);
+                var tree = new Decorator
+                {
+                    Padding = new Thickness(10),
+                    Child = new Decorator
+                    {
+                        Padding = new Thickness(5),
+                        Child = control = new Rectangle
+                        {
+                            Width = 15,
+                            Height = 15,
+                        },
+                    }
+                };
+
+                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(0, 0, 100, 100));
+                ImmediateRenderer.Render(tree, context, true);
+
+                var track = control.GetObservable(Visual.TransformedBoundsProperty);
+                var results = new List<TransformedBounds?>();
+                track.Subscribe(results.Add);
+
+                Assert.Equal(new Rect(0, 0, 15, 15), results[0].Value.Bounds);
+                Assert.Equal(Matrix.CreateTranslation(42, 42), results[0].Value.Transform);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs b/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
new file mode 100644
index 0000000000..1020a3a4d6
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.VisualTree
+{
+    public class VisualExtensions_GetVisualsAt
+    {
+        [Fact]
+        public void Should_Find_Control()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new StackPanel
+                    {
+                        Background = Brushes.White,
+                        Children =
+                        {
+                            (target = new Border
+                            {
+                                Width = 100,
+                                Height = 200,
+                                Background = Brushes.Red,
+                            }),
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 200,
+                                Background = Brushes.Green,
+                            }
+                        },
+                        Orientation = Orientation.Horizontal,
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = target.GetVisualsAt(new Point(50, 50));
+
+                Assert.Same(target, result.Single());
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Find_Sibling_Control()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new StackPanel
+                    {
+                        Background = Brushes.White,
+                        Children =
+                        {
+                            (target = new Border
+                            {
+                                Width = 100,
+                                Height = 200,
+                                Background = Brushes.Red,
+                            }),
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 200,
+                                Background = Brushes.Green,
+                            }
+                        },
+                        Orientation = Orientation.Horizontal,
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = target.GetVisualsAt(new Point(150, 50));
+
+                Assert.Empty(result);
+            }
+        }
+
+        private IDisposable TestApplication()
+        {
+            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
index 3994d20c68..5d17808e0c 100644
--- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
+++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
@@ -6,20 +6,14 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObject_Binding.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_Binding.cs
new file mode 100644
index 0000000000..885e202544
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_Binding.cs
@@ -0,0 +1,149 @@
+using System.Runtime.CompilerServices;
+using Avalonia.Data;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObject_Binding
+    {
+        private static TestClass _target = null!;
+        private static TestBindingObservable<string?> s_stringSource = new();
+        private static TestBindingObservable<Struct1> s_struct1Source = new();
+        private static TestBindingObservable<Struct2> s_struct2Source = new();
+        private static TestBindingObservable<Struct3> s_struct3Source = new();
+        private static TestBindingObservable<Struct4> s_struct4Source = new();
+        private static TestBindingObservable<Struct5> s_struct5Source = new();
+        private static TestBindingObservable<Struct6> s_struct6Source = new();
+        private static TestBindingObservable<Struct7> s_struct7Source = new();
+        private static TestBindingObservable<Struct8> s_struct8Source = new();
+
+        public AvaloniaObject_Binding()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _target = new TestClass();
+        }
+
+        [Benchmark]
+        public void Setup_Dispose_LocalValue_Bindings()
+        {
+            var target = _target;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                using var s0 = target.Bind(TestClass.StringProperty, s_stringSource);
+                using var s1 = target.Bind(TestClass.Struct1Property, s_struct1Source);
+                using var s2 = target.Bind(TestClass.Struct2Property, s_struct2Source);
+                using var s3 = target.Bind(TestClass.Struct3Property, s_struct3Source);
+                using var s4 = target.Bind(TestClass.Struct4Property, s_struct4Source);
+                using var s5 = target.Bind(TestClass.Struct5Property, s_struct5Source);
+                using var s6 = target.Bind(TestClass.Struct6Property, s_struct6Source);
+                using var s7 = target.Bind(TestClass.Struct7Property, s_struct7Source);
+                using var s8 = target.Bind(TestClass.Struct8Property, s_struct8Source);
+            }
+        }
+
+
+        [Benchmark]
+        public void Fire_LocalValue_Bindings()
+        {
+            var target = _target;
+
+            using var s0 = target.Bind(TestClass.StringProperty, s_stringSource);
+            using var s1 = target.Bind(TestClass.Struct1Property, s_struct1Source);
+            using var s2 = target.Bind(TestClass.Struct2Property, s_struct2Source);
+            using var s3 = target.Bind(TestClass.Struct3Property, s_struct3Source);
+            using var s4 = target.Bind(TestClass.Struct4Property, s_struct4Source);
+            using var s5 = target.Bind(TestClass.Struct5Property, s_struct5Source);
+            using var s6 = target.Bind(TestClass.Struct6Property, s_struct6Source);
+            using var s7 = target.Bind(TestClass.Struct7Property, s_struct7Source);
+            using var s8 = target.Bind(TestClass.Struct8Property, s_struct8Source);
+
+            for (var i = 0; i < 100; ++i)
+            {
+                s_stringSource.OnNext(i.ToString());
+                s_struct1Source.OnNext(new(i + 1));
+                s_struct2Source.OnNext(new(i + 1));
+                s_struct3Source.OnNext(new(i + 1));
+                s_struct4Source.OnNext(new(i + 1));
+                s_struct5Source.OnNext(new(i + 1));
+                s_struct6Source.OnNext(new(i + 1));
+                s_struct7Source.OnNext(new(i + 1));
+                s_struct8Source.OnNext(new(i + 1));
+            }
+        }
+
+        [GlobalSetup(Target = nameof(Fire_LocalValue_Bindings_With_Style_Values))]
+        public void SetupStyleValues()
+        {
+            _target = new TestClass();
+            _target.SetValue(TestClass.StringProperty, "foo", BindingPriority.Style);
+            _target.SetValue(TestClass.Struct1Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct2Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct3Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct4Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct5Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct6Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct7Property, new(), BindingPriority.Style);
+            _target.SetValue(TestClass.Struct8Property, new(), BindingPriority.Style);
+        }
+
+        [Benchmark]
+        public void Fire_LocalValue_Bindings_With_Style_Values()
+        {
+            var target = _target;
+
+            using var s0 = target.Bind(TestClass.StringProperty, s_stringSource);
+            using var s1 = target.Bind(TestClass.Struct1Property, s_struct1Source);
+            using var s2 = target.Bind(TestClass.Struct2Property, s_struct2Source);
+            using var s3 = target.Bind(TestClass.Struct3Property, s_struct3Source);
+            using var s4 = target.Bind(TestClass.Struct4Property, s_struct4Source);
+            using var s5 = target.Bind(TestClass.Struct5Property, s_struct5Source);
+            using var s6 = target.Bind(TestClass.Struct6Property, s_struct6Source);
+            using var s7 = target.Bind(TestClass.Struct7Property, s_struct7Source);
+            using var s8 = target.Bind(TestClass.Struct8Property, s_struct8Source);
+
+            for (var i = 0; i < 100; ++i)
+            {
+                s_stringSource.OnNext(i.ToString());
+                s_struct1Source.OnNext(new(i + 1));
+                s_struct2Source.OnNext(new(i + 1));
+                s_struct3Source.OnNext(new(i + 1));
+                s_struct4Source.OnNext(new(i + 1));
+                s_struct5Source.OnNext(new(i + 1));
+                s_struct6Source.OnNext(new(i + 1));
+                s_struct7Source.OnNext(new(i + 1));
+                s_struct8Source.OnNext(new(i + 1));
+            }
+        }
+
+        private class TestClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<string?> StringProperty =
+                AvaloniaProperty.Register<TestClass, string?>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObject_Construct.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_Construct.cs
new file mode 100644
index 0000000000..1f07d4e867
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_Construct.cs
@@ -0,0 +1,81 @@
+using System.Runtime.CompilerServices;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObject_Construct
+    {
+        public AvaloniaObject_Construct()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [Benchmark(Baseline = true)]
+        public void ConstructClrObject_And_Set_Values()
+        {
+            var target = new BaselineTestClass();
+            target.StringProperty = "foo";
+            target.Struct1Property = new(1);
+            target.Struct2Property = new(1);
+            target.Struct3Property = new(1);
+            target.Struct4Property = new(1);
+            target.Struct5Property = new(1);
+            target.Struct6Property = new(1);
+            target.Struct7Property = new(1);
+            target.Struct8Property = new(1);
+        }
+
+        [Benchmark]
+        public void Construct_And_Set_Values()
+        {
+            var target = new TestClass();
+            target.SetValue(TestClass.StringProperty, "foo");
+            target.SetValue(TestClass.Struct1Property, new(1));
+            target.SetValue(TestClass.Struct2Property, new(1));
+            target.SetValue(TestClass.Struct3Property, new(1));
+            target.SetValue(TestClass.Struct4Property, new(1));
+            target.SetValue(TestClass.Struct5Property, new(1));
+            target.SetValue(TestClass.Struct6Property, new(1));
+            target.SetValue(TestClass.Struct7Property, new(1));
+            target.SetValue(TestClass.Struct8Property, new(1));
+        }
+
+        private class TestClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<string> StringProperty =
+                AvaloniaProperty.Register<TestClass, string>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+
+        private class BaselineTestClass
+        {
+            public string? StringProperty { get; set; }
+            public Struct1 Struct1Property { get; set; }
+            public Struct2 Struct2Property { get; set; }
+            public Struct3 Struct3Property { get; set; }
+            public Struct4 Struct4Property { get; set; }
+            public Struct5 Struct5Property { get; set; }
+            public Struct6 Struct6Property { get; set; }
+            public Struct7 Struct7Property { get; set; }
+            public Struct8 Struct8Property { get; set; }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetObservable.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetObservable.cs
new file mode 100644
index 0000000000..9157dd156c
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetObservable.cs
@@ -0,0 +1,171 @@
+using System;
+using System.Runtime.CompilerServices;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObject_GetObservable
+    {
+        private TestClass _target = null!;
+        public static int result;
+
+        public AvaloniaObject_GetObservable()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _target = new();
+        }
+
+        [Benchmark(Baseline = true)]
+        public void PropertyChangedSubscription()
+        {
+            var target = _target;
+
+            static void ChangeHandler(object? sender, AvaloniaPropertyChangedEventArgs e)
+            {
+                if (e.Property == TestClass.StringProperty)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<string?>)e;
+                    result += ev.NewValue.Value?.Length ?? 0;
+                }
+                else if (e.Property == TestClass.Struct1Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct1>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct2Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct2>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct3Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct3>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct4Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct4>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct5Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct5>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct6Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct6>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct7Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct7>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+                else if (e.Property == TestClass.Struct8Property)
+                {
+                    var ev = (AvaloniaPropertyChangedEventArgs<Struct8>)e;
+                    result += ev.NewValue.Value.Int1;
+                }
+            }
+
+            target.PropertyChanged += ChangeHandler;
+
+            // GetObservable fires with the initial value so to compare like-for-like we also need
+            // to get the initial value here.
+            result += target.GetValue(TestClass.StringProperty)?.Length ?? 0;
+            result += target.GetValue(TestClass.Struct1Property).Int1;
+            result += target.GetValue(TestClass.Struct2Property).Int1;
+            result += target.GetValue(TestClass.Struct3Property).Int1;
+            result += target.GetValue(TestClass.Struct4Property).Int1;
+            result += target.GetValue(TestClass.Struct5Property).Int1;
+            result += target.GetValue(TestClass.Struct6Property).Int1;
+            result += target.GetValue(TestClass.Struct7Property).Int1;
+            result += target.GetValue(TestClass.Struct8Property).Int1;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                target.SetValue(TestClass.StringProperty, "foo" + i);
+                target.SetValue(TestClass.Struct1Property, new(i + 1));
+                target.SetValue(TestClass.Struct2Property, new(i + 1));
+                target.SetValue(TestClass.Struct3Property, new(i + 1));
+                target.SetValue(TestClass.Struct4Property, new(i + 1));
+                target.SetValue(TestClass.Struct5Property, new(i + 1));
+                target.SetValue(TestClass.Struct6Property, new(i + 1));
+                target.SetValue(TestClass.Struct7Property, new(i + 1));
+                target.SetValue(TestClass.Struct8Property, new(i + 1));
+            }
+
+            target.PropertyChanged -= ChangeHandler;
+        }
+
+        [Benchmark]
+        public void GetObservables()
+        {
+            var target = _target;
+
+            var sub1 = target.GetObservable(TestClass.StringProperty).Subscribe(x => result += x?.Length ?? 0);
+            var sub2 = target.GetObservable(TestClass.Struct1Property).Subscribe(x => result += x.Int1);
+            var sub3 = target.GetObservable(TestClass.Struct2Property).Subscribe(x => result += x.Int1);
+            var sub4 = target.GetObservable(TestClass.Struct3Property).Subscribe(x => result += x.Int1);
+            var sub5 = target.GetObservable(TestClass.Struct4Property).Subscribe(x => result += x.Int1);
+            var sub6 = target.GetObservable(TestClass.Struct5Property).Subscribe(x => result += x.Int1);
+            var sub7 = target.GetObservable(TestClass.Struct6Property).Subscribe(x => result += x.Int1);
+            var sub8 = target.GetObservable(TestClass.Struct7Property).Subscribe(x => result += x.Int1);
+            var sub9 = target.GetObservable(TestClass.Struct8Property).Subscribe(x => result += x.Int1);
+
+            for (var i = 0; i < 100; ++i)
+            {
+                target.SetValue(TestClass.StringProperty, "foo" + i);
+                target.SetValue(TestClass.Struct1Property, new(i + 1));
+                target.SetValue(TestClass.Struct2Property, new(i + 1));
+                target.SetValue(TestClass.Struct3Property, new(i + 1));
+                target.SetValue(TestClass.Struct4Property, new(i + 1));
+                target.SetValue(TestClass.Struct5Property, new(i + 1));
+                target.SetValue(TestClass.Struct6Property, new(i + 1));
+                target.SetValue(TestClass.Struct7Property, new(i + 1));
+                target.SetValue(TestClass.Struct8Property, new(i + 1));
+            }
+
+            sub1.Dispose();
+            sub2.Dispose();
+            sub3.Dispose();
+            sub4.Dispose();
+            sub5.Dispose();
+            sub6.Dispose();
+            sub7.Dispose();
+            sub8.Dispose();
+            sub9.Dispose();
+        }
+
+        private class TestClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<string> StringProperty =
+                AvaloniaProperty.Register<TestClass, string>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetValue.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetValue.cs
new file mode 100644
index 0000000000..0bfea0fafe
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetValue.cs
@@ -0,0 +1,181 @@
+using System.Runtime.CompilerServices;
+using Avalonia.Data;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObject_GetValue
+    {
+        private BaselineTestClass _baseline = new(){ StringProperty = "foo" };
+        private TestClass _target = new();
+
+        public AvaloniaObject_GetValue()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [Benchmark(Baseline = true)]
+        public int GetClrPropertyValues()
+        {
+            var target = _baseline;
+            var result = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                result += target.StringProperty?.Length ?? 0;
+                result += target.Struct1Property.Int1;
+                result += target.Struct2Property.Int1;
+                result += target.Struct3Property.Int1;
+                result += target.Struct4Property.Int1;
+                result += target.Struct5Property.Int1;
+                result += target.Struct6Property.Int1;
+                result += target.Struct7Property.Int1;
+                result += target.Struct8Property.Int1;
+            }
+
+            return result;
+        }
+
+        [Benchmark]
+        public int GetDefaultValues()
+        {
+            var target = _target;
+            var result = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                result += target.GetValue(TestClass.StringProperty)?.Length ?? 0;
+                result += target.GetValue(TestClass.Struct1Property).Int1;
+                result += target.GetValue(TestClass.Struct2Property).Int1;
+                result += target.GetValue(TestClass.Struct3Property).Int1;
+                result += target.GetValue(TestClass.Struct4Property).Int1;
+                result += target.GetValue(TestClass.Struct5Property).Int1;
+                result += target.GetValue(TestClass.Struct6Property).Int1;
+                result += target.GetValue(TestClass.Struct7Property).Int1;
+                result += target.GetValue(TestClass.Struct8Property).Int1;
+            }
+
+            return result;
+        }
+
+        [GlobalSetup(Target = nameof(Get_Local_Values))]
+        public void SetupLocalValues()
+        {
+            _target.SetValue(TestClass.StringProperty, "foo");
+            _target.SetValue(TestClass.Struct1Property, new(1));
+            _target.SetValue(TestClass.Struct2Property, new(1));
+            _target.SetValue(TestClass.Struct3Property, new(1));
+            _target.SetValue(TestClass.Struct4Property, new(1));
+            _target.SetValue(TestClass.Struct5Property, new(1));
+            _target.SetValue(TestClass.Struct6Property, new(1));
+            _target.SetValue(TestClass.Struct7Property, new(1));
+            _target.SetValue(TestClass.Struct8Property, new(1));
+        }
+
+        [Benchmark]
+        public int Get_Local_Values()
+        {
+            var target = _target;
+            var result = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                result += target.GetValue(TestClass.StringProperty)?.Length ?? 0;
+                result += target.GetValue(TestClass.Struct1Property).Int1;
+                result += target.GetValue(TestClass.Struct2Property).Int1;
+                result += target.GetValue(TestClass.Struct3Property).Int1;
+                result += target.GetValue(TestClass.Struct4Property).Int1;
+                result += target.GetValue(TestClass.Struct5Property).Int1;
+                result += target.GetValue(TestClass.Struct6Property).Int1;
+                result += target.GetValue(TestClass.Struct7Property).Int1;
+                result += target.GetValue(TestClass.Struct8Property).Int1;
+            }
+
+            return result;
+        }
+
+        [GlobalSetup(Target = nameof(Get_Local_Values_With_Style_Values))]
+        public void SetupLocalValuesAndStyleValues()
+        {
+            var target = _target;
+            target.SetValue(TestClass.StringProperty, "foo");
+            target.SetValue(TestClass.Struct1Property, new(1));
+            target.SetValue(TestClass.Struct2Property, new(1));
+            target.SetValue(TestClass.Struct3Property, new(1));
+            target.SetValue(TestClass.Struct4Property, new(1));
+            target.SetValue(TestClass.Struct5Property, new(1));
+            target.SetValue(TestClass.Struct6Property, new(1));
+            target.SetValue(TestClass.Struct7Property, new(1));
+            target.SetValue(TestClass.Struct8Property, new(1));
+            target.SetValue(TestClass.StringProperty, "bar", BindingPriority.Style);
+            target.SetValue(TestClass.Struct1Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct2Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct3Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct4Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct5Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct6Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct7Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct8Property, new(), BindingPriority.Style);
+        }
+
+        [Benchmark]
+        public int Get_Local_Values_With_Style_Values()
+        {
+            var target = _target;
+            var result = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                result += target.GetValue(TestClass.StringProperty)?.Length ?? 0;
+                result += target.GetValue(TestClass.Struct1Property).Int1;
+                result += target.GetValue(TestClass.Struct2Property).Int1;
+                result += target.GetValue(TestClass.Struct3Property).Int1;
+                result += target.GetValue(TestClass.Struct4Property).Int1;
+                result += target.GetValue(TestClass.Struct5Property).Int1;
+                result += target.GetValue(TestClass.Struct6Property).Int1;
+                result += target.GetValue(TestClass.Struct7Property).Int1;
+                result += target.GetValue(TestClass.Struct8Property).Int1;
+            }
+
+            return result;
+        }
+
+        private class TestClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<string> StringProperty =
+                AvaloniaProperty.Register<TestClass, string>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+
+        private class BaselineTestClass
+        {
+            public string? StringProperty { get; set; }
+            public Struct1 Struct1Property { get; set; }
+            public Struct2 Struct2Property { get; set; }
+            public Struct3 Struct3Property { get; set; }
+            public Struct4 Struct4Property { get; set; }
+            public Struct5 Struct5Property { get; set; }
+            public Struct6 Struct6Property { get; set; }
+            public Struct7 Struct7Property { get; set; }
+            public Struct8 Struct8Property { get; set; }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetValueInherited.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetValueInherited.cs
new file mode 100644
index 0000000000..45e129ecd8
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_GetValueInherited.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObject_GetValueInherited
+    {
+        private TestClass _root = null!;
+        private TestClass _target = null!;
+
+        public AvaloniaObject_GetValueInherited()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [Params(1, 2, 10, 50, 100, 200)]
+        public int Depth { get; set; }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _root = new();
+            _root.SetValue(TestClass.StringProperty, "foo");
+            _root.SetValue(TestClass.Struct1Property, new(1));
+            _root.SetValue(TestClass.Struct2Property, new(1));
+            _root.SetValue(TestClass.Struct3Property, new(1));
+            _root.SetValue(TestClass.Struct4Property, new(1));
+            _root.SetValue(TestClass.Struct5Property, new(1));
+            _root.SetValue(TestClass.Struct6Property, new(1));
+            _root.SetValue(TestClass.Struct7Property, new(1));
+            _root.SetValue(TestClass.Struct8Property, new(1));
+
+            var parent = _root;
+
+            for (var i = 0; i < Depth; ++i)
+            {
+                var c = new TestClass();
+                ((ISetLogicalParent)c).SetParent(parent);
+                parent = c;
+            }
+
+            _target = parent;
+        }
+
+        [Benchmark]
+        public int GetInheritedValues()
+        {
+            var target = _target;
+            var result = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                result += target.GetValue(TestClass.StringProperty)?.Length ?? 0;
+                result += target.GetValue(TestClass.Struct1Property).Int1;
+                result += target.GetValue(TestClass.Struct2Property).Int1;
+                result += target.GetValue(TestClass.Struct3Property).Int1;
+                result += target.GetValue(TestClass.Struct4Property).Int1;
+                result += target.GetValue(TestClass.Struct5Property).Int1;
+                result += target.GetValue(TestClass.Struct6Property).Int1;
+                result += target.GetValue(TestClass.Struct7Property).Int1;
+                result += target.GetValue(TestClass.Struct8Property).Int1;
+            }
+
+            return result;
+        }
+
+        private class TestClass : Control
+        {
+            public static readonly StyledProperty<string> StringProperty =
+                AvaloniaProperty.Register<TestClass, string>("String", inherits: true);
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1", inherits: true);
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2", inherits: true);
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3", inherits: true);
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4", inherits: true);
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5", inherits: true);
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6", inherits: true);
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7", inherits: true);
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8", inherits: true);
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObject_SetValue.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_SetValue.cs
new file mode 100644
index 0000000000..2df265984b
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObject_SetValue.cs
@@ -0,0 +1,130 @@
+using System.Runtime.CompilerServices;
+using Avalonia.Data;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObject_SetValue
+    {
+        private BaselineTestClass _baseline = new();
+        private TestClass _target = new();
+
+        public AvaloniaObject_SetValue()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [Benchmark(Baseline = true)]
+        public int SetClrPropertyValues()
+        {
+            var target = _baseline;
+            var result = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                target.StringProperty = "foo";
+                target.Struct1Property = new(i + 1);
+                target.Struct2Property = new(i + 1);
+                target.Struct3Property = new(i + 1);
+                target.Struct4Property = new(i + 1);
+                target.Struct5Property = new(i + 1);
+                target.Struct6Property = new(i + 1);
+                target.Struct7Property = new(i + 1);
+                target.Struct8Property = new(i + 1);
+            }
+
+            return result;
+        }
+
+        [Benchmark]
+        public void SetValues()
+        {
+            var target = _target;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                target.SetValue(TestClass.StringProperty, "foo");
+                target.SetValue(TestClass.Struct1Property, new(i + 1));
+                target.SetValue(TestClass.Struct2Property, new(i + 1));
+                target.SetValue(TestClass.Struct3Property, new(i + 1));
+                target.SetValue(TestClass.Struct4Property, new(i + 1));
+                target.SetValue(TestClass.Struct5Property, new(i + 1));
+                target.SetValue(TestClass.Struct6Property, new(i + 1));
+                target.SetValue(TestClass.Struct7Property, new(i + 1));
+                target.SetValue(TestClass.Struct8Property, new(i + 1));
+            }
+        }
+
+        [GlobalSetup(Target = nameof(Set_Local_Values_With_Style_Values))]
+        public void SetupStyleValues()
+        {
+            var target = _target;
+            target.SetValue(TestClass.StringProperty, "foo", BindingPriority.Style);
+            target.SetValue(TestClass.Struct1Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct2Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct3Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct4Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct5Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct6Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct7Property, new(), BindingPriority.Style);
+            target.SetValue(TestClass.Struct8Property, new(), BindingPriority.Style);
+        }
+
+        [Benchmark]
+        public void Set_Local_Values_With_Style_Values()
+        {
+            var target = _target;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                target.SetValue(TestClass.StringProperty, "foo");
+                target.SetValue(TestClass.Struct1Property, new(i + 1));
+                target.SetValue(TestClass.Struct2Property, new(i + 1));
+                target.SetValue(TestClass.Struct3Property, new(i + 1));
+                target.SetValue(TestClass.Struct4Property, new(i + 1));
+                target.SetValue(TestClass.Struct5Property, new(i + 1));
+                target.SetValue(TestClass.Struct6Property, new(i + 1));
+                target.SetValue(TestClass.Struct7Property, new(i + 1));
+                target.SetValue(TestClass.Struct8Property, new(i + 1));
+            }
+        }
+
+        private class TestClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<string> StringProperty =
+                AvaloniaProperty.Register<TestClass, string>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+
+        private class BaselineTestClass
+        {
+            public string? StringProperty { get; set; }
+            public Struct1 Struct1Property { get; set; }
+            public Struct2 Struct2Property { get; set; }
+            public Struct3 Struct3Property { get; set; }
+            public Struct4 Struct4Property { get; set; }
+            public Struct5 Struct5Property { get; set; }
+            public Struct6 Struct6Property { get; set; }
+            public Struct7 Struct7Property { get; set; }
+            public Struct8 Struct8Property { get; set; }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Base/DirectPropertyBenchmark.cs b/tests/Avalonia.Benchmarks/Base/DirectPropertyBenchmark.cs
index 02f9397e2c..e823b29526 100644
--- a/tests/Avalonia.Benchmarks/Base/DirectPropertyBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Base/DirectPropertyBenchmark.cs
@@ -1,14 +1,22 @@
-using BenchmarkDotNet.Attributes;
+using System.Runtime.CompilerServices;
+using BenchmarkDotNet.Attributes;
 
 namespace Avalonia.Benchmarks.Base
 {
     [MemoryDiagnoser]
     public class DirectPropertyBenchmark
     {
+        private DirectClass _target = new();
+
+        public DirectPropertyBenchmark()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(DirectClass).TypeHandle);
+        }
+
         [Benchmark(Baseline = true)]
         public void SetAndRaiseOriginal()
         {
-            var obj = new DirectClass();
+            var obj = _target;
 
             for (var i = 0; i < 100; ++i)
             {
@@ -19,7 +27,7 @@ namespace Avalonia.Benchmarks.Base
         [Benchmark]
         public void SetAndRaiseSimple()
         {
-            var obj = new DirectClass();
+            var obj = _target;
 
             for (var i = 0; i < 100; ++i)
             {
diff --git a/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs b/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs
index 59067e642f..6fb2a5ac24 100644
--- a/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs
+++ b/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs
@@ -2,7 +2,7 @@
 using Avalonia.Platform;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 
 namespace Avalonia.Benchmarks
 {
diff --git a/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs b/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
index ccdb0eed2f..51e75b6611 100644
--- a/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
+++ b/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
@@ -4,7 +4,7 @@ using System.IO;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 
 namespace Avalonia.Benchmarks
 {
@@ -117,6 +117,11 @@ namespace Avalonia.Benchmarks
             return new NullGlyphRun();
         }
 
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun, out Matrix scale)
+        {
+            throw new NotImplementedException();
+        }
+
         public bool SupportsIndividualRoundRects => true;
 
         public AlphaFormat DefaultAlphaFormat => AlphaFormat.Premul;
diff --git a/tests/Avalonia.Benchmarks/Styling/ResourceBenchmarks.cs b/tests/Avalonia.Benchmarks/Styling/ResourceBenchmarks.cs
new file mode 100644
index 0000000000..b16e891924
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/ResourceBenchmarks.cs
@@ -0,0 +1,112 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Platform;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using BenchmarkDotNet.Attributes;
+using Moq;
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class ResourceBenchmarks : IDisposable
+    {
+        private readonly Control _searchStart;
+        private readonly IDisposable _app;
+    
+        private static IDisposable CreateApp()
+        {
+            var services = new TestServices(
+                assetLoader: new AssetLoader(),
+                globalClock: new MockGlobalClock(),
+                platform: new AppBuilder().RuntimePlatform,
+                renderInterface: new MockPlatformRenderInterface(),
+                standardCursorFactory: Mock.Of<ICursorFactory>(),
+                styler: new Styler(),
+                theme: () => CreateTheme(),
+                threadingInterface: new NullThreadingPlatform(),
+                fontManagerImpl: new MockFontManagerImpl(),
+                textShaperImpl: new MockTextShaperImpl(),
+                windowingPlatform: new MockWindowingPlatform());
+
+            return UnitTestApplication.Start(services);
+        }
+    
+        private static Styles CreateTheme()
+        {
+            AssetLoader.RegisterResUriParsers();
+            
+            var preHost = new Style();
+            preHost.Resources.Add("preTheme", null);
+            
+            var postHost = new Style();
+            postHost.Resources.Add("postTheme", null);
+
+            return new Styles
+            {
+                preHost,
+                new TestStyles(50, 3, 5),
+                postHost
+            };
+        }
+
+        public void Dispose()
+        {
+            _app.Dispose();
+        }
+        
+        public ResourceBenchmarks()
+        {
+            _searchStart = new Button();
+
+            _app = CreateApp();
+        
+            Decorator root = new TestRoot(true, null)
+            {
+                Renderer = new NullRenderer()
+            };
+        
+            var current = root;
+            
+            for (int i = 0; i < 10; i++)
+            {
+                var child = new Decorator();
+
+                current.Child = child;
+
+                current = child;
+            }
+
+            current.Child = _searchStart;
+        }
+
+        private const int LookupCount = 100;
+        
+        [Benchmark]
+        public void FindPreResource()
+        {
+            for (int i = 0; i < LookupCount; ++i)
+            {
+                _searchStart.FindResource("preTheme");
+            }
+        }
+        
+        [Benchmark]
+        public void FindPostResource()
+        {
+            for (int i = 0; i < LookupCount; ++i)
+            {
+                _searchStart.FindResource("postTheme");
+            }
+        }
+        
+        [Benchmark]
+        public void FindNotExistingResource()
+        {
+            for (int i = 0; i < LookupCount; ++i)
+            {
+                _searchStart.FindResource("notPresent");
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Styling/Style_Activation.cs b/tests/Avalonia.Benchmarks/Styling/Style_Activation.cs
new file mode 100644
index 0000000000..f5878286e7
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/Style_Activation.cs
@@ -0,0 +1,65 @@
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class Style_Activation
+    {
+        private TestClass _target = null!;
+
+        public Style_Activation()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _target = new TestClass();
+
+            var style = new Style(x => x.OfType<TestClass>().Class("foo"))
+            {
+                Setters = { new Setter(TestClass.StringProperty, "foo") }
+            };
+
+            style.TryAttach(_target, null);
+        }
+
+        [Benchmark]
+        public void Toggle_Style_Activation_Via_Class()
+        {
+            for (var i = 0; i < 100; ++i)
+            {
+                _target.Classes.Add("foo");
+                _target.Classes.Remove("foo");
+            }
+        }
+
+        private class TestClass : Control
+        {
+            public static readonly StyledProperty<string?> StringProperty =
+                AvaloniaProperty.Register<TestClass, string?>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Styling/Style_Apply.cs b/tests/Avalonia.Benchmarks/Styling/Style_Apply.cs
new file mode 100644
index 0000000000..2943eef55a
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/Style_Apply.cs
@@ -0,0 +1,89 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class Style_Apply
+    {
+        private List<Style> _styles = new();
+
+        public Style_Apply()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [Params(1, 5, 50)]
+        public int MatchingStyles { get; set; }
+
+
+        [Params(1, 5, 50)]
+        public int NonMatchingStyles { get; set; }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _styles.Clear();
+
+            for (var i = 0; i < MatchingStyles; ++i)
+            {
+                _styles.Add(new Style(x => x.OfType<TestClass>())
+                {
+                    Setters = { new Setter(TestClass.StringProperty, "foo") }
+                });
+            }
+
+            for (var i = 0; i < NonMatchingStyles; ++i)
+            {
+                _styles.Add(new Style(x => x.OfType<TestClass2>().Class("missing"))
+                {
+                    Setters = { new Setter(TestClass.StringProperty, "foo") }
+                });
+            }
+        }
+
+        [Benchmark]
+        public void Apply_Simple_Styles()
+        {
+            var target = new TestClass();
+
+            target.BeginBatchUpdate();
+
+            foreach (var style in _styles)
+                style.TryAttach(target, null);
+
+            target.EndBatchUpdate();
+        }
+
+        private class TestClass : Control
+        {
+            public static readonly StyledProperty<string?> StringProperty =
+                AvaloniaProperty.Register<TestClass, string?>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+
+        private class TestClass2 : Control
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Styling/Style_NonActive.cs b/tests/Avalonia.Benchmarks/Styling/Style_NonActive.cs
new file mode 100644
index 0000000000..cad947d762
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/Style_NonActive.cs
@@ -0,0 +1,74 @@
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class Style_NonActive
+    {
+        private TestClass _target = null!;
+
+        public Style_NonActive()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestClass).TypeHandle);
+        }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _target = new TestClass();
+
+            var style = new Style(x => x.OfType<TestClass>().Class("foo"))
+            {
+                Setters = { new Setter(TestClass.StringProperty, "foo") }
+            };
+
+            style.TryAttach(_target, null);
+            _target.SetValue(TestClass.StringProperty, "foo");
+            _target.SetValue(TestClass.Struct1Property, new(1));
+            _target.SetValue(TestClass.Struct2Property, new(1));
+            _target.SetValue(TestClass.Struct3Property, new(1));
+            _target.SetValue(TestClass.Struct4Property, new(1));
+            _target.SetValue(TestClass.Struct5Property, new(1));
+            _target.SetValue(TestClass.Struct6Property, new(1));
+            _target.SetValue(TestClass.Struct7Property, new(1));
+            _target.SetValue(TestClass.Struct8Property, new(1));
+        }
+
+        [Benchmark]
+        public void Toggle_NonActive_Style_Activation()
+        {
+            for (var i = 0; i < 100; ++i)
+            {
+                _target.Classes.Add("foo");
+                _target.Classes.Remove("foo");
+            }
+        }
+
+        private class TestClass : Control
+        {
+            public static readonly StyledProperty<string?> StringProperty =
+                AvaloniaProperty.Register<TestClass, string?>("String");
+            public static readonly StyledProperty<Struct1> Struct1Property =
+                AvaloniaProperty.Register<TestClass, Struct1>("Struct1");
+            public static readonly StyledProperty<Struct2> Struct2Property =
+                AvaloniaProperty.Register<TestClass, Struct2>("Struct2");
+            public static readonly StyledProperty<Struct3> Struct3Property =
+                AvaloniaProperty.Register<TestClass, Struct3>("Struct3");
+            public static readonly StyledProperty<Struct4> Struct4Property =
+                AvaloniaProperty.Register<TestClass, Struct4>("Struct4");
+            public static readonly StyledProperty<Struct5> Struct5Property =
+                AvaloniaProperty.Register<TestClass, Struct5>("Struct5");
+            public static readonly StyledProperty<Struct6> Struct6Property =
+                AvaloniaProperty.Register<TestClass, Struct6>("Struct6");
+            public static readonly StyledProperty<Struct7> Struct7Property =
+                AvaloniaProperty.Register<TestClass, Struct7>("Struct7");
+            public static readonly StyledProperty<Struct8> Struct8Property =
+                AvaloniaProperty.Register<TestClass, Struct8>("Struct8");
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/TestBindingObservable.cs b/tests/Avalonia.Benchmarks/TestBindingObservable.cs
new file mode 100644
index 0000000000..653959ba18
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/TestBindingObservable.cs
@@ -0,0 +1,39 @@
+#nullable enable
+using System;
+using Avalonia.Data;
+
+namespace Avalonia.Benchmarks
+{
+    internal class TestBindingObservable<T> : IObservable<BindingValue<T?>>, IDisposable
+    {
+        private T? _value;
+        private IObserver<BindingValue<T?>>? _observer;
+
+        public TestBindingObservable(T? initialValue = default) => _value = initialValue;
+
+        public IDisposable Subscribe(IObserver<BindingValue<T?>> observer)
+        {
+            if (_observer is object)
+                throw new InvalidOperationException("The observable can only be subscribed once.");
+
+            _observer = observer;
+            observer.OnNext(_value);
+            return this;
+        }
+
+        public void Dispose() => _observer = null;
+        public void OnNext(T? value) => _observer?.OnNext(value);
+
+        public void PublishCompleted()
+        {
+            _observer?.OnCompleted();
+            _observer = null;
+        }
+
+        protected void PublishError(Exception error)
+        {
+            _observer?.OnError(error);
+            _observer = null;
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/TestStyles.cs b/tests/Avalonia.Benchmarks/TestStyles.cs
new file mode 100644
index 0000000000..be2ad7d072
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/TestStyles.cs
@@ -0,0 +1,29 @@
+using Avalonia.Styling;
+
+namespace Avalonia.Benchmarks
+{
+    public class TestStyles : Styles
+    {
+        public TestStyles(int childStylesCount, int childInnerStyleCount, int childResourceCount)
+        {
+            for (int i = 0; i < childStylesCount; i++)
+            {
+                var childStyles = new Styles();
+
+                for (int j = 0; j < childInnerStyleCount; j++)
+                {
+                    var childStyle = new Style();
+
+                    for (int k = 0; k < childResourceCount; k++)
+                    {
+                        childStyle.Resources.Add($"resource.{i}.{j}.{k}", null);
+                    }
+                    
+                    childStyles.Add(childStyle);
+                }
+                
+                Add(childStyles);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/TestTypes.cs b/tests/Avalonia.Benchmarks/TestTypes.cs
new file mode 100644
index 0000000000..584055a949
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/TestTypes.cs
@@ -0,0 +1,112 @@
+using System;
+
+namespace Avalonia.Benchmarks
+{
+    internal record struct Struct1
+    {
+        public Struct1(int value)
+        {
+            Int1 = value;
+        }
+
+        public int Int1;
+    }
+
+    internal record struct Struct2
+    {
+        public Struct2(int value)
+        {
+            Int1 = Int2 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+    }
+
+    internal record struct Struct3
+    {
+        public Struct3(int value)
+        {
+            Int1 = Int2 = Int3 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+        public int Int3;
+    }
+
+    internal record struct Struct4
+    {
+        public Struct4(int value)
+        {
+            Int1 = Int2 = Int3 = Int4 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+        public int Int3;
+        public int Int4;
+    }
+
+    internal record struct Struct5
+    {
+        public Struct5(int value)
+        {
+            Int1 = Int2 = Int3 = Int4 = Int5 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+        public int Int3;
+        public int Int4;
+        public int Int5;
+    }
+
+    internal record struct Struct6
+    {
+        public Struct6(int value)
+        {
+            Int1 = Int2 = Int3 = Int4 = Int5 = Int6 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+        public int Int3;
+        public int Int4;
+        public int Int5;
+        public int Int6;
+    }
+
+    internal record struct Struct7
+    {
+        public Struct7(int value)
+        {
+            Int1 = Int2 = Int3 = Int4 = Int5 = Int6 = Int7 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+        public int Int3;
+        public int Int4;
+        public int Int5;
+        public int Int6;
+        public int Int7;
+    }
+
+    internal record struct Struct8
+    {
+        public Struct8(int value)
+        {
+            Int1 = Int2 = Int3 = Int4 = Int5 = Int6 = Int7 = Int8 = value;
+        }
+
+        public int Int1;
+        public int Int2;
+        public int Int3;
+        public int Int4;
+        public int Int5;
+        public int Int6;
+        public int Int7;
+        public int Int8;
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Themes/FluentBenchmark.cs b/tests/Avalonia.Benchmarks/Themes/FluentBenchmark.cs
index 6f04bb5206..ceb015ee63 100644
--- a/tests/Avalonia.Benchmarks/Themes/FluentBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Themes/FluentBenchmark.cs
@@ -1,7 +1,6 @@
 using System;
 using Avalonia.Controls;
 using Avalonia.Platform;
-using Avalonia.PlatformSupport;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using BenchmarkDotNet.Attributes;
diff --git a/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs b/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
index 81264f109c..9a5b49790d 100644
--- a/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
@@ -2,7 +2,7 @@
 
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml.Styling;
-using Avalonia.PlatformSupport;
+using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 
diff --git a/tests/Avalonia.Benchmarks/Visuals/VisualAffectsRenderBenchmarks.cs b/tests/Avalonia.Benchmarks/Visuals/VisualAffectsRenderBenchmarks.cs
new file mode 100644
index 0000000000..5b85a068d6
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Visuals/VisualAffectsRenderBenchmarks.cs
@@ -0,0 +1,45 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Visuals;
+
+[MemoryDiagnoser]
+public class VisualAffectsRenderBenchmarks
+{
+    private readonly TestVisual _target;
+    private readonly IPen _pen;
+        
+    public VisualAffectsRenderBenchmarks()
+    {
+        _target = new TestVisual();
+        _pen = new Pen(Brushes.Black);
+    }
+        
+    [Benchmark]
+    public void SetPropertyThatAffectsRender()
+    {
+        _target.Pen = _pen;
+        _target.Pen = null;
+    }
+
+    private class TestVisual : Visual
+    {
+        /// <summary>
+        /// Defines the <see cref="Pen"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IPen> PenProperty =
+            AvaloniaProperty.Register<Border, IPen>(nameof(Pen));
+            
+        public IPen Pen
+        {
+            get => GetValue(PenProperty);
+            set => SetValue(PenProperty, value);
+        }
+
+        static TestVisual()
+        {
+            AffectsRender<TestVisual>(PenProperty);
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
index 4aed8c60c3..12eb290fde 100644
--- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
+++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
@@ -18,14 +18,8 @@
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml.Loader\Avalonia.Markup.Xaml.Loader.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
index f4acf5ea37..2e3623cc3c 100644
--- a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
@@ -309,6 +309,80 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(0, raised);
         }
+        
+        [Fact]
+        public void Button_IsDefault_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var raised = 0;
+                var target = new Button();
+                var window = new Window { Content = target };
+                window.Show();
+                
+                target.Click += (s, e) => ++raised;
+
+                target.IsDefault = false;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Enter));
+                Assert.Equal(0, raised);
+                
+                target.IsDefault = true;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Enter));
+                Assert.Equal(1, raised);
+
+                target.IsDefault = false;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Enter));
+                Assert.Equal(1, raised);
+                
+                target.IsDefault = true;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Enter));
+                Assert.Equal(2, raised);
+                
+                window.Content = null;
+                // To check if handler was raised on the button, when it's detached, we need to pass it as a source manually.
+                window.RaiseEvent(CreateKeyDownEvent(Key.Enter, target));
+                Assert.Equal(2, raised);
+            }
+        }
+        
+        [Fact]
+        public void Button_IsCancel_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var raised = 0;
+                var target = new Button();
+                var window = new Window { Content = target };
+                window.Show();
+                
+                target.Click += (s, e) => ++raised;
+
+                target.IsCancel = false;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Escape));
+                Assert.Equal(0, raised);
+                
+                target.IsCancel = true;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Escape));
+                Assert.Equal(1, raised);
+
+                target.IsCancel = false;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Escape));
+                Assert.Equal(1, raised);
+                
+                target.IsCancel = true;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Escape));
+                Assert.Equal(2, raised);
+                
+                window.Content = null;
+                window.RaiseEvent(CreateKeyDownEvent(Key.Escape, target));
+                Assert.Equal(2, raised);
+            }
+        }
+
+        private KeyEventArgs CreateKeyDownEvent(Key key, IInteractive source = null)
+        {
+            return new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key, Source = source };
+        }
 
         private class TestButton : Button, IRenderRoot
         {
diff --git a/tests/Avalonia.Controls.UnitTests/CalendarTests.cs b/tests/Avalonia.Controls.UnitTests/CalendarTests.cs
index 95ddd211da..13c6638308 100644
--- a/tests/Avalonia.Controls.UnitTests/CalendarTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CalendarTests.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Controls.UnitTests
                 first.Day == second.Day;
         }
 
-        [Fact(Skip ="FIX ME ASAP")]
+        [Fact]
         public void SelectedDatesChanged_Should_Fire_When_SelectedDate_Set()
         {
             bool handled = false;
diff --git a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
index cb2fd11175..98695fe88e 100644
--- a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
@@ -36,6 +36,81 @@ namespace Avalonia.Controls.UnitTests
             Assert.False(target.IsDropDownOpen);
         }
 
+        [Fact]
+        public void WrapSelection_Should_Work()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var items = new[]
+                {
+                    new ComboBoxItem() { Content = "bla" },
+                    new ComboBoxItem() { Content = "dd" },
+                    new ComboBoxItem() { Content = "sdf", IsEnabled = false }
+                };
+                var target = new ComboBox
+                {
+                    Items = items,
+                    Template = GetTemplate(),
+                    WrapSelection = true
+                };
+                var root = new TestRoot(target);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                target.Focus();
+                Assert.Equal(target.SelectedIndex, -1);
+                Assert.True(target.IsFocused);
+                target.RaiseEvent(new KeyEventArgs
+                {
+                    RoutedEvent = InputElement.KeyDownEvent,
+                    Key = Key.Up,
+                });
+                Assert.Equal(target.SelectedIndex, 1);
+                target.RaiseEvent(new KeyEventArgs
+                {
+                    RoutedEvent = InputElement.KeyDownEvent,
+                    Key = Key.Down,
+                });
+                Assert.Equal(target.SelectedIndex, 0);
+            }
+        }
+
+        [Fact]
+        public void Focuses_Next_Item_On_Key_Down()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var items = new[]
+                {
+                    new ComboBoxItem() { Content = "bla" },
+                    new ComboBoxItem() { Content = "dd", IsEnabled = false },
+                    new ComboBoxItem() { Content = "sdf" }
+                };
+                var target = new ComboBox
+                {
+                    Items = items,
+                    Template = GetTemplate()
+                };
+                var root = new TestRoot(target);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                target.Focus();
+                Assert.Equal(target.SelectedIndex, -1);
+                Assert.True(target.IsFocused);
+                target.RaiseEvent(new KeyEventArgs
+                {
+                    RoutedEvent = InputElement.KeyDownEvent,
+                    Key = Key.Down,
+                });
+                Assert.Equal(target.SelectedIndex, 0);
+                target.RaiseEvent(new KeyEventArgs
+                {
+                    RoutedEvent = InputElement.KeyDownEvent,
+                    Key = Key.Down,
+                });
+                Assert.Equal(target.SelectedIndex, 2);
+            }
+        }
+
         [Fact]
         public void SelectionBoxItem_Is_Rectangle_With_VisualBrush_When_Selection_Is_Control()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
index ba01f3db40..b63cbd286e 100644
--- a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
@@ -446,6 +446,27 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Should_Reset_Popup_Parent_On_Target_Detached()
+        {
+            using (Application())
+            {
+                var userControl = new UserControl();
+                var window = PreparedWindow(userControl);
+                window.Show();
+                
+                var menu = new ContextMenu();
+                userControl.ContextMenu = menu;
+                menu.Open();
+                
+                var popup = Assert.IsType<Popup>(menu.Parent);
+                Assert.NotNull(popup.Parent);
+                
+                window.Content = null;
+                Assert.Null(popup.Parent);
+            }
+        }
+
         [Fact]
         public void Context_Menu_In_Resources_Can_Be_Shared()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
index c2dd8cf01a..776b4508c2 100644
--- a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
@@ -432,6 +432,48 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Should_Reset_Popup_Parent_On_Target_Detached()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var userControl = new UserControl();
+                var window = PreparedWindow(userControl);
+                window.Show();
+                
+                var flyout = new TestFlyout();
+                flyout.ShowAt(userControl);
+                
+                var popup = Assert.IsType<Popup>(flyout.Popup);
+                Assert.NotNull(popup.Parent);
+                
+                window.Content = null;
+                Assert.Null(popup.Parent);
+            }
+        }
+        
+        [Fact]
+        public void Should_Reset_Popup_Parent_On_Target_Attach_Following_Detach()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var userControl = new UserControl();
+                var window = PreparedWindow(userControl);
+                window.Show();
+                
+                var flyout = new TestFlyout();
+                flyout.ShowAt(userControl);
+                
+                var popup = Assert.IsType<Popup>(flyout.Popup);
+                Assert.NotNull(popup.Parent);
+                
+                flyout.Hide();
+                
+                flyout.ShowAt(userControl);
+                Assert.NotNull(popup.Parent);
+            }
+        }
+
         [Fact]
         public void ContextFlyout_Can_Be_Set_In_Styles()
         {
@@ -549,5 +591,10 @@ namespace Avalonia.Controls.UnitTests
                 new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.LeftButtonPressed),
                 KeyModifiers.None);
         }
+        
+        public class TestFlyout : Flyout
+        {
+            public new Popup Popup => base.Popup;
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs b/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
index 9eedd17716..d22a67f389 100644
--- a/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
@@ -53,6 +53,19 @@ namespace Avalonia.Controls.UnitTests.Platform
                 Assert.True(e.Handled);
             }
 
+            [Fact]
+            public void Down_Selects_First_Item_Of_Already_Opened_Submenu()
+            {
+                var target = new DefaultMenuInteractionHandler(false);
+                var item = Mock.Of<IMenuItem>(x => x.IsTopLevel == true && x.HasSubMenu == true && x.IsSubMenuOpen);
+                var e = new KeyEventArgs { Key = Key.Down, Source = item };
+
+                target.KeyDown(item, e);
+
+                Mock.Get(item).Verify(x => x.MoveSelection(NavigationDirection.First, true));
+                Assert.True(e.Handled);
+            }
+
             [Fact]
             public void Right_Selects_Next_MenuItem()
             {
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
index a579e869b0..6d20c72674 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
@@ -353,6 +353,29 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Null(target.Host);
         }
 
+        [Fact]
+        public void Content_Should_Become_DataContext_When_ControlTemplate_Is_Not_Null()
+        {
+            var (target, _) = CreateTarget();
+
+            var textBlock = new TextBlock
+            {
+                [!TextBlock.TextProperty] = new Binding("Name"),
+            };
+
+            var canvas = new Canvas()
+            {
+                Name = "Canvas"
+            };
+
+            target.ContentTemplate = new FuncDataTemplate<Canvas>((_, __) => textBlock);
+            target.Content = canvas;
+
+            Assert.NotNull(target.DataContext);
+            Assert.Equal(canvas, target.DataContext);
+            Assert.Equal("Canvas", textBlock.Text);
+        }
+
         (ContentPresenter presenter, ContentControl templatedParent) CreateTarget()
         {
             var templatedParent = new ContentControl
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
index f27ff3928c..6d3351d2b2 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
@@ -78,9 +78,13 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
                 var templatedChild = ((Visual)target.Host).GetVisualChildren().Single();
                 
-                Assert.IsType<Panel>(templatedChild);
+                Assert.IsType<LayoutTransformControl>(templatedChild);
 
-                var visualLayerManager = templatedChild.GetVisualChildren().Skip(1).Single();
+                var panel = templatedChild.GetVisualChildren().Single();
+
+                Assert.IsType<Panel>(panel);
+
+                var visualLayerManager = panel.GetVisualChildren().Skip(1).Single();
 
                 Assert.IsType<VisualLayerManager>(visualLayerManager);
 
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
index cac8ca885d..d9cb40d1cc 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
@@ -325,6 +325,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     Assert.Equal(
                         new[]
                         {
+                            "LayoutTransformControl",
                             "VisualLayerManager",
                             "ContentPresenter",
                             "ContentPresenter",
@@ -337,6 +338,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     Assert.Equal(
                         new[]
                         {
+                            "LayoutTransformControl",
                             "Panel",
                             "Border",
                             "VisualLayerManager",
@@ -356,6 +358,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     Assert.Equal(
                         new object[]
                         {
+                            popupRoot,
                             popupRoot,
                             popupRoot,
                             target,
@@ -372,6 +375,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                             popupRoot,
                             popupRoot,
                             popupRoot,
+                            popupRoot,
                             target,
                             null,
                         },
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index 0e0ca7cd25..3d36395c3a 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -6,6 +6,7 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Disposables;
+using System.Threading.Tasks;
 using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
@@ -1614,6 +1615,50 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.MoveSelection(NavigationDirection.Next, true);
         }
 
+        [Fact(Timeout = 2000)]
+        public async Task MoveSelection_Does_Not_Hang_With_No_Focusable_Controls_And_Moving_Selection_To_The_First_Item()
+        {
+            var target = new TestSelector
+            {
+                Template = Template(),
+                Items = new[]
+                {
+                    new ListBoxItem { Focusable = false },
+                    new ListBoxItem(),
+                }
+            };
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            // Timeout in xUnit doesen't work with synchronous methods so we need to apply hack below.
+            // https://github.com/xunit/xunit/issues/2222
+            await Task.Run(() => target.MoveSelection(NavigationDirection.First, true));
+            Assert.Equal(-1, target.SelectedIndex);
+        }
+
+        [Fact(Timeout = 2000)]
+        public async Task MoveSelection_Does_Not_Hang_With_No_Focusable_Controls_And_Moving_Selection_To_The_Last_Item()
+        {
+            var target = new TestSelector
+            {
+                Template = Template(),
+                Items = new[]
+                {
+                    new ListBoxItem(),
+                    new ListBoxItem { Focusable = false },
+                }
+            };
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            // Timeout in xUnit doesen't work with synchronous methods so we need to apply hack below.
+            // https://github.com/xunit/xunit/issues/2222
+            await Task.Run(() => target.MoveSelection(NavigationDirection.Last, true));
+            Assert.Equal(-1, target.SelectedIndex);
+        }
+
         [Fact]
         public void MoveSelection_Does_Select_Disabled_Controls()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index c0c9e841f4..f15da8e0c5 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -865,6 +865,35 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Should_Fullfill_MaxLines_Contraint()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "ABC",
+                    MaxLines = 1,
+                    AcceptsReturn= true
+                };
+
+                target.Measure(Size.Infinity);
+
+                AvaloniaLocator.CurrentMutable.Bind<IClipboard>().ToSingleton<ClipboardStub>();
+
+                var clipboard = AvaloniaLocator.CurrentMutable.GetService<IClipboard>();
+                clipboard.SetTextAsync(Environment.NewLine).GetAwaiter().GetResult();
+
+                RaiseKeyEvent(target, Key.V, KeyModifiers.Control);
+                clipboard.ClearAsync().GetAwaiter().GetResult();
+
+                RaiseTextEvent(target, Environment.NewLine);
+
+                Assert.Equal("ABC", target.Text);
+            }
+        }
+
         private static TestServices FocusServices => TestServices.MockThreadingInterface.With(
             focusManager: new FocusManager(),
             keyboardDevice: () => new KeyboardDevice(),
diff --git a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
index 9c2d760733..db6349cc5a 100644
--- a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
@@ -193,6 +193,9 @@ namespace Avalonia.Controls.UnitTests
         public void Impl_Input_Should_Pass_Input_To_InputManager()
         {
             var inputManagerMock = new Mock<IInputManager>();
+            inputManagerMock.DefaultValue = DefaultValue.Mock;
+            inputManagerMock.SetupAllProperties();
+
             var services = TestServices.StyledWindow.With(inputManager: inputManagerMock.Object);
 
             using (UnitTestApplication.Start(services))
@@ -249,24 +252,6 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        [Fact]
-        public void Close_Should_Notify_MouseDevice()
-        {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
-            {
-                var impl = new Mock<ITopLevelImpl>();
-                var mouseDevice = new Mock<IMouseDevice>();
-                impl.SetupAllProperties();
-                impl.Setup(x => x.MouseDevice).Returns(mouseDevice.Object);
-
-                var target = new TestTopLevel(impl.Object);
-
-                impl.Object.Closed();
-
-                mouseDevice.Verify(x => x.TopLevelClosed(target));
-            }
-        }
-
         [Fact]
         public void Close_Should_Dispose_LayoutManager()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
index b0eb694944..8d9a4aa599 100644
--- a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
@@ -170,7 +170,7 @@ namespace Avalonia.Controls.UnitTests.Utils
         }
 
         [Theory]
-        [MemberData(nameof(ElementsFactory))]
+        [MemberData(nameof(ElementsFactory), parameters: true)]
         public void HotKeyManager_Should_Use_CommandParameter(string factoryName, Factory factory)
         {
             using (AvaloniaLocator.EnterScope())
@@ -215,7 +215,7 @@ namespace Avalonia.Controls.UnitTests.Utils
 
 
         [Theory]
-        [MemberData(nameof(ElementsFactory))]
+        [MemberData(nameof(ElementsFactory), parameters: true)]
         public void HotKeyManager_Should_Do_Not_Executed_When_IsEnabled_False(string factoryName, Factory factory)
         {
             using (AvaloniaLocator.EnterScope())
@@ -256,11 +256,127 @@ namespace Avalonia.Controls.UnitTests.Utils
             }
         }
 
-        public static TheoryData<string, Factory> ElementsFactory =>
+        [Theory]
+        [MemberData(nameof(ElementsFactory), parameters:false)]
+        public void HotKeyManager_Should_Invoke_Event_Click_When_Command_Is_Null(string factoryName, Factory factory)
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var styler = new Mock<Styler>();
+                var target = new KeyboardDevice();
+                var clickExecutedCount = 0;
+                AvaloniaLocator.CurrentMutable
+                    .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformMock())
+                    .Bind<IStyler>().ToConstant(styler.Object);
+
+                var gesture = new KeyGesture(Key.A, KeyModifiers.Control);
+
+                void Clickable_Click(object sender, Interactivity.RoutedEventArgs e)
+                {
+                    clickExecutedCount++;
+                }
+
+                var root = new Window();
+                var element = factory(0, default, root) as InputElement;
+                if (element is IClickableControl clickable)
+                {
+                    clickable.Click += Clickable_Click;
+                }
+
+                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));
+
+                element.IsEnabled = false;
+
+                target.ProcessRawEvent(new RawKeyEventArgs(target,
+                    0,
+                    root,
+                    RawKeyEventType.KeyDown,
+                    Key.A,
+                    RawInputModifiers.Control));
+
+
+                Assert.True(clickExecutedCount == 1, $"{factoryName} Execution raised when IsEnabled is false.");
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ElementsFactory), parameters: true)]
+        public void HotKeyManager_Should_Not_Invoke_Event_Click_When_Command_Is_Not_Null(string factoryName, Factory factory)
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                var styler = new Mock<Styler>();
+                var target = new KeyboardDevice();
+                var clickExecutedCount = 0;
+                var commandExecutedCount = 0;
+                AvaloniaLocator.CurrentMutable
+                    .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformMock())
+                    .Bind<IStyler>().ToConstant(styler.Object);
+
+                var gesture = new KeyGesture(Key.A, KeyModifiers.Control);
+
+                void DoExecute(object parameter)
+                {
+                    commandExecutedCount++;
+                }
+
+                void Clickable_Click(object sender, Interactivity.RoutedEventArgs e)
+                {
+                    clickExecutedCount++;
+                }
+
+                var root = new Window();
+                var element = factory(0, DoExecute, root) as InputElement;
+                if (element is IClickableControl clickable)
+                {
+                    clickable.Click += Clickable_Click;
+                }
+
+                root.Template = CreateWindowTemplate();
+                root.ApplyTemplate();
+                root.Presenter.ApplyTemplate();
+
+                HotKeyManager.SetHotKey(element, gesture);
+
+                target.ProcessRawEvent(new RawKeyEventArgs(target,
+                    0,
+                    root,
+                    RawKeyEventType.KeyDown,
+                    Key.A,
+                    RawInputModifiers.Control));
+
+                element.IsEnabled = false;
+
+                target.ProcessRawEvent(new RawKeyEventArgs(target,
+                    0,
+                    root,
+                    RawKeyEventType.KeyDown,
+                    Key.A,
+                    RawInputModifiers.Control));
+
+                Assert.True(commandExecutedCount == 1, $"{factoryName} Execution raised when IsEnabled is false.");
+                Assert.True(clickExecutedCount == 0, $"{factoryName} Execution raised event Click.");
+            }
+        }
+
+
+        public static TheoryData<string, Factory> ElementsFactory(bool withCommand) =>
+
             new TheoryData<string, Factory>()
             {
-                {nameof(Button), MakeButton},
-                {nameof(MenuItem),MakeMenu},
+                {nameof(Button), withCommand ? MakeButton : MakeButtonWithoutCommand},
+                {nameof(MenuItem),withCommand ? MakeMenu : MakeMenuWithoutCommand},
             };
 
         private static AvaloniaObject MakeMenu(int expectedParameter, Action<object> action, Window root)
@@ -290,6 +406,29 @@ namespace Avalonia.Controls.UnitTests.Utils
             return button;
         }
 
+        private static AvaloniaObject MakeMenuWithoutCommand(int expectedParameter, Action<object> action, Window root)
+        {
+            var menuitem = new MenuItem()
+            {
+            };
+            var rootMenu = new Menu();
+
+            rootMenu.Items = new[] { menuitem };
+
+            root.Content = rootMenu;
+            return menuitem;
+        }
+
+        private static AvaloniaObject MakeButtonWithoutCommand(int expectedParameter, Action<object> action, Window root)
+        {
+            var button = new Button()
+            {
+            };
+
+            root.Content = button;
+            return button;
+        }
+
         private FuncControlTemplate CreateWindowTemplate()
         {
             return new FuncControlTemplate<Window>((parent, scope) =>
diff --git a/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs b/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs
index 7eaec35506..4ffd314857 100644
--- a/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls.Shapes;
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.UnitTests;
 using Xunit;
@@ -18,11 +19,10 @@ namespace Avalonia.Controls.UnitTests
             target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
 
             Assert.Equal(new Size(200, 100), target.DesiredSize);
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(2.0, scaleTransform.ScaleX);
-            Assert.Equal(2.0, scaleTransform.ScaleY);
+            
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(2.0, scale.X);
+            Assert.Equal(2.0, scale.Y);
         }
 
         [Fact]
@@ -36,11 +36,10 @@ namespace Avalonia.Controls.UnitTests
             target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
 
             Assert.Equal(new Size(100, 50), target.DesiredSize);
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(1.0, scaleTransform.ScaleX);
-            Assert.Equal(1.0, scaleTransform.ScaleY);
+            
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(1.0, scale.X);
+            Assert.Equal(1.0, scale.Y);
         }
 
         [Fact]
@@ -54,11 +53,10 @@ namespace Avalonia.Controls.UnitTests
             target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
 
             Assert.Equal(new Size(200, 200), target.DesiredSize);
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(2.0, scaleTransform.ScaleX);
-            Assert.Equal(4.0, scaleTransform.ScaleY);
+            
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(2.0, scale.X);
+            Assert.Equal(4.0, scale.Y);
         }
 
         [Fact]
@@ -72,11 +70,10 @@ namespace Avalonia.Controls.UnitTests
             target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
 
             Assert.Equal(new Size(200, 200), target.DesiredSize);
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(4.0, scaleTransform.ScaleX);
-            Assert.Equal(4.0, scaleTransform.ScaleY);
+            
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(4.0, scale.X);
+            Assert.Equal(4.0, scale.Y);
         }
 
         [Fact]
@@ -90,11 +87,10 @@ namespace Avalonia.Controls.UnitTests
             target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
 
             Assert.Equal(new Size(400, 200), target.DesiredSize);
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(4.0, scaleTransform.ScaleX);
-            Assert.Equal(4.0, scaleTransform.ScaleY);
+            
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(4.0, scale.X);
+            Assert.Equal(4.0, scale.Y);
         }
 
         [Fact]
@@ -108,11 +104,10 @@ namespace Avalonia.Controls.UnitTests
             target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
 
             Assert.Equal(new Size(200, 100), target.DesiredSize);
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(2.0, scaleTransform.ScaleX);
-            Assert.Equal(2.0, scaleTransform.ScaleY);
+            
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(2.0, scale.X);
+            Assert.Equal(2.0, scale.Y);
         }
 
         [Theory]
@@ -136,11 +131,9 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(new Size(expectedWidth, expectedHeight), target.DesiredSize);
 
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
-
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(expectedScale, scaleTransform.ScaleX);
-            Assert.Equal(expectedScale, scaleTransform.ScaleY);
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(expectedScale, scale.X);
+            Assert.Equal(expectedScale, scale.Y);
         }
 
         [Theory]
@@ -164,11 +157,70 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(new Size(expectedWidth, expectedHeight), target.DesiredSize);
 
-            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
+            Assert.True(TryGetScale(target, out Vector scale));
+            Assert.Equal(expectedScale, scale.X);
+            Assert.Equal(expectedScale, scale.Y);
+        }
+
+        [Fact]
+        public void Child_Should_Be_Logical_Child_Of_Viewbox()
+        {
+            var target = new Viewbox();
+
+            Assert.Empty(target.GetLogicalChildren());
+
+            var child = new Canvas();
+            target.Child = child;
+
+            Assert.Single(target.GetLogicalChildren(), child);
+            Assert.Same(child.GetLogicalParent(), target);
+
+            target.Child = null;
+
+            Assert.Empty(target.GetLogicalChildren());
+            Assert.Null(child.GetLogicalParent());
+        }
+
+        [Fact]
+        public void Changing_Child_Should_Invalidate_Layout()
+        {
+            var target = new Viewbox();
+
+            target.Child = new Canvas
+            {
+                Width = 100,
+                Height = 100,
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+            Assert.Equal(new Size(100, 100), target.DesiredSize);
+
+            target.Child = new Canvas
+            {
+                Width = 200,
+                Height = 200,
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+            Assert.Equal(new Size(200, 200), target.DesiredSize);
+        }
+
+        private bool TryGetScale(Viewbox viewbox, out Vector scale)
+        {
+            if (viewbox.InternalTransform is null)
+            {
+                scale = default;
+                return false;
+            }
+
+            var matrix = viewbox.InternalTransform.Value;
+
+            Matrix.TryDecomposeTransform(matrix, out var decomposed);
 
-            Assert.NotNull(scaleTransform);
-            Assert.Equal(expectedScale, scaleTransform.ScaleX);
-            Assert.Equal(expectedScale, scaleTransform.ScaleY);
+            scale = decomposed.Scale;
+            return true;
         }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index eb128ef038..63ccf74c2b 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -516,6 +516,8 @@ namespace Avalonia.Controls.UnitTests
 
             var screens = new Mock<IScreenImpl>();
             screens.Setup(x => x.AllScreens).Returns(new Screen[] { screen1.Object, screen2.Object });
+            screens.Setup(x => x.ScreenFromPoint(It.IsAny<PixelPoint>())).Returns(screen1.Object);
+            
 
             var windowImpl = MockWindowingPlatform.CreateWindowMock();
             windowImpl.Setup(x => x.ClientSize).Returns(new Size(800, 480));
@@ -717,6 +719,27 @@ namespace Avalonia.Controls.UnitTests
                 }
             }
 
+            [Fact]
+            public void MaxWidth_And_MaxHeight_Should_Be_Respected_With_SizeToContent_WidthAndHeight()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var child = new ChildControl();
+
+                    var target = new Window()
+                    {
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        MaxWidth = 300,
+                        MaxHeight = 700,
+                        Content = child,
+                    };
+
+                    Show(target);
+
+                    Assert.Equal(new[] { new Size(300, 700) }, child.MeasureSizes);
+                }
+            }
+
             [Fact]
             public void SizeToContent_Should_Not_Be_Lost_On_Show()
             {
diff --git a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
index f4c6434a68..f66b2b0457 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
+++ b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
@@ -18,15 +18,9 @@
     <ProjectReference Include="..\..\src\Avalonia.OpenGL\Avalonia.OpenGL.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
   </ItemGroup>
diff --git a/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package-lock.json b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package-lock.json
index 5477bcfd29..eb57cfb8da 100644
--- a/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package-lock.json
+++ b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package-lock.json
@@ -389,9 +389,9 @@
       "dev": true
     },
     "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
       "dev": true
     },
     "ansi-styles": {
@@ -587,9 +587,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
         "string-width": {
@@ -1333,9 +1333,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "mocha": {
@@ -1437,9 +1437,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "cliui": {
@@ -2117,9 +2117,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
         "ansi-styles": {
@@ -2211,9 +2211,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
         "find-up": {
@@ -2305,9 +2305,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
         "find-up": {
diff --git a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
index cdadc3dcba..52acc78db1 100644
--- a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
+++ b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
@@ -11,20 +11,14 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
     <ProjectReference Include="..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Magick.NET-Q16-AnyCPU.props" />
+  <Import Project="..\..\build\ImageSharp.props" />
   <Import Project="..\..\build\SharedVersion.props" />
 </Project>
diff --git a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
index 636643d9e4..ad7e3ad504 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
+++ b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
@@ -12,14 +12,8 @@
     <EmbeddedResource Include="..\Avalonia.RenderTests\**\*.ttf" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
     <ProjectReference Include="..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
   </ItemGroup>
diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
deleted file mode 100644
index 3b0b082093..0000000000
--- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\UnitTests.NetFX.props" />
-  <Import Project="..\..\build\Moq.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-</Project>
diff --git a/tests/Avalonia.Input.UnitTests/GesturesTests.cs b/tests/Avalonia.Input.UnitTests/GesturesTests.cs
deleted file mode 100644
index b2687c2555..0000000000
--- a/tests/Avalonia.Input.UnitTests/GesturesTests.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Controls;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class GesturesTests
-    {
-        private MouseTestHelper _mouse = new MouseTestHelper();
-        
-        [Fact]
-        public void Tapped_Should_Follow_Pointer_Pressed_Released()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var result = new List<string>();
-
-            AddHandlers(decorator, border, result, false);
-
-            _mouse.Click(border);
-
-            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt" }, result);
-        }
-
-        [Fact]
-        public void Tapped_Should_Be_Raised_Even_When_Pressed_Released_Handled()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var result = new List<string>();
-
-            AddHandlers(decorator, border, result, true);
-
-            _mouse.Click(border);
-
-            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt" }, result);
-        }
-
-        [Fact]
-        public void Tapped_Should_Not_Be_Raised_For_Middle_Button()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var raised = false;
-
-            decorator.AddHandler(Gestures.TappedEvent, (s, e) => raised = true);
-
-            _mouse.Click(border, MouseButton.Middle);
-
-            Assert.False(raised);
-        }
-
-        [Fact]
-        public void Tapped_Should_Not_Be_Raised_For_Right_Button()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var raised = false;
-
-            decorator.AddHandler(Gestures.TappedEvent, (s, e) => raised = true);
-
-            _mouse.Click(border, MouseButton.Right);
-
-            Assert.False(raised);
-        }
-
-        [Fact]
-        public void RightTapped_Should_Be_Raised_For_Right_Button()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var raised = false;
-
-            decorator.AddHandler(Gestures.RightTappedEvent, (s, e) => raised = true);
-
-            _mouse.Click(border, MouseButton.Right);
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void DoubleTapped_Should_Follow_Pointer_Pressed_Released_Pressed()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var result = new List<string>();
-
-            AddHandlers(decorator, border, result, false);
-
-            _mouse.Click(border);
-            _mouse.Down(border, clickCount: 2);
-
-            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt", "bp", "dp", "bdt", "ddt" }, result);
-        }
-
-        [Fact]
-        public void DoubleTapped_Should_Be_Raised_Even_When_Pressed_Released_Handled()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var result = new List<string>();
-
-            AddHandlers(decorator, border, result, true);
-
-            _mouse.Click(border);
-            _mouse.Down(border, clickCount: 2);
-
-            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt", "bp", "dp", "bdt", "ddt" }, result);
-        }
-
-        [Fact]
-        public void DoubleTapped_Should_Not_Be_Raised_For_Middle_Button()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var raised = false;
-
-            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => raised = true);
-
-            _mouse.Click(border, MouseButton.Middle);
-            _mouse.Down(border, MouseButton.Middle, clickCount: 2);
-
-            Assert.False(raised);
-        }
-
-        [Fact]
-        public void DoubleTapped_Should_Not_Be_Raised_For_Right_Button()
-        {
-            Border border = new Border();
-            var decorator = new Decorator
-            {
-                Child = border
-            };
-            var raised = false;
-
-            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => raised = true);
-
-            _mouse.Click(border, MouseButton.Right);
-            _mouse.Down(border, MouseButton.Right, clickCount: 2);
-
-            Assert.False(raised);
-        }
-
-        private void AddHandlers(
-            Decorator decorator,
-            Border border,
-            IList<string> result,
-            bool markHandled)
-        {
-            decorator.AddHandler(Border.PointerPressedEvent, (s, e) =>
-            {
-                result.Add("dp");
-
-                if (markHandled)
-                {
-                    e.Handled = true;
-                }
-            });
-
-            decorator.AddHandler(Border.PointerReleasedEvent, (s, e) =>
-            {
-                result.Add("dr");
-
-                if (markHandled)
-                {
-                    e.Handled = true;
-                }
-            });
-
-            border.AddHandler(Border.PointerPressedEvent, (s, e) => result.Add("bp"));
-            border.AddHandler(Border.PointerReleasedEvent, (s, e) => result.Add("br"));
-
-            decorator.AddHandler(Gestures.TappedEvent, (s, e) => result.Add("dt"));
-            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => result.Add("ddt"));
-            border.AddHandler(Gestures.TappedEvent, (s, e) => result.Add("bt"));
-            border.AddHandler(Gestures.DoubleTappedEvent, (s, e) => result.Add("bdt"));
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/InputElement_Enabled.cs b/tests/Avalonia.Input.UnitTests/InputElement_Enabled.cs
deleted file mode 100644
index 11d68d307e..0000000000
--- a/tests/Avalonia.Input.UnitTests/InputElement_Enabled.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class InputElement_Enabled
-    {
-        [Fact]
-        public void IsEffectivelyEnabled_Follows_IsEnabled()
-        {
-            var target = new Decorator();
-
-            Assert.True(target.IsEnabled);
-            Assert.True(target.IsEffectivelyEnabled);
-
-            target.IsEnabled = false;
-
-            Assert.False(target.IsEnabled);
-            Assert.False(target.IsEffectivelyEnabled);
-        }
-
-        [Fact]
-        public void IsEffectivelyEnabled_Follows_Ancestor_IsEnabled()
-        {
-            Decorator child;
-            Decorator grandchild;
-            var target = new Decorator
-            {
-                Child = child = new Decorator
-                {
-                    Child = grandchild = new Decorator(),
-                }
-            };
-
-            Assert.True(target.IsEnabled);
-            Assert.True(target.IsEffectivelyEnabled);
-            Assert.True(child.IsEnabled);
-            Assert.True(child.IsEffectivelyEnabled);
-            Assert.True(grandchild.IsEnabled);
-            Assert.True(grandchild.IsEffectivelyEnabled);
-
-            target.IsEnabled = false;
-
-            Assert.False(target.IsEnabled);
-            Assert.False(target.IsEffectivelyEnabled);
-            Assert.True(child.IsEnabled);
-            Assert.False(child.IsEffectivelyEnabled);
-            Assert.True(grandchild.IsEnabled);
-            Assert.False(grandchild.IsEffectivelyEnabled);
-        }
-
-        [Fact]
-        public void Disabled_Pseudoclass_Follows_IsEffectivelyEnabled()
-        {
-            Decorator child;
-            var target = new Decorator
-            {
-                Child = child = new Decorator()
-            };
-
-            Assert.DoesNotContain(":disabled", child.Classes);
-
-            target.IsEnabled = false;
-
-            Assert.Contains(":disabled", child.Classes);
-        }
-
-        [Fact]
-        public void IsEffectivelyEnabled_Respects_IsEnabledCore()
-        {
-            Decorator child;
-            var target = new TestControl
-            {
-                Child = child = new Decorator()
-            };
-
-            target.ShouldEnable = false;
-
-            Assert.True(target.IsEnabled);
-            Assert.False(target.IsEffectivelyEnabled);
-            Assert.True(child.IsEnabled);
-            Assert.False(child.IsEffectivelyEnabled);
-        }
-
-        private class TestControl : Decorator
-        {
-            private bool _shouldEnable;
-
-            public bool ShouldEnable
-            {
-                get => _shouldEnable;
-                set { _shouldEnable = value; UpdateIsEffectivelyEnabled(); }
-            }
-
-            protected override bool IsEnabledCore => IsEnabled && _shouldEnable; 
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/InputElement_Focus.cs b/tests/Avalonia.Input.UnitTests/InputElement_Focus.cs
deleted file mode 100644
index 602455ba36..0000000000
--- a/tests/Avalonia.Input.UnitTests/InputElement_Focus.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class InputElement_Focus
-    {
-        [Fact]
-        public void Focus_Should_Set_FocusManager_Current()
-        {
-            Button target;
-
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var root = new TestRoot
-                {
-                    Child = target = new Button()
-                };
-
-                target.Focus();
-
-                Assert.Same(target, FocusManager.Instance.Current);
-            }
-        }
-
-        [Fact]
-        public void Focus_Should_Be_Cleared_When_Control_Is_Removed_From_VisualTree()
-        {
-            Button target;
-
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var root = new TestRoot
-                {
-                    Child = target = new Button()
-                };
-
-                target.Focus();
-                root.Child = null;
-
-                Assert.Null(FocusManager.Instance.Current);
-            }
-        }
-
-        [Fact]
-        public void Focus_Pseudoclass_Should_Be_Applied_On_Focus()
-        {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var target1 = new Decorator();
-                var target2 = new Decorator();
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            target1,
-                            target2
-                        }
-                    }
-                };
-
-                target1.ApplyTemplate();
-                target2.ApplyTemplate();
-
-
-                FocusManager.Instance?.Focus(target1);
-                Assert.True(target1.IsFocused);
-                Assert.True(target1.Classes.Contains(":focus"));
-                Assert.False(target2.IsFocused);
-                Assert.False(target2.Classes.Contains(":focus"));
-
-                FocusManager.Instance?.Focus(target2, NavigationMethod.Tab);
-                Assert.False(target1.IsFocused);
-                Assert.False(target1.Classes.Contains(":focus"));
-                Assert.True(target2.IsFocused);
-                Assert.True(target2.Classes.Contains(":focus"));
-            }
-        }
-
-        [Fact]
-        public void Control_FocusVsisible_Pseudoclass_Should_Be_Applied_On_Tab_And_DirectionalFocus()
-        {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var target1 = new Decorator();
-                var target2 = new Decorator();
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            target1,
-                            target2
-                        }
-                    }
-                };
-
-                target1.ApplyTemplate();
-                target2.ApplyTemplate();
-
-                FocusManager.Instance?.Focus(target1);
-                Assert.True(target1.IsFocused);
-                Assert.False(target1.Classes.Contains(":focus-visible"));
-                Assert.False(target2.IsFocused);
-                Assert.False(target2.Classes.Contains(":focus-visible"));
-
-                FocusManager.Instance?.Focus(target2, NavigationMethod.Tab);
-                Assert.False(target1.IsFocused);
-                Assert.False(target1.Classes.Contains(":focus-visible"));
-                Assert.True(target2.IsFocused);
-                Assert.True(target2.Classes.Contains(":focus-visible"));
-
-                FocusManager.Instance?.Focus(target1, NavigationMethod.Directional);
-                Assert.True(target1.IsFocused);
-                Assert.True(target1.Classes.Contains(":focus-visible"));
-                Assert.False(target2.IsFocused);
-                Assert.False(target2.Classes.Contains(":focus-visible"));
-            }
-        }
-        
-        [Fact]
-        public void Control_FocusWithin_PseudoClass_Should_Be_Applied()
-        {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var target1 = new Decorator();
-                var target2 = new Decorator();
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            target1,
-                            target2
-                        }
-                    }
-                };
-
-                target1.ApplyTemplate();
-                target2.ApplyTemplate();
-
-                FocusManager.Instance?.Focus(target1);
-                Assert.True(target1.IsFocused);
-                Assert.True(target1.Classes.Contains(":focus-within"));
-                Assert.True(target1.IsKeyboardFocusWithin);
-                Assert.True(root.Child.Classes.Contains(":focus-within"));
-                Assert.True(root.Child.IsKeyboardFocusWithin);
-                Assert.True(root.Classes.Contains(":focus-within"));
-                Assert.True(root.IsKeyboardFocusWithin);
-            }
-        }
-        
-        [Fact]
-        public void Control_FocusWithin_PseudoClass_Should_Be_Applied_and_Removed()
-        {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var target1 = new Decorator();
-                var target2 = new Decorator();
-                var panel1 = new Panel { Children = { target1 } };
-                var panel2 = new Panel { Children = { target2 } };
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            panel1,
-                            panel2
-                        }
-                    }
-                };
-                
-                target1.ApplyTemplate();
-                target2.ApplyTemplate();
-
-                FocusManager.Instance?.Focus(target1);
-                Assert.True(target1.IsFocused);
-                Assert.True(target1.Classes.Contains(":focus-within"));
-                Assert.True(target1.IsKeyboardFocusWithin);
-                Assert.True(panel1.Classes.Contains(":focus-within"));
-                Assert.True(panel1.IsKeyboardFocusWithin);
-                Assert.True(root.Child.Classes.Contains(":focus-within"));
-                Assert.True(root.Child.IsKeyboardFocusWithin);
-                Assert.True(root.Classes.Contains(":focus-within"));
-                Assert.True(root.IsKeyboardFocusWithin);
-                
-                FocusManager.Instance?.Focus(target2);
-                
-                Assert.False(target1.IsFocused);
-                Assert.False(target1.Classes.Contains(":focus-within"));
-                Assert.False(target1.IsKeyboardFocusWithin);
-                Assert.False(panel1.Classes.Contains(":focus-within"));
-                Assert.False(panel1.IsKeyboardFocusWithin);
-                Assert.True(root.Child.Classes.Contains(":focus-within"));
-                Assert.True(root.Child.IsKeyboardFocusWithin);
-                Assert.True(root.Classes.Contains(":focus-within"));
-                Assert.True(root.IsKeyboardFocusWithin);
-                
-                Assert.True(target2.IsFocused);
-                Assert.True(target2.Classes.Contains(":focus-within"));
-                Assert.True(target2.IsKeyboardFocusWithin);
-                Assert.True(panel2.Classes.Contains(":focus-within"));
-                Assert.True(panel2.IsKeyboardFocusWithin);
-            }
-        }
-        
-        [Fact]
-        public void Control_FocusWithin_Pseudoclass_Should_Be_Removed_When_Removed_From_Tree()
-        {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var target1 = new Decorator();
-                var target2 = new Decorator();
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            target1,
-                            target2
-                        }
-                    }
-                };
-
-                target1.ApplyTemplate();
-                target2.ApplyTemplate();
-
-                FocusManager.Instance?.Focus(target1);
-                Assert.True(target1.IsFocused);
-                Assert.True(target1.Classes.Contains(":focus-within"));
-                Assert.True(target1.IsKeyboardFocusWithin);
-                Assert.True(root.Child.Classes.Contains(":focus-within"));
-                Assert.True(root.Child.IsKeyboardFocusWithin);
-                Assert.True(root.Classes.Contains(":focus-within"));
-                Assert.True(root.IsKeyboardFocusWithin);
-
-                Assert.Equal(KeyboardDevice.Instance.FocusedElement, target1);
-                
-                root.Child = null;
-                
-                Assert.Null(KeyboardDevice.Instance.FocusedElement);
-                
-                Assert.False(target1.IsFocused);
-                Assert.False(target1.Classes.Contains(":focus-within"));
-                Assert.False(target1.IsKeyboardFocusWithin);
-                Assert.False(root.Classes.Contains(":focus-within"));
-                Assert.False(root.IsKeyboardFocusWithin);
-            }
-        }
-        
-        [Fact]
-        public void Control_FocusWithin_Pseudoclass_Should_Be_Removed_Focus_Moves_To_Different_Root()
-        {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var target1 = new Decorator();
-                var target2 = new Decorator();
-                
-                var root1 = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            target1,
-                        }
-                    }
-                };
-                
-                var root2 = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            target2,
-                        }
-                    }
-                };
-
-                target1.ApplyTemplate();
-                target2.ApplyTemplate();
-
-                FocusManager.Instance?.Focus(target1);
-                Assert.True(target1.IsFocused);
-                Assert.True(target1.Classes.Contains(":focus-within"));
-                Assert.True(target1.IsKeyboardFocusWithin);
-                Assert.True(root1.Child.Classes.Contains(":focus-within"));
-                Assert.True(root1.Child.IsKeyboardFocusWithin);
-                Assert.True(root1.Classes.Contains(":focus-within"));
-                Assert.True(root1.IsKeyboardFocusWithin);
-
-                Assert.Equal(KeyboardDevice.Instance.FocusedElement, target1);
-                
-                FocusManager.Instance?.Focus(target2);
-                
-                Assert.False(target1.IsFocused);
-                Assert.False(target1.Classes.Contains(":focus-within"));
-                Assert.False(target1.IsKeyboardFocusWithin);
-                Assert.False(root1.Child.Classes.Contains(":focus-within"));
-                Assert.False(root1.Child.IsKeyboardFocusWithin);
-                Assert.False(root1.Classes.Contains(":focus-within"));
-                Assert.False(root1.IsKeyboardFocusWithin);
-                
-                Assert.True(target2.IsFocused);
-                Assert.True(target2.Classes.Contains(":focus-within"));
-                Assert.True(target2.IsKeyboardFocusWithin);
-                Assert.True(root2.Child.Classes.Contains(":focus-within"));
-                Assert.True(root2.Child.IsKeyboardFocusWithin);
-                Assert.True(root2.Classes.Contains(":focus-within"));
-                Assert.True(root2.IsKeyboardFocusWithin);
-            }
-        }
-
-        [Fact]
-        public void Can_Clear_Focus()
-        {
-            Button target;
-
-            using (UnitTestApplication.Start(TestServices.RealFocus))
-            {
-                var root = new TestRoot
-                {
-                    Child = target = new Button()
-                };
-
-                target.Focus();
-                FocusManager.Instance.Focus(null);
-
-                Assert.Null(FocusManager.Instance.Current);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs b/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs
deleted file mode 100644
index 90f9a0a985..0000000000
--- a/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Collections.Generic;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class KeyGestureTests
-    {
-        public static readonly IEnumerable<object[]> ParseData = new object[][]
-        {
-            new object[]{"Ctrl+A", new KeyGesture(Key.A, KeyModifiers.Control)},
-            new object[]{"  \tShift\t+Alt +B", new KeyGesture(Key.B, KeyModifiers.Shift | KeyModifiers.Alt) },
-            new object[]{"Control++", new KeyGesture(Key.OemPlus, KeyModifiers.Control) },
-            new object[]{ "Shift+⌘+A", new KeyGesture(Key.A, KeyModifiers.Meta | KeyModifiers.Shift) },
-            new object[]{ "Shift+Cmd+A", new KeyGesture(Key.A, KeyModifiers.Meta | KeyModifiers.Shift) },
-        };
-
-        public static readonly IEnumerable<object[]> ToStringData = new object[][]
-        {
-            new object[]{new KeyGesture(Key.A), "A"},
-            new object[]{new KeyGesture(Key.A, KeyModifiers.Control), "Ctrl+A"},
-            new object[]{new KeyGesture(Key.A, KeyModifiers.Control | KeyModifiers.Shift), "Ctrl+Shift+A"},
-            new object[]{new KeyGesture(Key.A, KeyModifiers.Alt | KeyModifiers.Shift), "Shift+Alt+A"},
-            new object[]{new KeyGesture(Key.A, KeyModifiers.Control | KeyModifiers.Alt | KeyModifiers.Shift), "Ctrl+Shift+Alt+A"},
-            new object[]{new KeyGesture(Key.A, KeyModifiers.Meta | KeyModifiers.Shift), "Shift+Cmd+A"},
-        };
-
-        [Theory]
-        [MemberData(nameof(ParseData))]
-        public void Key_Gesture_Is_Able_To_Parse_Sample_Data(string text, KeyGesture gesture)
-        {
-            Assert.Equal(gesture, KeyGesture.Parse(text));
-        }
-
-        [Theory]
-        [InlineData(Key.OemMinus, Key.Subtract)]
-        [InlineData(Key.OemPlus, Key.Add)]
-        [InlineData(Key.OemPeriod, Key.Decimal)]
-        public void Key_Gesture_Matches_NumPad_To_Regular_Digit(Key gestureKey, Key pressedKey)
-        {
-            var keyGesture = new KeyGesture(gestureKey);
-
-            Assert.True(keyGesture.Matches(new KeyEventArgs
-            {
-                Key = pressedKey
-            }));
-        }
-
-        [Theory]
-        [MemberData(nameof(ToStringData))]
-        public void ToString_Produces_Correct_Results(KeyGesture gesture, string expected)
-        {
-            Assert.Equal(expected, gesture.ToString());
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs b/tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs
deleted file mode 100644
index 32ba14d337..0000000000
--- a/tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using System;
-using System.Windows.Input;
-using Avalonia.Controls;
-using Avalonia.Input.Raw;
-using Avalonia.UnitTests;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class KeyboardDeviceTests
-    {
-        [Fact]
-        public void Keypresses_Should_Be_Sent_To_Root_If_No_Focused_Element()
-        {
-            var target = new KeyboardDevice();
-            var root = new Mock<IInputRoot>();
-
-            target.ProcessRawEvent(
-                new RawKeyEventArgs(
-                    target,
-                    0,
-                    root.Object,
-                    RawKeyEventType.KeyDown,
-                    Key.A,
-                    RawInputModifiers.None));
-
-            root.Verify(x => x.RaiseEvent(It.IsAny<KeyEventArgs>()));
-        }
-
-        [Fact]
-        public void Keypresses_Should_Be_Sent_To_Focused_Element()
-        {
-            var target = new KeyboardDevice();
-            var focused = new Mock<IInputElement>();
-            var root = Mock.Of<IInputRoot>();
-
-            target.SetFocusedElement(
-                focused.Object,
-                NavigationMethod.Unspecified,
-                KeyModifiers.None);
-
-            target.ProcessRawEvent(
-                new RawKeyEventArgs(
-                    target,
-                    0,
-                    root,
-                    RawKeyEventType.KeyDown,
-                    Key.A,
-                    RawInputModifiers.None));
-
-            focused.Verify(x => x.RaiseEvent(It.IsAny<KeyEventArgs>()));
-        }
-
-        [Fact]
-        public void TextInput_Should_Be_Sent_To_Root_If_No_Focused_Element()
-        {
-            var target = new KeyboardDevice();
-            var root = new Mock<IInputRoot>();
-
-            target.ProcessRawEvent(
-                new RawTextInputEventArgs(
-                    target,
-                    0,
-                    root.Object,
-                    "Foo"));
-
-            root.Verify(x => x.RaiseEvent(It.IsAny<TextInputEventArgs>()));
-        }
-
-        [Fact]
-        public void TextInput_Should_Be_Sent_To_Focused_Element()
-        {
-            var target = new KeyboardDevice();
-            var focused = new Mock<IInputElement>();
-            var root = Mock.Of<IInputRoot>();
-
-            target.SetFocusedElement(
-                focused.Object,
-                NavigationMethod.Unspecified,
-                KeyModifiers.None);
-
-            target.ProcessRawEvent(
-                new RawTextInputEventArgs(
-                    target,
-                    0,
-                    root,
-                    "Foo"));
-
-            focused.Verify(x => x.RaiseEvent(It.IsAny<TextInputEventArgs>()));
-        }
-
-        [Fact]
-        public void Can_Change_KeyBindings_In_Keybinding_Event_Handler()
-        {
-            var target = new KeyboardDevice();
-            var button = new Button();
-            var root = new TestRoot(button);
-            var raised = 0;
-
-            button.KeyBindings.Add(new KeyBinding
-            {
-                Gesture = new KeyGesture(Key.O, KeyModifiers.Control),
-                Command = new DelegateCommand(() =>
-                {
-                    button.KeyBindings.Clear();
-                    ++raised;
-                }),
-            });
-
-            target.SetFocusedElement(button, NavigationMethod.Pointer, 0);
-            target.ProcessRawEvent(
-                new RawKeyEventArgs(
-                    target,
-                    0,
-                    root,
-                    RawKeyEventType.KeyDown,
-                    Key.O,
-                    RawInputModifiers.Control));
-
-            Assert.Equal(1, raised);
-        }
-
-        private class DelegateCommand : ICommand
-        {
-            private readonly Action _action;
-            public DelegateCommand(Action action) => _action = action;
-            public event EventHandler CanExecuteChanged { add { } remove { } }
-            public bool CanExecute(object parameter) => true;
-            public void Execute(object parameter) => _action();
-        }
-
-        [Fact]
-        public void Control_Focus_Should_Be_Set_Before_FocusedElement_Raises_PropertyChanged()
-        {
-            var target = new KeyboardDevice();
-            var focused = new Mock<IInputElement>();
-            var root = Mock.Of<IInputRoot>();
-            var raised = 0;
-
-            target.PropertyChanged += (s, e) =>
-            {
-                if (e.PropertyName == nameof(target.FocusedElement))
-                {
-                    focused.Verify(x => x.RaiseEvent(It.IsAny<GotFocusEventArgs>()));
-                    ++raised;
-                }
-            };
-
-            target.SetFocusedElement(
-                focused.Object,
-                NavigationMethod.Unspecified,
-                KeyModifiers.None);
-
-            Assert.Equal(1, raised);
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs
deleted file mode 100644
index f9c85ee4ca..0000000000
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class KeyboardNavigationTests_Custom
-    {
-        [Fact]
-        public void Tab_Should_Custom_Navigate_Within_Children()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    (current = new Button { Content = "Button 1" }),
-                    new Button { Content = "Button 2" },
-                    (next = new Button { Content = "Button 3" }),
-                },
-                NextControl = next,
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Same(next, result);
-        }
-
-        [Fact]
-        public void Right_Should_Custom_Navigate_Within_Children()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    (current = new Button { Content = "Button 1" }),
-                    new Button { Content = "Button 2" },
-                    (next = new Button { Content = "Button 3" }),
-                },
-                NextControl = next,
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Right);
-
-            Assert.Same(next, result);
-        }
-
-        [Fact]
-        public void Tab_Should_Custom_Navigate_From_Outside()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    new Button { Content = "Button 1" },
-                    new Button { Content = "Button 2" },
-                    (next = new Button { Content = "Button 3" }),
-                },
-                NextControl = next,
-            };
-
-            var root = new StackPanel
-            {
-                Children =
-                {
-                    (current = new Button { Content = "Outside" }),
-                    target,
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Same(next, result);
-        }
-
-        [Fact]
-        public void Tab_Should_Custom_Navigate_From_Outside_When_Wrapping()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    new Button { Content = "Button 1" },
-                    new Button { Content = "Button 2" },
-                    (next = new Button { Content = "Button 3" }),
-                },
-                NextControl = next,
-            };
-
-            var root = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    target,
-                    (current = new Button { Content = "Outside" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Same(next, result);
-        }
-
-        [Fact]
-        public void ShiftTab_Should_Custom_Navigate_From_Outside()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    new Button { Content = "Button 1" },
-                    new Button { Content = "Button 2" },
-                    (next = new Button { Content = "Button 3" }),
-                },
-                NextControl = next,
-            };
-
-            var root = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    (current = new Button { Content = "Outside" }),
-                    target,
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Same(next, result);
-        }
-
-        [Fact]
-        public void ShiftTab_Should_Navigate_Outside_When_Null_Returned_As_Next()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    new Button { Content = "Button 1" },
-                    (current = new Button { Content = "Button 2" }),
-                    new Button { Content = "Button 3" },
-                },
-            };
-
-            var root = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    target,
-                    (next = new Button { Content = "Outside" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Same(next, result);
-        }
-
-        [Fact]
-        public void Tab_Should_Navigate_Outside_When_Null_Returned_As_Next()
-        {
-            Button current;
-            Button next;
-            var target = new CustomNavigatingStackPanel
-            {
-                Children =
-                {
-                    new Button { Content = "Button 1" },
-                    (current = new Button { Content = "Button 2" }),
-                    new Button { Content = "Button 3" },
-                },
-            };
-
-            var root = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    target,
-                    (next = new Button { Content = "Outside" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Same(next, result);
-        }
-
-        private class CustomNavigatingStackPanel : StackPanel, ICustomKeyboardNavigation
-        {
-            public bool CustomNavigates { get; set; } = true;
-            public IInputElement NextControl { get; set; }
-
-            public (bool handled, IInputElement next) GetNext(IInputElement element, NavigationDirection direction)
-            {
-                return (CustomNavigates, NextControl);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
deleted file mode 100644
index 9a117bb71d..0000000000
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
+++ /dev/null
@@ -1,1256 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class KeyboardNavigationTests_Tab
-    {
-        [Fact]
-        public void Next_Continue_Returns_Next_Control_In_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (current = new Button { Name = "Button2" }),
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Continue_Returns_First_Control_In_Next_Sibling_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (current = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (next = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Skips_Unfocusable_Siblings()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            new StackPanel
-                            {
-                                Children =
-                                {
-                                    (current = new Button { Name = "Button3" }),
-                                }
-                            },
-                            new TextBlock { Name = "TextBlock" },
-                            (next = new Button { Name = "Button4" }),
-                        }
-                    },
-                    new Button { Name = "Button5" },
-                    new Button { Name = "Button6" },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Continue_Doesnt_Enter_Panel_With_TabNavigation_None()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (next = new Button { Name = "Button1" }),
-                            new Button { Name = "Button2" },
-                            (current = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
-                        Children =
-                        {
-                            new StackPanel
-                            {
-                                Children =
-                                {
-                                    new Button { Name = "Button4" },
-                                    new Button { Name = "Button5" },
-                                    new Button { Name = "Button6" },
-                                }
-                            },
-                        }
-                    }
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Continue_Returns_Next_Sibling()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (current = new Button { Name = "Button3" }),
-                        }
-                    },
-                    (next = new Button { Name = "Button4" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Skips_Non_TabStop_Siblings()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (current = new Button { Name = "Button3" }),
-                            new Button { Name="Button4", [KeyboardNavigation.IsTabStopProperty] = false }
-                        }
-                    },
-                    (next = new Button { Name = "Button5" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Continue_Returns_First_Control_In_Next_Uncle_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new StackPanel
-                            {
-                                Children =
-                                {
-                                    new Button { Name = "Button1" },
-                                    new Button { Name = "Button2" },
-                                    (current = new Button { Name = "Button3" }),
-                                }
-                            },
-                        },
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (next = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Continue_Returns_Child_Of_Top_Level()
-        {
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    (next = new Button { Name = "Button1" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(top, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Continue_Wraps()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new StackPanel
-                            {
-                                Children =
-                                {
-                                    (next = new Button { Name = "Button1" }),
-                                    new Button { Name = "Button2" },
-                                    new Button { Name = "Button3" },
-                                }
-                            },
-                        },
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            (current = new Button { Name = "Button6" }),
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Cycle_Returns_Next_Control_In_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (current = new Button { Name = "Button2" }),
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Cycle_Wraps_To_First()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children =
-                        {
-                            (next = new Button { Name = "Button1" }),
-                            new Button { Name = "Button2" },
-                            (current = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Contained_Returns_Next_Control_In_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (current = new Button { Name = "Button2" }),
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Contained_Stops_At_End()
-        {
-            Button current;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (current = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Null(result);
-        }
-
-        [Fact]
-        public void Next_Once_Moves_To_Next_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (current = new Button { Name = "Button2" }),
-                            new Button { Name = "Button3" },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (next = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_Once_Moves_To_Active_Element()
-        {
-            StackPanel container;
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    (container = new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (next = new Button { Name = "Button2" }),
-                            new Button { Name = "Button3" },
-                        }
-                    }),
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            (current = new Button { Name = "Button6" }),
-                        }
-                    },
-                }
-            };
-
-            KeyboardNavigation.SetTabOnceActiveElement(container, next);
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_None_Moves_To_Next_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (current = new Button { Name = "Button2" }),
-                            new Button { Name = "Button3" },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (next = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Next_None_Skips_Container()
-        {
-            StackPanel container;
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    (container = new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            new Button { Name = "Button3" },
-                        }
-                    }),
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (next = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            (current = new Button { Name = "Button6" }),
-                        }
-                    },
-                }
-            };
-
-            KeyboardNavigation.SetTabOnceActiveElement(container, next);
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Continue_Returns_Previous_Control_In_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (next = new Button { Name = "Button2" }),
-                            (current = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Continue_Returns_Last_Control_In_Previous_Sibling_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (current = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Continue_Returns_Last_Child_Of_Sibling()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    (current = new Button { Name = "Button4" }),
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Continue_Returns_Last_Control_In_Previous_Nephew_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new StackPanel
-                            {
-                                Children =
-                                {
-                                    new Button { Name = "Button1" },
-                                    new Button { Name = "Button2" },
-                                    (next = new Button { Name = "Button3" }),
-                                }
-                            },
-                        },
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (current = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Continue_Wraps()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new StackPanel
-                            {
-                                Children =
-                                {
-                                    (current = new Button { Name = "Button1" }),
-                                    new Button { Name = "Button2" },
-                                    new Button { Name = "Button3" },
-                                }
-                            },
-                        },
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            (next = new Button { Name = "Button6" }),
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Continue_Returns_Parent()
-        {
-            Button current;
-
-            var top = new Decorator
-            {
-                Focusable = true,
-                Child = current = new Button
-                {
-                    Name = "Button",
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(top, result);
-        }
-
-        [Fact]
-        public void Previous_Cycle_Returns_Previous_Control_In_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children =
-                        {
-                            (next = new Button { Name = "Button1" }),
-                            (current = new Button { Name = "Button2" }),
-                            new Button { Name = "Button3" },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Cycle_Wraps_To_Last()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children =
-                        {
-                            (current = new Button { Name = "Button1" }),
-                            new Button { Name = "Button2" },
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Contained_Returns_Previous_Control_In_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children =
-                        {
-                            (next = new Button { Name = "Button1" }),
-                            (current = new Button { Name = "Button2" }),
-                            new Button { Name = "Button3" },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Contained_Stops_At_Beginning()
-        {
-            Button current;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children =
-                        {
-                            (current = new Button { Name = "Button1" }),
-                            new Button { Name = "Button2" },
-                            new Button { Name = "Button3" },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Null(result);
-        }
-
-        [Fact]
-        public void Previous_Once_Moves_To_Previous_Container()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            new Button { Name = "Button2" },
-                            (next = new Button { Name = "Button3" }),
-                        }
-                    },
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children =
-                        {
-                            new Button { Name = "Button4" },
-                            (current = new Button { Name = "Button5" }),
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Once_Moves_To_Active_Element()
-        {
-            StackPanel container;
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    (container = new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children =
-                        {
-                            new Button { Name = "Button1" },
-                            (next = new Button { Name = "Button2" }),
-                            new Button { Name = "Button3" },
-                        }
-                    }),
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (current = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            KeyboardNavigation.SetTabOnceActiveElement(container, next);
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Once_Moves_To_First_Element()
-        {
-            Button current;
-            Button next;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children =
-                        {
-                            (next = new Button { Name = "Button1" }),
-                            new Button { Name = "Button2" },
-                            new Button { Name = "Button3" },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            (current = new Button { Name = "Button4" }),
-                            new Button { Name = "Button5" },
-                            new Button { Name = "Button6" },
-                        }
-                    },
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Equal(next, result);
-        }
-
-        [Fact]
-        public void Previous_Contained_Doesnt_Select_Child_Control()
-        {
-            Decorator current;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                Children =
-                {
-                    (current = new Decorator
-                    {
-                        Focusable = true,
-                        Child = new Button(),
-                    })
-                }
-            };
-
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-
-            Assert.Null(result);
-        }
-
-        [Fact]
-        public void Respects_TabIndex_Moving_Forwards()
-        {
-            Button start;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1", TabIndex = 5 },
-                            (start = new Button { Name = "Button2", TabIndex = 2 }),
-                            new Button { Name = "Button3", TabIndex = 1 },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4", TabIndex = 3  },
-                            new Button { Name = "Button5", TabIndex = 6  },
-                            new Button { Name = "Button6", TabIndex = 4  },
-                        }
-                    },
-                }
-            };
-
-            var result = new List<string>();
-            var current = (IInputElement)start;
-
-            do
-            {
-                result.Add(((IControl)current).Name);
-                current = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-            } while (current is object && current != start);
-
-            Assert.Equal(new[]
-            {
-                "Button2", "Button4", "Button6", "Button1", "Button5", "Button3"
-            }, result);
-        }
-
-        [Fact]
-        public void Respects_TabIndex_Moving_Backwards()
-        {
-            Button start;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button1", TabIndex = 5 },
-                            (start = new Button { Name = "Button2", TabIndex = 2 }),
-                            new Button { Name = "Button3", TabIndex = 1 },
-                        }
-                    },
-                    new StackPanel
-                    {
-                        Children =
-                        {
-                            new Button { Name = "Button4", TabIndex = 3  },
-                            new Button { Name = "Button5", TabIndex = 6  },
-                            new Button { Name = "Button6", TabIndex = 4  },
-                        }
-                    },
-                }
-            };
-
-            var result = new List<string>();
-            var current = (IInputElement)start;
-
-            do
-            {
-                result.Add(((IControl)current).Name);
-                current = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
-            } while (current is object && current != start);
-
-            Assert.Equal(new[]
-            {
-                "Button2", "Button3", "Button5", "Button1", "Button6", "Button4"
-            }, result);
-        }
-
-        [Fact]
-        public void Cannot_Focus_Child_Of_Disabled_Control()
-        {
-            Button start;
-            Button expected;
-
-            var top = new StackPanel
-            {
-                [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                Children =
-                {
-                    (start = new Button { Name = "Button1" }),
-                    new Border
-                    {
-                        IsEnabled = false,
-                        Child = new Button { Name = "Button2" },
-                    },
-                    (expected = new Button { Name = "Button3" }),
-                }
-            };
-
-            var current = (IInputElement)start;
-            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
-
-            Assert.Same(expected, result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs b/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
deleted file mode 100644
index 223f458f25..0000000000
--- a/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input.Raw;
-using Avalonia.Interactivity;
-using Avalonia.Media;
-using Avalonia.Rendering;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Moq;
-using System;
-using System.Collections.Generic;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class MouseDeviceTests
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        [Fact]
-        public void Capture_Is_Transferred_To_Parent_When_Control_Removed()
-        {
-            Canvas control;
-            var root = new TestRoot
-            {
-                Child = control = new Canvas(),
-            };
-            var target = new MouseDevice();
-
-            target.Capture(control);
-            Assert.Same(control, target.Captured);
-
-            root.Child = null;
-
-            Assert.Same(root, target.Captured);
-        }
-#pragma warning restore CS0618 // Type or member is obsolete
-
-        [Fact]
-        public void MouseMove_Should_Update_IsPointerOver()
-        {
-            var renderer = new Mock<IRenderer>();
-
-            using (TestApplication(renderer.Object))
-            {
-                var inputManager = InputManager.Instance;
-
-                Canvas canvas;
-                Border border;
-                Decorator decorator;
-
-                var root = new TestRoot
-                {
-                    MouseDevice = new MouseDevice(),
-                    Renderer = renderer.Object,
-                    Child = new Panel
-                    {
-                        Children =
-                        {
-                            (canvas = new Canvas()),
-                            (border = new Border
-                            {
-                                Child = decorator = new Decorator(),
-                            })
-                        }
-                    }
-                };
-
-                SetHit(renderer, decorator);
-                SendMouseMove(inputManager, root);
-
-                Assert.True(decorator.IsPointerOver);
-                Assert.True(border.IsPointerOver);
-                Assert.False(canvas.IsPointerOver);
-                Assert.True(root.IsPointerOver);
-
-                SetHit(renderer, canvas);
-                SendMouseMove(inputManager, root);
-
-                Assert.False(decorator.IsPointerOver);
-                Assert.False(border.IsPointerOver);
-                Assert.True(canvas.IsPointerOver);
-                Assert.True(root.IsPointerOver);
-            }
-        }
-
-        [Fact]
-        public void IsPointerOver_Should_Be_Updated_When_Child_Sets_Handled_True()
-        {
-            var renderer = new Mock<IRenderer>();
-
-            using (TestApplication(renderer.Object))
-            {
-                var inputManager = InputManager.Instance;
-
-                Canvas canvas;
-                Border border;
-                Decorator decorator;
-
-                var root = new TestRoot
-                {
-                    MouseDevice = new MouseDevice(),
-                    Renderer = renderer.Object,
-                    Child = new Panel
-                    {
-                        Children =
-                        {
-                            (canvas = new Canvas()),
-                            (border = new Border
-                            {
-                                Child = decorator = new Decorator(),
-                            })
-                        }
-                    }
-                };
-
-                SetHit(renderer, canvas);
-                SendMouseMove(inputManager, root);
-
-                Assert.False(decorator.IsPointerOver);
-                Assert.False(border.IsPointerOver);
-                Assert.True(canvas.IsPointerOver);
-                Assert.True(root.IsPointerOver);
-
-                // Ensure that e.Handled is reset between controls.
-                decorator.PointerEnter += (s, e) => e.Handled = true;
-
-                SetHit(renderer, decorator);
-                SendMouseMove(inputManager, root);
-
-                Assert.True(decorator.IsPointerOver);
-                Assert.True(border.IsPointerOver);
-                Assert.False(canvas.IsPointerOver);
-                Assert.True(root.IsPointerOver);
-            }
-        }
-
-        [Fact]
-        public void PointerEnter_Leave_Should_Be_Raised_In_Correct_Order()
-        {
-            var renderer = new Mock<IRenderer>();
-            var result = new List<(object, string)>();
-
-            void HandleEvent(object sender, PointerEventArgs e)
-            {
-                result.Add((sender, e.RoutedEvent.Name));
-            }
-
-            using (TestApplication(renderer.Object))
-            {
-                var inputManager = InputManager.Instance;
-
-                Canvas canvas;
-                Border border;
-                Decorator decorator;
-
-                var root = new TestRoot
-                {
-                    MouseDevice = new MouseDevice(),
-                    Renderer = renderer.Object,
-                    Child = new Panel
-                    {
-                        Children =
-                        {
-                            (canvas = new Canvas()),
-                            (border = new Border
-                            {
-                                Child = decorator = new Decorator(),
-                            })
-                        }
-                    }
-                };
-
-                SetHit(renderer, canvas);
-                SendMouseMove(inputManager, root);
-
-                AddEnterLeaveHandlers(HandleEvent, root, canvas, border, decorator);
-                SetHit(renderer, decorator);
-                SendMouseMove(inputManager, root);
-
-                Assert.Equal(
-                    new[]
-                    {
-                        ((object)canvas, "PointerLeave"),
-                        ((object)decorator, "PointerEnter"),
-                        ((object)border, "PointerEnter"),
-                    },
-                    result);
-            }
-        }
-
-
-        [Fact]
-        public void GetPosition_Should_Respect_Control_RenderTransform()
-        {
-            var renderer = new Mock<IRenderer>();
-
-            using (TestApplication(renderer.Object))
-            {
-                var inputManager = InputManager.Instance;
-
-                var root = new TestRoot
-                {
-                    MouseDevice = new MouseDevice(),
-                    Child = new Border
-                    {
-                        Background = Brushes.Black,
-                        RenderTransform = new TranslateTransform(10, 0),
-                    }
-                };
-
-                SendMouseMove(inputManager, root, new Point(11, 11));
-
-#pragma warning disable CS0618 // Type or member is obsolete
-                var result = root.MouseDevice.GetPosition(root.Child);
-#pragma warning restore CS0618 // Type or member is obsolete
-                Assert.Equal(new Point(1, 11), result);
-            }
-        }
-
-        private void AddEnterLeaveHandlers(
-            EventHandler<PointerEventArgs> handler,
-            params IControl[] controls)
-        {
-            foreach (var c in controls)
-            {
-                c.PointerEnter += handler;
-                c.PointerLeave += handler;
-            }
-        }
-
-        private void SendMouseMove(IInputManager inputManager, TestRoot root, Point p = new Point())
-        {
-            inputManager.ProcessInput(new RawPointerEventArgs(
-                root.MouseDevice,
-                0,
-                root,
-                RawPointerEventType.Move,
-                p,
-                RawInputModifiers.None));
-        }
-
-        private void SetHit(Mock<IRenderer> renderer, IControl hit)
-        {
-            renderer.Setup(x => x.HitTest(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
-                .Returns(new[] { hit });
-
-            renderer.Setup(x => x.HitTestFirst(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
-                .Returns(hit);
-        }
-
-        private IDisposable TestApplication(IRenderer renderer)
-        {
-            return UnitTestApplication.Start(
-                new TestServices(inputManager: new InputManager()));
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/PointerTests.cs b/tests/Avalonia.Input.UnitTests/PointerTests.cs
deleted file mode 100644
index e639726dbd..0000000000
--- a/tests/Avalonia.Input.UnitTests/PointerTests.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class PointerTests
-    {
-        [Fact]
-        public void On_Capture_Transfer_PointerCaptureLost_Should_Propagate_Up_To_The_Common_Parent()
-        {
-            Border initialParent, initialCapture, newParent, newCapture;
-            var el = new StackPanel
-            {
-                Children =
-                {
-                    (initialParent = new Border { Child = initialCapture = new Border() }),
-                    (newParent = new Border { Child = newCapture = new Border() })
-                }
-            };
-            var receivers = new List<object>();
-            var root = new TestRoot(el);
-            foreach (InputElement d in root.GetSelfAndVisualDescendants())
-                d.PointerCaptureLost += (s, e) => receivers.Add(s);
-            var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
-            
-            pointer.Capture(initialCapture);
-            pointer.Capture(newCapture);
-            Assert.True(receivers.SequenceEqual(new[] { initialCapture, initialParent }));
-            
-            receivers.Clear();
-            pointer.Capture(null);
-            Assert.True(receivers.SequenceEqual(new object[] { newCapture, newParent, el, root }));
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Input.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3974559efc..0000000000
--- a/tests/Avalonia.Input.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using Xunit;
-
-[assembly: AssemblyTitle("Avalonia.Input.UnitTests")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs b/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs
index 15e22f4424..3eb8646835 100644
--- a/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs
@@ -29,6 +29,20 @@ namespace Avalonia.IntegrationTests.Appium
                 _ => throw new ArgumentOutOfRangeException($"Unexpected IsChecked value.")
             };
 
+        public static bool GetIsFocused(this AppiumWebElement element)
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                var active = element.WrappedDriver.SwitchTo().ActiveElement() as AppiumWebElement;
+                return element.Id == active?.Id;
+            }
+            else
+            {
+                // https://stackoverflow.com/questions/71807788/check-if-element-is-focused-in-appium
+                throw new NotSupportedException("Couldn't work out how to check if an element is focused on mac.");
+            }
+        }
+
         public static void SendClick(this AppiumWebElement element)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -44,6 +58,11 @@ namespace Avalonia.IntegrationTests.Appium
             }
         }
 
+        public static void MovePointerOver(this AppiumWebElement element)
+        {
+            new Actions(element.WrappedDriver).MoveToElement(element).Perform();
+        }
+
         public static string GetAttribute(AppiumWebElement element, string windows, string macOS)
         {
             return element.GetAttribute(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? windows : macOS);
diff --git a/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
index e9a433b975..98fb335061 100644
--- a/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
@@ -1,4 +1,7 @@
-using OpenQA.Selenium.Appium;
+using System.Threading;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Interactions;
 using Xunit;
 
 namespace Avalonia.IntegrationTests.Appium
@@ -15,6 +18,12 @@ namespace Avalonia.IntegrationTests.Appium
             var tabs = _session.FindElementByAccessibilityId("MainTabs");
             var tab = tabs.FindElementByName("Menu");
             tab.Click();
+
+            var reset = _session.FindElementByAccessibilityId("MenuClickedMenuItemReset");
+            reset.Click();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("None", clickedMenuItem.Text);
         }
 
         [Fact]
@@ -48,16 +57,107 @@ namespace Avalonia.IntegrationTests.Appium
             Assert.Equal("_Grandchild", clickedMenuItem.Text);
         }
 
+        [PlatformFact(SkipOnOSX = true)]
+        public void Select_Child_With_Alt_Arrow_Keys()
+        {
+            new Actions(_session)
+                .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
+                .SendKeys(Keys.Down + Keys.Enter)
+                .Perform();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Child 1", clickedMenuItem.Text);
+        }
+
+        [PlatformFact(SkipOnOSX = true)]
+        public void Select_Grandchild_With_Alt_Arrow_Keys()
+        {
+            new Actions(_session)
+                .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
+                .SendKeys(Keys.Down + Keys.Down + Keys.Right + Keys.Enter)
+                .Perform();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Grandchild", clickedMenuItem.Text);
+        }
+
+        [PlatformFact(SkipOnOSX = true)]
+        public void Select_Child_With_Alt_Access_Keys()
+        {
+            new Actions(_session)
+                .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
+                .SendKeys("rc")
+                .Perform();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Child 1", clickedMenuItem.Text);
+        }
+
+        [PlatformFact(SkipOnOSX = true)]
+        public void Select_Grandchild_With_Alt_Access_Keys()
+        {
+            new Actions(_session)
+                .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
+                .SendKeys("rhg")
+                .Perform();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Grandchild", clickedMenuItem.Text);
+        }
+
+        [PlatformFact(SkipOnOSX = true)]
+        public void Select_Child_With_Click_Arrow_Keys()
+        {
+            var rootMenuItem = _session.FindElementByAccessibilityId("RootMenuItem");
+            rootMenuItem.SendClick();
+
+            new Actions(_session)
+                .SendKeys(Keys.Down + Keys.Enter)
+                .Perform();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Child 1", clickedMenuItem.Text);
+        }
+
+        [PlatformFact(SkipOnOSX = true)]
+        public void Select_Grandchild_With_Click_Arrow_Keys()
+        {
+            var rootMenuItem = _session.FindElementByAccessibilityId("RootMenuItem");
+            rootMenuItem.SendClick();
+
+            new Actions(_session)
+                .SendKeys(Keys.Down + Keys.Down + Keys.Right + Keys.Enter)
+                .Perform();
+
+            var clickedMenuItem = _session.FindElementByAccessibilityId("ClickedMenuItem");
+            Assert.Equal("_Grandchild", clickedMenuItem.Text);
+        }
+
         [PlatformFact(SkipOnOSX = true)]
         public void Child_AcceleratorKey()
         {
             var rootMenuItem = _session.FindElementByAccessibilityId("RootMenuItem");
-            
+
             rootMenuItem.SendClick();
 
             var childMenuItem = _session.FindElementByAccessibilityId("Child1MenuItem");
 
             Assert.Equal("Ctrl+O", childMenuItem.GetAttribute("AcceleratorKey"));
         }
+
+        [PlatformFact(SkipOnOSX = true)]
+        public void PointerOver_Does_Not_Steal_Focus()
+        {
+            // Issue #7906
+            var textBox = _session.FindElementByAccessibilityId("MenuFocusTest");
+            textBox.Click();
+
+            Assert.True(textBox.GetIsFocused());
+
+            var rootMenuItem = _session.FindElementByAccessibilityId("RootMenuItem");
+            rootMenuItem.MovePointerOver();
+
+            Assert.True(textBox.GetIsFocused());
+        }
     }
 }
diff --git a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
deleted file mode 100644
index f6cfe51db4..0000000000
--- a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <IsTestProject>true</IsTestProject>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\UnitTests.NetFX.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-</Project>
diff --git a/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs b/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs
deleted file mode 100644
index b997ffbbd9..0000000000
--- a/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs
+++ /dev/null
@@ -1,447 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Interactivity.UnitTests
-{
-    public class InteractiveTests
-    {
-        [Fact]
-        public void Direct_Event_Should_Go_Straight_To_Source()
-        {
-            var ev = new RoutedEvent("test", RoutingStrategies.Direct, typeof(RoutedEventArgs), typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-            var target = CreateTree(ev, handler, RoutingStrategies.Direct);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "2b" }, invoked);
-        }
-
-        [Fact]
-        public void Direct_Event_Should_Have_Route_Set_To_Direct()
-        {
-            var ev = new RoutedEvent("test", RoutingStrategies.Direct, typeof(RoutedEventArgs), typeof(TestInteractive));
-            bool called = false;
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                Assert.Equal(RoutingStrategies.Direct, e.Route);
-                called = true;
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Direct);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.True(called);
-        }
-
-        [Fact]
-        public void Bubbling_Event_Should_Bubble_Up()
-        {
-            var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "2b", "1" }, invoked);
-        }
-
-        [Fact]
-        public void Tunneling_Event_Should_Tunnel()
-        {
-            var ev = new RoutedEvent("test", RoutingStrategies.Tunnel, typeof(RoutedEventArgs), typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "1", "2b" }, invoked);
-        }
-
-        [Fact]
-        public void Tunneling_Bubbling_Event_Should_Tunnel_Then_Bubble_Up()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "1", "2b", "2b", "1" }, invoked);
-        }
-
-        [Fact]
-        public void Events_Should_Have_Route_Set()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var invoked = new List<RoutingStrategies>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(e.Route);
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[]
-            {
-                RoutingStrategies.Tunnel,
-                RoutingStrategies.Tunnel,
-                RoutingStrategies.Bubble,
-                RoutingStrategies.Bubble,
-            },
-            invoked);
-        }
-
-        [Fact]
-        public void Handled_Bubbled_Event_Should_Not_Propogate_Further()
-        {
-            var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
-            var invoked = new List<string>();
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                var t = (TestInteractive)s;
-                invoked.Add(t.Name);
-                e.Handled = t.Name == "2b";
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "2b" }, invoked);
-        }
-
-        [Fact]
-        public void Handled_Tunnelled_Event_Should_Not_Propogate_Further()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel, 
-                typeof(RoutedEventArgs), 
-                typeof(TestInteractive));
-            var invoked = new List<string>();
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                var t = (TestInteractive)s;
-                invoked.Add(t.Name);
-                e.Handled = t.Name == "2b";
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "1", "2b" }, invoked);
-        }
-
-        [Fact]
-        public void Direct_Subscription_Should_Not_Catch_Tunneling_Or_Bubbling()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var count = 0;
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                ++count;
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Direct);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(0, count);
-        }
-
-        [Fact]
-        public void Bubbling_Subscription_Should_Not_Catch_Tunneling()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var count = 0;
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                Assert.Equal(RoutingStrategies.Bubble, e.Route);
-                ++count;
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(2, count);
-        }
-
-        [Fact]
-        public void Tunneling_Subscription_Should_Not_Catch_Bubbling()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var count = 0;
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                Assert.Equal(RoutingStrategies.Tunnel, e.Route);
-                ++count;
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(2, count);
-        }
-
-        [Fact]
-        public void Event_Should_Should_Keep_Propogating_To_HandedEventsToo_Handlers()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var invoked = new List<string>();
-
-            EventHandler<RoutedEventArgs> handler = (s, e) =>
-            {
-                invoked.Add(((TestInteractive)s).Name);
-                e.Handled = true;
-            };
-
-            var target = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel, true);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "1", "2b", "2b", "1" }, invoked);
-        }
-
-        [Fact]
-        public void Direct_Class_Handlers_Should_Be_Called()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Direct,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-
-            var target = CreateTree(ev, null, 0);
-
-            ev.AddClassHandler(typeof(TestInteractive), handler, RoutingStrategies.Direct);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "2b" }, invoked);
-        }
-
-        [Fact]
-        public void Tunneling_Class_Handlers_Should_Be_Called()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-
-            var target = CreateTree(ev, null, 0);
-
-            ev.AddClassHandler(typeof(TestInteractive), handler, RoutingStrategies.Tunnel);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "1", "2b" }, invoked);
-        }
-
-        [Fact]
-        public void Bubbling_Class_Handlers_Should_Be_Called()
-        {
-            var ev = new RoutedEvent(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(RoutedEventArgs),
-                typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-
-            var target = CreateTree(ev, null, 0);
-
-            ev.AddClassHandler(typeof(TestInteractive), handler, RoutingStrategies.Bubble);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "2b", "1" }, invoked);
-        }
-
-        [Fact]
-        public void Typed_Class_Handlers_Should_Be_Called()
-        {
-            var ev = new RoutedEvent<RoutedEventArgs>(
-                "test",
-                RoutingStrategies.Bubble | RoutingStrategies.Tunnel,
-                typeof(TestInteractive));
-
-            var target = CreateTree(ev, null, 0);
-
-            ev.AddClassHandler<TestInteractive>((x, e) => x.ClassHandler(e), RoutingStrategies.Bubble);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.True(target.ClassHandlerInvoked);
-            Assert.True(target.GetVisualParent<TestInteractive>().ClassHandlerInvoked);
-        }
-
-        [Fact]
-        public void GetObservable_Should_Listen_To_Event()
-        {
-            var ev = new RoutedEvent<RoutedEventArgs>("test", RoutingStrategies.Direct, typeof(TestInteractive));
-            var target = new TestInteractive();
-            var called = 0;
-            var subscription = target.GetObservable(ev).Subscribe(_ => ++called);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            subscription.Dispose();
-
-            target.RaiseEvent(args);
-
-            Assert.Equal(1, called);
-        }
-
-        [Fact]
-        public void Removing_Control_In_Handler_Should_Not_Stop_Event()
-        {
-            // Issue #3176
-            var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
-            var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
-            var parent = CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
-            var target = (IInteractive)parent.GetVisualChildren().Single();
-
-            EventHandler<RoutedEventArgs> removeHandler = (s, e) =>
-            {
-                parent.Children = Array.Empty<IVisual>();
-            };
-            
-            target.AddHandler(ev, removeHandler);
-
-            var args = new RoutedEventArgs(ev, target);
-            target.RaiseEvent(args);
-
-            Assert.Equal(new[] { "3", "2b", "1" }, invoked);
-        }
-
-        private TestInteractive CreateTree(
-            RoutedEvent ev,
-            EventHandler<RoutedEventArgs> handler,
-            RoutingStrategies handlerRoutes,
-            bool handledEventsToo = false)
-        {
-            TestInteractive target;
-
-            var tree = new TestInteractive
-            {
-                Name = "1",
-                Children = new[]
-                {
-                    new TestInteractive
-                    {
-                        Name = "2a",
-                    },
-                    (target = new TestInteractive
-                    {
-                        Name = "2b",
-                        Children = new[]
-                        {
-                            new TestInteractive
-                            {
-                                Name = "3",
-                            },
-                        },
-                    }),
-                }
-            };
-
-            if (handler != null)
-            {
-                foreach (var i in tree.GetSelfAndVisualDescendants().Cast<Interactive>())
-                {
-                    i.AddHandler(ev, handler, handlerRoutes, handledEventsToo);
-                }
-            }
-
-            return target;
-        }
-
-        private class TestInteractive : Interactive
-        {
-            public bool ClassHandlerInvoked { get; private set; }
-            public new string Name { get; set; }
-
-            public IEnumerable<IVisual> Children
-            {
-                get
-                {
-                    return ((IVisual)this).VisualChildren.AsEnumerable();
-                }
-
-                set
-                {
-                    VisualChildren.Clear();
-                    VisualChildren.AddRange(value.Cast<Visual>());
-                }
-            }
-
-            public void ClassHandler(RoutedEventArgs e)
-            {
-                ClassHandlerInvoked = true;
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index c5bf2d8657..0000000000
--- a/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using Xunit;
-
-[assembly: AssemblyTitle("Avalonia.Interactivity.UnitTests")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.Interactivity.UnitTests/RoutedEventRegistryTests.cs b/tests/Avalonia.Interactivity.UnitTests/RoutedEventRegistryTests.cs
deleted file mode 100644
index 8276039d09..0000000000
--- a/tests/Avalonia.Interactivity.UnitTests/RoutedEventRegistryTests.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Xunit;
-
-namespace Avalonia.Interactivity.UnitTests
-{
-    public class RoutedEventRegistryTests
-    {
-        [Fact]
-        public void Pointer_Events_Should_Be_Registered()
-        {
-            var expectedEvents = new List<RoutedEvent> { InputElement.PointerPressedEvent, InputElement.PointerReleasedEvent }; 
-            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<InputElement>();
-            Assert.Contains(registeredEvents, expectedEvents.Contains);
-        }
-
-        [Fact]
-        public void ClickEvent_Should_Be_Registered_On_Button()
-        {
-            var expectedEvents = new List<RoutedEvent> { Button.ClickEvent };
-            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<Button>();
-            Assert.Contains(registeredEvents, expectedEvents.Contains);
-        }
-
-        [Fact]
-        public void ClickEvent_Should_Not_Be_Registered_On_ContentControl()
-        {
-            // force ContentControl type to be loaded
-            new ContentControl();
-            var expectedEvents = new List<RoutedEvent> { Button.ClickEvent };
-            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<ContentControl>();
-            Assert.DoesNotContain(registeredEvents, expectedEvents.Contains);
-        }
-
-        [Fact]
-        public void InputElement_Events_Should_Not_Be_Registered_On_Button()
-        {
-            // force Button type to be loaded
-            new Button();
-            var expectedEvents = new List<RoutedEvent> { InputElement.PointerPressedEvent, InputElement.PointerReleasedEvent };
-            var registeredEvents = RoutedEventRegistry.Instance.GetRegistered<Button>();
-            Assert.DoesNotContain(registeredEvents, expectedEvents.Contains);
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs b/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs
deleted file mode 100644
index db0ead1b00..0000000000
--- a/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class ArrangeTests
-    {
-        [Fact]
-        public void Bounds_Should_Not_Include_Margin()
-        {
-            var target = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                Margin = new Thickness(5),
-            };
-
-            Assert.False(target.IsMeasureValid);
-            target.Measure(Size.Infinity);
-            target.Arrange(new Rect(target.DesiredSize));
-            Assert.Equal(new Rect(5, 5, 100, 100), target.Bounds);
-        }
-
-        [Fact]
-        public void Margin_Should_Be_Subtracted_From_Arrange_FinalSize()
-        {
-            var target = new TestControl
-            {
-                Width = 100,
-                Height = 100,
-                Margin = new Thickness(8),
-            };
-
-            target.Measure(Size.Infinity);
-            target.Arrange(new Rect(target.DesiredSize));
-
-            Assert.Equal(new Size(100, 100), target.ArrangeFinalSize);
-        }
-
-        [Fact]
-        public void ArrangeOverride_Receives_Desired_Size_When_Centered()
-        {
-            var target = new TestControl
-            {
-                MeasureResult = new Size(100, 100),
-                HorizontalAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center,
-                Margin = new Thickness(8),
-            };
-
-            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            target.Arrange(new Rect(0, 0, 200, 200));
-
-            Assert.Equal(new Size(100, 100), target.ArrangeFinalSize);
-        }
-
-        [Fact]
-        public void ArrangeOverride_Receives_Available_Size_Minus_Margin_When_Stretched()
-        {
-            var target = new TestControl
-            {
-                MeasureResult = new Size(100, 100),
-                HorizontalAlignment = HorizontalAlignment.Stretch,
-                VerticalAlignment = VerticalAlignment.Stretch,
-                Margin = new Thickness(8),
-            };
-
-            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            target.Arrange(new Rect(0, 0, 200, 200));
-
-            Assert.Equal(new Size(184, 184), target.ArrangeFinalSize);
-        }
-
-        [Fact]
-        public void ArrangeOverride_Receives_Requested_Size_When_Arranged_To_DesiredSize()
-        {
-            var target = new TestControl
-            {
-                MeasureResult = new Size(100, 100),
-                HorizontalAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center,
-                Margin = new Thickness(8),
-            };
-
-            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            target.Arrange(new Rect(target.DesiredSize));
-
-            Assert.Equal(new Size(100, 100), target.ArrangeFinalSize);
-        }
-
-        [Fact]
-        public void Arrange_With_IsMeasureValid_False_Calls_Measure()
-        {
-            var target = new TestControl();
-
-            Assert.False(target.IsMeasureValid);
-            target.Arrange(new Rect(0, 0, 120, 120));
-            Assert.True(target.IsMeasureValid);
-            Assert.Equal(new Size(120, 120), target.MeasureConstraint);
-        }
-
-        [Fact]
-        public void Arrange_With_IsMeasureValid_False_Calls_Measure_With_Previous_Size_If_Available()
-        {
-            var target = new TestControl();
-
-            Assert.False(target.IsMeasureValid);
-            target.Arrange(new Rect(0, 0, 120, 120));
-            target.InvalidateMeasure();
-            target.Arrange(new Rect(0, 0, 100, 100));
-            Assert.True(target.IsMeasureValid);
-            Assert.Equal(new Size(120, 120), target.MeasureConstraint);
-        }
-
-        private class TestControl : Decorator
-        {
-            public Size MeasureConstraint { get; private set; }
-
-            public Size MeasureResult { get; set; }
-
-            public Size ArrangeFinalSize { get; private set; }
-
-            protected override Size MeasureOverride(Size constraint)
-            {
-                MeasureConstraint = constraint;
-                return MeasureResult;
-            }
-
-            protected override Size ArrangeOverride(Size finalSize)
-            {
-                ArrangeFinalSize = finalSize;
-                return base.ArrangeOverride(finalSize);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
deleted file mode 100644
index a3c85c72b5..0000000000
--- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Library</OutputType>
-  </PropertyGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\Moq.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <Import Project="..\..\build\SharedVersion.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-    <ProjectReference Include="..\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-</Project>
diff --git a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
deleted file mode 100644
index dcc29a9716..0000000000
--- a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Presenters;
-using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Templates;
-using Avalonia.Styling;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class FullLayoutTests
-    {
-        [Fact]
-        public void Grandchild_Size_Changed()
-        {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
-            {
-                Border border;
-                TextBlock textBlock;
-
-                var window = new Window()
-                {
-                    SizeToContent = SizeToContent.WidthAndHeight,
-                    Content = border = new Border
-                    {
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center,
-                        Child = new Border
-                        {
-                            Child = textBlock = new TextBlock
-                            {
-                                Width = 400,
-                                Height = 400,
-                                Text = "Hello World!",
-                            },
-                        }
-                    }
-                };
-
-                window.Show();
-
-                Assert.Equal(new Size(400, 400), border.Bounds.Size);
-                textBlock.Width = 200;
-                window.LayoutManager.ExecuteLayoutPass();
-
-                Assert.Equal(new Size(200, 400), border.Bounds.Size);
-            }
-        }
-
-        [Fact]
-        public void Test_ScrollViewer_With_TextBlock()
-        {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
-            {
-                ScrollViewer scrollViewer;
-                TextBlock textBlock;
-
-                var window = new Window()
-                {
-                    Width = 800,
-                    Height = 600,
-                    Content = scrollViewer = new ScrollViewer
-                    {
-                        Width = 200,
-                        Height = 200,
-                        HorizontalScrollBarVisibility = ScrollBarVisibility.Auto,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center,
-                        Content = textBlock = new TextBlock
-                        {
-                            Width = 400,
-                            Height = 400,
-                            Text = "Hello World!",
-                        },
-                    }
-                };
-
-                window.Resources["ScrollBarThickness"] = 10.0;
-
-                window.Show();
-
-                Assert.Equal(new Size(800, 600), window.Bounds.Size);
-                Assert.Equal(new Size(200, 200), scrollViewer.Bounds.Size);
-                Assert.Equal(new Point(300, 200), Position(scrollViewer));
-                Assert.Equal(new Size(400, 400), textBlock.Bounds.Size);
-
-                var scrollBars = scrollViewer.GetTemplateChildren().OfType<ScrollBar>().ToList();
-                var presenters = scrollViewer.GetTemplateChildren().OfType<ScrollContentPresenter>().ToList();
-
-                Assert.Equal(2, scrollBars.Count);
-                Assert.Single(presenters);
-
-                var presenter = presenters[0];
-                Assert.Equal(new Size(190, 190), presenter.Bounds.Size);
-
-                var horzScroll = scrollBars.Single(x => x.Orientation == Orientation.Horizontal);
-                var vertScroll = scrollBars.Single(x => x.Orientation == Orientation.Vertical);
-
-                Assert.True(horzScroll.IsVisible);
-                Assert.True(vertScroll.IsVisible);
-                Assert.Equal(new Size(190, 10), horzScroll.Bounds.Size);
-                Assert.Equal(new Size(10, 190), vertScroll.Bounds.Size);
-                Assert.Equal(new Point(0, 190), Position(horzScroll));
-                Assert.Equal(new Point(190, 0), Position(vertScroll));
-            }
-        }
-
-        private static Point Position(IVisual v)
-        {
-            return v.Bounds.Position;
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutHelperTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutHelperTests.cs
deleted file mode 100644
index f9187edc42..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutHelperTests.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class LayoutHelperTests
-    {
-        [Fact]
-        public void Round_Layout_Value_Without_DPI_Aware()
-        {
-            const double value = 42.5;
-            var expectedValue = Math.Round(value);
-            var actualValue = LayoutHelper.RoundLayoutValue(value, 1.0);
-            Assert.Equal(expectedValue, actualValue);
-        }
-
-        [Fact]
-        public void Round_Layout_Value_With_DPI_Aware()
-        {
-            const double dpiScale = 1.25;
-            const double value = 42.5;
-            var expectedValue = Math.Round(value * dpiScale) / dpiScale;
-            var actualValue = LayoutHelper.RoundLayoutValue(value, dpiScale);
-            Assert.Equal(expectedValue, actualValue);
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
deleted file mode 100644
index e429adce85..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
+++ /dev/null
@@ -1,424 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class LayoutManagerTests
-    {
-        [Fact]
-        public void Measures_And_Arranges_InvalidateMeasured_Control()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = control.Arranged = false;
-
-            control.InvalidateMeasure();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.True(control.Measured);
-            Assert.True(control.Arranged);
-        }
-
-        [Fact]
-        public void Doesnt_Measure_And_Arrange_InvalidateMeasured_Control_When_TopLevel_Is_Not_Visible()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control, IsVisible = false };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = control.Arranged = false;
-
-            control.InvalidateMeasure();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.False(control.Measured);
-            Assert.False(control.Arranged);
-        }
-
-        [Fact]
-        public void Arranges_InvalidateArranged_Control()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = control.Arranged = false;
-
-            control.InvalidateArrange();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.False(control.Measured);
-            Assert.True(control.Arranged);
-        }
-
-        [Fact]
-        public void Measures_Parent_Of_Newly_Added_Control()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot();
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            root.Child = control;
-            root.Measured = root.Arranged = false;
-
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.True(root.Measured);
-            Assert.True(root.Arranged);
-            Assert.True(control.Measured);
-            Assert.True(control.Arranged);
-        }
-
-        [Fact]
-        public void Measures_In_Correct_Order()
-        {
-            LayoutTestControl control1;
-            LayoutTestControl control2;
-            var root = new LayoutTestRoot
-            {
-                Child = control1 = new LayoutTestControl
-                {
-                    Child = control2 = new LayoutTestControl(),
-                }
-            };
-
-            var order = new List<ILayoutable>();
-            Size MeasureOverride(ILayoutable control, Size size)
-            {
-                order.Add(control);
-                return new Size(10, 10);
-            }
-
-            root.DoMeasureOverride = MeasureOverride;
-            control1.DoMeasureOverride = MeasureOverride;
-            control2.DoMeasureOverride = MeasureOverride;
-            root.LayoutManager.ExecuteInitialLayoutPass();
-
-            control2.InvalidateMeasure();
-            control1.InvalidateMeasure();
-            root.InvalidateMeasure();
-
-            order.Clear();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.Equal(new ILayoutable[] { root, control1, control2 }, order);
-        }
-
-        [Fact]
-        public void Measures_Root_And_Grandparent_In_Correct_Order()
-        {
-            LayoutTestControl control1;
-            LayoutTestControl control2;
-            var root = new LayoutTestRoot
-            {
-                Child = control1 = new LayoutTestControl
-                {
-                    Child = control2 = new LayoutTestControl(),
-                }
-            };
-
-            var order = new List<ILayoutable>();
-            Size MeasureOverride(ILayoutable control, Size size)
-            {
-                order.Add(control);
-                return new Size(10, 10);
-            }
-
-            root.DoMeasureOverride = MeasureOverride;
-            control1.DoMeasureOverride = MeasureOverride;
-            control2.DoMeasureOverride = MeasureOverride;
-            root.LayoutManager.ExecuteInitialLayoutPass();
-
-            control2.InvalidateMeasure();
-            root.InvalidateMeasure();
-
-            order.Clear();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.Equal(new ILayoutable[] { root, control2 }, order);
-        }
-
-        [Fact]
-        public void Doesnt_Measure_Non_Invalidated_Root()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            root.Measured = root.Arranged = false;
-            control.Measured = control.Arranged = false;
-
-            control.InvalidateMeasure();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.False(root.Measured);
-            Assert.False(root.Arranged);
-            Assert.True(control.Measured);
-            Assert.True(control.Arranged);
-        }
-
-        [Fact]
-        public void Doesnt_Measure_Removed_Control()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = control.Arranged = false;
-
-            control.InvalidateMeasure();
-            root.Child = null;
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.False(control.Measured);
-            Assert.False(control.Arranged);
-        }
-
-        [Fact]
-        public void Measures_Root_With_Infinity()
-        {
-            var root = new LayoutTestRoot();
-            var availableSize = default(Size);
-
-            // Should not measure with this size.
-            root.MaxClientSize = new Size(123, 456);
-
-            root.DoMeasureOverride = (_, s) =>
-            {
-                availableSize = s;
-                return new Size(100, 100);
-            };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-
-            Assert.Equal(Size.Infinity, availableSize);
-        }
-
-        [Fact]
-        public void Arranges_Root_With_DesiredSize()
-        {
-            var root = new LayoutTestRoot
-            {
-                Width = 100,
-                Height = 100,
-            };
-
-            var arrangeSize = default(Size);
-
-            root.DoArrangeOverride = (_, s) =>
-            {
-                arrangeSize = s;
-                return s;
-            };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            Assert.Equal(new Size(100, 100), arrangeSize);
-
-            root.Width = 120;
-
-            root.LayoutManager.ExecuteLayoutPass();
-            Assert.Equal(new Size(120, 100), arrangeSize);
-        }
-
-        [Fact]
-        public void Invalidating_Child_Remeasures_Parent()
-        {
-            Border border;
-            StackPanel panel;
-
-            var root = new LayoutTestRoot
-            {
-                Child = panel = new StackPanel
-                {
-                    Children =
-                    {
-                        (border = new Border())
-                    }
-                }
-            };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            Assert.Equal(new Size(0, 0), root.DesiredSize);
-
-            border.Width = 100;
-            border.Height = 100;
-
-            root.LayoutManager.ExecuteLayoutPass();
-            Assert.Equal(new Size(100, 100), panel.DesiredSize);
-        }
-
-        [Fact]
-        public void LayoutManager_Should_Prevent_Infinite_Loop_On_Measure()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = false;
-
-            int cnt = 0;
-            int maxcnt = 100;
-            control.DoMeasureOverride = (l, s) =>
-            {
-                //emulate a problem in the logic of a control that triggers
-                //invalidate measure during measure
-                //it can lead to an infinite loop in layoutmanager
-                if (++cnt < maxcnt)
-                {
-                    control.InvalidateMeasure();
-                }
-
-                return new Size(100, 100);
-            };
-
-            control.InvalidateMeasure();
-
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.True(cnt < 100);
-        }
-
-        [Fact]
-        public void LayoutManager_Should_Prevent_Infinite_Loop_On_Arrange()
-        {
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Arranged = false;
-
-            int cnt = 0;
-            int maxcnt = 100;
-            control.DoArrangeOverride = (l, s) =>
-            {
-                //emulate a problem in the logic of a control that triggers
-                //invalidate measure during arrange
-                //it can lead to infinity loop in layoutmanager
-                if (++cnt < maxcnt)
-                {
-                    control.InvalidateArrange();
-                }
-
-                return new Size(100, 100);
-            };
-
-            control.InvalidateArrange();
-
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.True(cnt < 100);
-        }
-
-        [Fact]
-        public void LayoutManager_Should_Properly_Arrange_Visuals_Even_When_There_Are_Issues_With_Previous_Arranged()
-        {
-            var nonArrageableTargets = Enumerable.Range(1, 10).Select(_ => new LayoutTestControl()).ToArray();
-            var targets = Enumerable.Range(1, 10).Select(_ => new LayoutTestControl()).ToArray();
-
-            StackPanel panel;
-
-            var root = new LayoutTestRoot
-            {
-                Child = panel = new StackPanel()
-            };
-
-            panel.Children.AddRange(nonArrageableTargets);
-            panel.Children.AddRange(targets);
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-
-            foreach (var c in panel.Children.OfType<LayoutTestControl>())
-            {
-                c.Measured = c.Arranged = false;
-                c.InvalidateMeasure();
-            }
-
-            foreach (var c in nonArrageableTargets)
-            {
-                c.DoArrangeOverride = (l, s) =>
-                {
-                    //emulate a problem in the logic of a control that triggers
-                    //invalidate measure during arrange
-                    c.InvalidateMeasure();
-                    return new Size(100, 100);
-                };
-            }
-
-            root.LayoutManager.ExecuteLayoutPass();
-
-            //altough nonArrageableTargets has rubbish logic and can't be measured/arranged properly
-            //layoutmanager should process properly other visuals
-            Assert.All(targets, c => Assert.True(c.Arranged));
-        }
-
-
-        [Fact]
-        public void LayoutManager_Should_Recover_From_Infinite_Loop_On_Measure()
-        {
-            // Test for issue #3041.
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = false;
-
-            control.DoMeasureOverride = (l, s) =>
-            {
-                control.InvalidateMeasure();
-                return new Size(100, 100);
-            };
-
-            control.InvalidateMeasure();
-            root.LayoutManager.ExecuteLayoutPass();
-
-            // This is the important part: running a second layout pass in which we exceed the maximum
-            // retries causes LayoutQueue<T>.Info.Count to exceed _maxEnqueueCountPerLoop.
-            root.LayoutManager.ExecuteLayoutPass();
-
-            control.Measured = false;
-            control.DoMeasureOverride = null;
-
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.True(control.Measured);
-            Assert.True(control.IsMeasureValid);
-        }
-
-        [Fact]
-        public void Calling_ExecuteLayoutPass_From_ExecuteInitialLayoutPass_Does_Not_Break_Measure()
-        {
-            // Test for issue #3550.
-            var control = new LayoutTestControl();
-            var root = new LayoutTestRoot { Child = control };
-            var count = 0;
-
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            control.Measured = false;
-
-            control.DoMeasureOverride = (l, s) =>
-            {
-                if (count++ == 0)
-                {
-                    control.InvalidateMeasure();
-                    root.LayoutManager.ExecuteLayoutPass();
-                    return new Size(100, 100);
-                }
-                else
-                {
-                    return new Size(200, 200);
-                }
-            };
-
-            root.InvalidateMeasure();
-            control.InvalidateMeasure();
-            root.LayoutManager.ExecuteInitialLayoutPass();
-
-            Assert.Equal(new Size(200, 200), control.Bounds.Size);
-            Assert.Equal(new Size(200, 200), control.DesiredSize);
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutQueueTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutQueueTests.cs
deleted file mode 100644
index f047677a8a..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutQueueTests.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class LayoutQueueTests
-    {
-        [Fact]
-        public void Should_Enqueue()
-        {
-            var target = new LayoutQueue<string>(_ => true);
-            var refQueue = new Queue<string>();
-            var items = new[] { "1", "2", "3" };
-
-            foreach (var item in items)
-            {
-                target.Enqueue(item);
-                refQueue.Enqueue(item);
-            }
-
-            Assert.Equal(refQueue, target);
-        }
-
-        [Fact]
-        public void Should_Dequeue()
-        {
-            var target = new LayoutQueue<string>(_ => true);
-            var refQueue = new Queue<string>();
-            var items = new[] { "1", "2", "3" };
-
-            foreach (var item in items)
-            {
-                target.Enqueue(item);
-                refQueue.Enqueue(item);
-            }
-
-            while (refQueue.Count > 0)
-            {
-                Assert.Equal(refQueue.Dequeue(), target.Dequeue());
-            }
-        }
-
-        [Fact]
-        public void Should_Enqueue_UniqueElements()
-        {
-            var target = new LayoutQueue<string>(_ => true);
-
-            var items = new[] { "1", "2", "3", "1" };
-
-            foreach (var item in items)
-            {
-                target.Enqueue(item);
-            }
-
-            Assert.Equal(3, target.Count);
-            Assert.Equal(items.Take(3), target);
-        }
-
-        [Fact]
-        public void Shouldnt_Enqueue_More_Than_Limit_In_Loop()
-        {
-            var target = new LayoutQueue<string>(_ => true);
-
-            //1
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.BeginLoop(3);
-
-            target.Dequeue();
-
-            //2
-            target.Enqueue("Foo");
-            target.Dequeue();
-
-            //3
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.Dequeue();
-
-            //4 more than limit shouldn't be added
-            target.Enqueue("Foo");
-
-            Assert.Equal(0, target.Count);
-        }
-
-        [Fact]
-        public void Shouldnt_Count_Unique_Enqueue_For_Limit_In_Loop()
-        {
-            var target = new LayoutQueue<string>(_ => true);
-
-            //1
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.BeginLoop(3);
-
-            target.Dequeue();
-
-            //2
-            target.Enqueue("Foo");
-            target.Enqueue("Foo");
-            target.Dequeue();
-
-            //3
-            target.Enqueue("Foo");
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.Dequeue();
-
-            //4 more than limit shouldn't be added
-            target.Enqueue("Foo");
-
-            Assert.Equal(0, target.Count);
-        }
-
-        [Fact]
-        public void Should_Enqueue_When_Condition_True_After_Loop_When_Limit_Met()
-        {
-            var target = new LayoutQueue<string>(_ => true);
-
-            //1
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.BeginLoop(3);
-
-            target.Dequeue();
-
-            //2
-            target.Enqueue("Foo");
-            target.Dequeue();
-
-            //3
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.Dequeue();
-
-            //4 more than limit shouldn't be added to queue
-            target.Enqueue("Foo");
-
-            Assert.Equal(0, target.Count);
-
-            target.EndLoop();
-
-            //after loop should be added once
-            Assert.Equal(1, target.Count);
-            Assert.Equal("Foo", target.First());
-        }
-
-        [Fact]
-        public void Shouldnt_Enqueue_When_Condition_False_After_Loop_When_Limit_Met()
-        {
-            var target = new LayoutQueue<string>(_ => false);
-
-            //1
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.BeginLoop(3);
-
-            target.Dequeue();
-
-            //2
-            target.Enqueue("Foo");
-            target.Dequeue();
-
-            //3
-            target.Enqueue("Foo");
-
-            Assert.Equal(1, target.Count);
-
-            target.Dequeue();
-
-            //4 more than limit shouldn't be added
-            target.Enqueue("Foo");
-
-            Assert.Equal(0, target.Count);
-
-            target.EndLoop();
-
-            Assert.Equal(0, target.Count);
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutTestControl.cs b/tests/Avalonia.Layout.UnitTests/LayoutTestControl.cs
deleted file mode 100644
index f7f072eb1e..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutTestControl.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using Avalonia.Controls;
-
-namespace Avalonia.Layout.UnitTests
-{
-    internal class LayoutTestControl : Decorator
-    {
-        public bool Measured { get; set; }
-        public bool Arranged { get; set; }
-        public Func<ILayoutable, Size, Size> DoMeasureOverride { get; set; }
-        public Func<ILayoutable, Size, Size> DoArrangeOverride { get; set; }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            Measured = true;
-            return DoMeasureOverride != null ?
-                DoMeasureOverride(this, availableSize) :
-                base.MeasureOverride(availableSize);
-        }
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            Arranged = true;
-            return DoArrangeOverride != null ?
-                DoArrangeOverride(this, finalSize) :
-                base.ArrangeOverride(finalSize);
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutTestRoot.cs b/tests/Avalonia.Layout.UnitTests/LayoutTestRoot.cs
deleted file mode 100644
index a94459df96..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutTestRoot.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using Avalonia.UnitTests;
-
-namespace Avalonia.Layout.UnitTests
-{
-    internal class LayoutTestRoot : TestRoot, ILayoutable
-    {
-        public bool Measured { get; set; }
-        public bool Arranged { get; set; }
-        public Func<ILayoutable, Size, Size> DoMeasureOverride { get; set; }
-        public Func<ILayoutable, Size, Size> DoArrangeOverride { get; set; }
-
-        void ILayoutable.Measure(Size availableSize)
-        {
-            Measured = true;
-            Measure(availableSize);
-        }
-
-        void ILayoutable.Arrange(Rect rect)
-        {
-            Arranged = true;
-            Arrange(rect);
-        }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            return DoMeasureOverride != null ?
-                DoMeasureOverride(this, availableSize) :
-                base.MeasureOverride(availableSize);
-        }
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            Arranged = true;
-            return DoArrangeOverride != null ?
-                DoArrangeOverride(this, finalSize) :
-                base.ArrangeOverride(finalSize);
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
deleted file mode 100644
index a8aa0bbf0e..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
+++ /dev/null
@@ -1,342 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Avalonia.UnitTests;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class LayoutableTests
-    {
-        [Theory]
-        [InlineData(0, 0, 0, 0, 100, 100)]
-        [InlineData(10, 0, 0, 0, 90, 100)]
-        [InlineData(10, 0, 5, 0, 85, 100)]
-        [InlineData(0, 10, 0, 0, 100, 90)]
-        [InlineData(0, 10, 0, 5, 100, 85)]
-        [InlineData(4, 4, 6, 7, 90, 89)]
-        public void Margin_Is_Applied_To_MeasureOverride_Size(
-            double l,
-            double t,
-            double r,
-            double b,
-            double expectedWidth,
-            double expectedHeight)
-        {
-            var target = new TestLayoutable
-            {
-                Margin = new Thickness(l, t, r, b),
-            };
-
-            target.Measure(new Size(100, 100));
-
-            Assert.Equal(new Size(expectedWidth, expectedHeight), target.MeasureSize);
-        }
-
-        [Theory]
-        [InlineData(HorizontalAlignment.Stretch, 100)]
-        [InlineData(HorizontalAlignment.Left, 10)]
-        [InlineData(HorizontalAlignment.Center, 10)]
-        [InlineData(HorizontalAlignment.Right, 10)]
-        public void HorizontalAlignment_Is_Applied_To_ArrangeOverride_Size(
-            HorizontalAlignment h,
-            double expectedWidth)
-        {
-            var target = new TestLayoutable
-            {
-                HorizontalAlignment = h,
-            };
-
-            target.Measure(Size.Infinity);
-            target.Arrange(new Rect(0, 0, 100, 100));
-
-            Assert.Equal(new Size(expectedWidth, 100), target.ArrangeSize);
-        }
-
-        [Theory]
-        [InlineData(VerticalAlignment.Stretch, 100)]
-        [InlineData(VerticalAlignment.Top, 10)]
-        [InlineData(VerticalAlignment.Center, 10)]
-        [InlineData(VerticalAlignment.Bottom, 10)]
-        public void VerticalAlignment_Is_Applied_To_ArrangeOverride_Size(
-            VerticalAlignment v,
-            double expectedHeight)
-        {
-            var target = new TestLayoutable
-            {
-                VerticalAlignment = v,
-            };
-
-            target.Measure(Size.Infinity);
-            target.Arrange(new Rect(0, 0, 100, 100));
-
-            Assert.Equal(new Size(100, expectedHeight), target.ArrangeSize);
-        }
-
-        [Theory]
-        [InlineData(0, 0, 0, 0, 100, 100)]
-        [InlineData(10, 0, 0, 0, 90, 100)]
-        [InlineData(10, 0, 5, 0, 85, 100)]
-        [InlineData(0, 10, 0, 0, 100, 90)]
-        [InlineData(0, 10, 0, 5, 100, 85)]
-        [InlineData(4, 4, 6, 7, 90, 89)]
-        public void Margin_Is_Applied_To_ArrangeOverride_Size(
-            double l,
-            double t,
-            double r,
-            double b,
-            double expectedWidth,
-            double expectedHeight)
-        {
-            var target = new TestLayoutable
-            {
-                Margin = new Thickness(l, t, r, b),
-            };
-
-            target.Measure(Size.Infinity);
-            target.Arrange(new Rect(0, 0, 100, 100));
-
-            Assert.Equal(new Size(expectedWidth, expectedHeight), target.ArrangeSize);
-        }
-
-        [Fact]
-        public void Only_Calls_LayoutManager_InvalidateMeasure_Once()
-        {
-            var target = new Mock<ILayoutManager>();
-            var control = new Decorator();
-            var root = new LayoutTestRoot
-            {
-                Child = control,
-                LayoutManager = target.Object,
-            };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
-            target.Invocations.Clear();
-
-            control.InvalidateMeasure();
-            control.InvalidateMeasure();
-
-            target.Verify(x => x.InvalidateMeasure(control), Times.Once());
-        }
-
-        [Fact]
-        public void Only_Calls_LayoutManager_InvalidateArrange_Once()
-        {
-            var target = new Mock<ILayoutManager>();
-            var control = new Decorator();
-            var root = new LayoutTestRoot
-            {
-                Child = control,
-                LayoutManager = target.Object,
-            };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
-            target.Invocations.Clear();
-
-            control.InvalidateArrange();
-            control.InvalidateArrange();
-
-            target.Verify(x => x.InvalidateArrange(control), Times.Once());
-        }
-
-        [Fact]
-        public void Attaching_Control_To_Tree_Invalidates_Parent_Measure()
-        {
-            var target = new Mock<ILayoutManager>();
-            var control = new Decorator();
-            var root = new LayoutTestRoot
-            {
-                Child = control,
-                LayoutManager = target.Object,
-            };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
-            Assert.True(control.IsMeasureValid);
-
-            root.Child = null;
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
-
-            Assert.False(control.IsMeasureValid);
-            Assert.True(root.IsMeasureValid);
-
-            target.Invocations.Clear();
-
-            root.Child = control;
-
-            Assert.False(root.IsMeasureValid);
-            Assert.False(control.IsMeasureValid);
-            target.Verify(x => x.InvalidateMeasure(root), Times.Once());
-        }
-
-        [Theory]
-        [InlineData(16, 6, 5.333333333333333)]
-        [InlineData(18, 10, 4)]
-        public void UseLayoutRounding_Arranges_Center_Alignment_Correctly_With_Fractional_Scaling(
-            double containerWidth,
-            double childWidth,
-            double expectedX)
-        {
-            Border target;
-            var root = new TestRoot
-            {
-                LayoutScaling = 1.5,
-                UseLayoutRounding = true,
-                Child = new Decorator
-                {
-                    Width = containerWidth,
-                    Height = 100,
-                    Child = target = new Border
-                    {
-                        Width = childWidth,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                    }
-                }
-            };
-
-            root.Measure(new Size(100, 100));
-            root.Arrange(new Rect(target.DesiredSize));
-
-            Assert.Equal(new Rect(expectedX, 0, childWidth, 100), target.Bounds);
-        }
-
-        [Fact]
-        public void LayoutUpdated_Is_Called_At_End_Of_Layout_Pass()
-        {
-            Border border1;
-            Border border2;
-            var root = new TestRoot
-            {
-                Child = border1 = new Border
-                {
-                    Child = border2 = new Border(),
-                },
-            };
-            var raised = 0;
-
-            void ValidateBounds(object sender, EventArgs e)
-            {
-                Assert.Equal(new Rect(0, 0, 100, 100), border1.Bounds);
-                Assert.Equal(new Rect(0, 0, 100, 100), border2.Bounds);
-                ++raised;
-            }
-
-            root.LayoutUpdated += ValidateBounds;
-            border1.LayoutUpdated += ValidateBounds;
-            border2.LayoutUpdated += ValidateBounds;
-
-            root.Measure(new Size(100, 100));
-            root.Arrange(new Rect(0, 0, 100, 100));
-            
-            root.LayoutManager.ExecuteLayoutPass();
-
-            Assert.Equal(3, raised);
-            Assert.Equal(new Rect(0, 0, 100, 100), border1.Bounds);
-            Assert.Equal(new Rect(0, 0, 100, 100), border2.Bounds);
-        }
-
-        [Fact]
-        public void LayoutUpdated_Subscribes_To_LayoutManager()
-        {
-            Border target;
-            var layoutManager = new Mock<ILayoutManager>();
-            layoutManager.SetupAdd(m => m.LayoutUpdated += (sender, args) => { });
-
-            var root = new TestRoot
-            {
-                Child = new Border
-                {
-                    Child = target = new Border(),
-                },
-                LayoutManager = layoutManager.Object,
-            };
-
-            void Handler(object sender, EventArgs e) {}
-
-            layoutManager.Invocations.Clear();
-            target.LayoutUpdated += Handler;
-
-            layoutManager.VerifyAdd(
-                x => x.LayoutUpdated += It.IsAny<EventHandler>(),
-                Times.Once);
-
-            layoutManager.Invocations.Clear();
-            target.LayoutUpdated -= Handler;
-
-            layoutManager.VerifyRemove(
-                x => x.LayoutUpdated -= It.IsAny<EventHandler>(),
-                Times.Once);
-        }
-
-        [Fact]
-        public void LayoutManager_LayoutUpdated_Is_Subscribed_When_Attached_To_Tree()
-        {
-            Border border1;
-            var layoutManager = new Mock<ILayoutManager>();
-            layoutManager.SetupAdd(m => m.LayoutUpdated += (sender, args) => { });
-
-            var root = new TestRoot
-            {
-                Child = border1 = new Border(),
-                LayoutManager = layoutManager.Object,
-            };
-
-            var border2 = new Border();
-            border2.LayoutUpdated += (s, e) => { };
-
-            layoutManager.Invocations.Clear();
-            border1.Child = border2;
-
-            layoutManager.VerifyAdd(
-                x => x.LayoutUpdated += It.IsAny<EventHandler>(),
-                Times.Once);
-        }
-
-        [Fact]
-        public void LayoutManager_LayoutUpdated_Is_Unsubscribed_When_Detached_From_Tree()
-        {
-            Border border1;
-            var layoutManager = new Mock<ILayoutManager>();
-            layoutManager.SetupAdd(m => m.LayoutUpdated += (sender, args) => { });
-
-            var root = new TestRoot
-            {
-                Child = border1 = new Border(),
-                LayoutManager = layoutManager.Object,
-            };
-
-            var border2 = new Border();
-            border2.LayoutUpdated += (s, e) => { };
-            border1.Child = border2;
-
-            layoutManager.Invocations.Clear();
-            border1.Child = null;
-
-            layoutManager.VerifyRemove(
-                x => x.LayoutUpdated -= It.IsAny<EventHandler>(),
-                Times.Once);
-        }
-
-        private class TestLayoutable : Layoutable
-        {
-            public Size ArrangeSize { get; private set; }
-            public Size MeasureResult { get; set; } = new Size(10, 10);
-            public Size MeasureSize { get; private set; }
-
-            protected override Size MeasureOverride(Size availableSize)
-            {
-                MeasureSize = availableSize;
-                return MeasureResult;
-            }
-
-            protected override Size ArrangeOverride(Size finalSize)
-            {
-                ArrangeSize = finalSize;
-                return base.ArrangeOverride(finalSize);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs b/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs
deleted file mode 100644
index 178855d71c..0000000000
--- a/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs
+++ /dev/null
@@ -1,426 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Controls.Presenters;
-using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Templates;
-using Avalonia.Media;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class LayoutableTests_EffectiveViewportChanged
-    {
-        [Fact]
-        public async Task EffectiveViewportChanged_Not_Raised_When_Control_Added_To_Tree()
-        {
-#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-            await RunOnUIThread.Execute(async () =>
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
-            {
-                var root = CreateRoot();
-                var target = new Canvas();
-                var raised = 0;
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    ++raised;
-                };
-
-                root.Child = target;
-
-                Assert.Equal(0, raised);
-            });
-        }
-
-        [Fact]
-        public async Task EffectiveViewportChanged_Raised_Before_LayoutUpdated()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas();
-                var raised = 0;
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    ++raised;
-                };
-
-                root.Child = target;
-
-                await ExecuteInitialLayoutPass(root);
-
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Parent_Affects_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 100, Height = 100 };
-                var parent = new Border { Width = 200, Height = 200, Child = target };
-                var raised = 0;
-
-                root.Child = parent;
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    Assert.Equal(new Rect(-550, -400, 1200, 900), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                await ExecuteInitialLayoutPass(root);
-            });
-        }
-
-        [Fact]
-        public async Task Invalidating_In_Handler_Causes_Layout_To_Be_Rerun_Before_LayoutUpdated_Raised()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new TestCanvas();
-                var raised = 0;
-                var layoutUpdatedRaised = 0;
-
-                root.LayoutUpdated += (s, e) =>
-                {
-                    Assert.Equal(2, target.MeasureCount);
-                    Assert.Equal(2, target.ArrangeCount);
-                    ++layoutUpdatedRaised;
-                };
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    target.InvalidateMeasure();
-                    ++raised;
-                };
-
-                root.Child = target;
-
-                await ExecuteInitialLayoutPass(root);
-
-                Assert.Equal(1, raised);
-                Assert.Equal(1, layoutUpdatedRaised);
-            });
-        }
-
-        [Fact]
-        public async Task Viewport_Extends_Beyond_Centered_Control()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 52, Height = 52, };
-                var raised = 0;
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    Assert.Equal(new Rect(-574, -424, 1200, 900), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                root.Child = target;
-
-                await ExecuteInitialLayoutPass(root);
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Viewport_Extends_Beyond_Nested_Centered_Control()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 52, Height = 52 };
-                var parent = new Border { Width = 100, Height = 100, Child = target };
-                var raised = 0;
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    Assert.Equal(new Rect(-574, -424, 1200, 900), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                root.Child = parent;
-
-                await ExecuteInitialLayoutPass(root);
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task ScrollViewer_Determines_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 200, Height = 200 };
-                var scroller = new ScrollViewer { Width = 100, Height = 100, Content = target, Template = ScrollViewerTemplate(), HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden };
-                var raised = 0;
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    Assert.Equal(new Rect(0, 0, 100, 100), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                root.Child = scroller;
-
-                await ExecuteInitialLayoutPass(root);
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Scrolled_ScrollViewer_Determines_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 200, Height = 200 };
-                var scroller = new ScrollViewer { Width = 100, Height = 100, Content = target, Template = ScrollViewerTemplate(), HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden };
-                var raised = 0;
-
-                root.Child = scroller;
-
-                await ExecuteInitialLayoutPass(root);
-                scroller.Offset = new Vector(0, 10);
-
-                await ExecuteScrollerLayoutPass(root, scroller, target, (s, e) =>
-                {
-                    Assert.Equal(new Rect(0, 10, 100, 100), e.EffectiveViewport);
-                    ++raised;
-                });
-
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Moving_Parent_Updates_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 100, Height = 100 };
-                var parent = new Border { Width = 200, Height = 200, Child = target };
-                var raised = 0;
-
-                root.Child = parent;
-
-                await ExecuteInitialLayoutPass(root);
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    Assert.Equal(new Rect(-554, -400, 1200, 900), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                parent.Margin = new Thickness(8, 0, 0, 0);
-                await ExecuteLayoutPass(root);
-
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Translate_Transform_Doesnt_Affect_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 100, Height = 100 };
-                var parent = new Border { Width = 200, Height = 200, Child = target };
-                var raised = 0;
-
-                root.Child = parent;
-
-                await ExecuteInitialLayoutPass(root);
-                target.EffectiveViewportChanged += (s, e) => ++raised;
-                target.RenderTransform = new TranslateTransform { X = 8 };
-                target.InvalidateMeasure();
-                await ExecuteLayoutPass(root);
-
-                Assert.Equal(0, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Translate_Transform_On_Parent_Affects_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 100, Height = 100 };
-                var parent = new Border { Width = 200, Height = 200, Child = target };
-                var raised = 0;
-
-                root.Child = parent;
-
-                await ExecuteInitialLayoutPass(root);
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    Assert.Equal(new Rect(-558, -400, 1200, 900), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                // Change the parent render transform to move it. A layout is then needed before
-                // EffectiveViewportChanged is raised.
-                parent.RenderTransform = new TranslateTransform { X = 8 };
-                parent.InvalidateMeasure();
-                await ExecuteLayoutPass(root);
-
-                Assert.Equal(1, raised);
-            });
-        }
-
-        [Fact]
-        public async Task Rotate_Transform_On_Parent_Affects_EffectiveViewport()
-        {
-            await RunOnUIThread.Execute(async () =>
-            {
-                var root = CreateRoot();
-                var target = new Canvas { Width = 100, Height = 100 };
-                var parent = new Border { Width = 200, Height = 200, Child = target };
-                var raised = 0;
-
-                root.Child = parent;
-
-                await ExecuteInitialLayoutPass(root);
-
-                target.EffectiveViewportChanged += (s, e) =>
-                {
-                    AssertArePixelEqual(new Rect(-651, -792, 1484, 1484), e.EffectiveViewport);
-                    ++raised;
-                };
-
-                parent.RenderTransformOrigin = new RelativePoint(0, 0, RelativeUnit.Absolute);
-                parent.RenderTransform = new RotateTransform { Angle = 45 };
-                parent.InvalidateMeasure();
-                await ExecuteLayoutPass(root);
-
-                Assert.Equal(1, raised);
-            });
-        }
-
-        private TestRoot CreateRoot() => new TestRoot { Width = 1200, Height = 900 };
-
-        private Task ExecuteInitialLayoutPass(TestRoot root)
-        {
-            root.LayoutManager.ExecuteInitialLayoutPass();
-            return Task.CompletedTask;
-        }
-
-        private Task ExecuteLayoutPass(TestRoot root)
-        {
-            root.LayoutManager.ExecuteLayoutPass();
-            return Task.CompletedTask;
-        }
-
-        private Task ExecuteScrollerLayoutPass(
-            TestRoot root,
-            ScrollViewer scroller,
-            Control target,
-            Action<object, EffectiveViewportChangedEventArgs> handler)
-        {
-            void ViewportChanged(object sender, EffectiveViewportChangedEventArgs e)
-            {
-                handler(sender, e);
-            }
-
-            target.EffectiveViewportChanged += ViewportChanged;
-            root.LayoutManager.ExecuteLayoutPass();
-            return Task.CompletedTask;
-        }
-        private IControlTemplate ScrollViewerTemplate()
-        {
-            return new FuncControlTemplate<ScrollViewer>((control, scope) => new Grid
-            {
-                ColumnDefinitions = new ColumnDefinitions
-                {
-                    new ColumnDefinition(1, GridUnitType.Star),
-                    new ColumnDefinition(GridLength.Auto),
-                },
-                RowDefinitions = new RowDefinitions
-                {
-                    new RowDefinition(1, GridUnitType.Star),
-                    new RowDefinition(GridLength.Auto),
-                },
-                Children =
-                {
-                    new ScrollContentPresenter
-                    {
-                        Name = "PART_ContentPresenter",
-                        [~ContentPresenter.ContentProperty] = control[~ContentControl.ContentProperty],
-                        [~~ScrollContentPresenter.ExtentProperty] = control[~~ScrollViewer.ExtentProperty],
-                        [~~ScrollContentPresenter.OffsetProperty] = control[~~ScrollViewer.OffsetProperty],
-                        [~~ScrollContentPresenter.ViewportProperty] = control[~~ScrollViewer.ViewportProperty],
-                        [~ScrollContentPresenter.CanHorizontallyScrollProperty] = control[~ScrollViewer.CanHorizontallyScrollProperty],
-                        [~ScrollContentPresenter.CanVerticallyScrollProperty] = control[~ScrollViewer.CanVerticallyScrollProperty],
-                    }.RegisterInNameScope(scope),
-                    new ScrollBar
-                    {
-                        Name = "horizontalScrollBar",
-                        Orientation = Orientation.Horizontal,
-                        [~RangeBase.MaximumProperty] = control[~ScrollViewer.HorizontalScrollBarMaximumProperty],
-                        [~~RangeBase.ValueProperty] = control[~~ScrollViewer.HorizontalScrollBarValueProperty],
-                        [~ScrollBar.ViewportSizeProperty] = control[~ScrollViewer.HorizontalScrollBarViewportSizeProperty],
-                        [~ScrollBar.VisibilityProperty] = control[~ScrollViewer.HorizontalScrollBarVisibilityProperty],
-                        [Grid.RowProperty] = 1,
-                    }.RegisterInNameScope(scope),
-                    new ScrollBar
-                    {
-                        Name = "verticalScrollBar",
-                        Orientation = Orientation.Vertical,
-                        [~RangeBase.MaximumProperty] = control[~ScrollViewer.VerticalScrollBarMaximumProperty],
-                        [~~RangeBase.ValueProperty] = control[~~ScrollViewer.VerticalScrollBarValueProperty],
-                        [~ScrollBar.ViewportSizeProperty] = control[~ScrollViewer.VerticalScrollBarViewportSizeProperty],
-                        [~ScrollBar.VisibilityProperty] = control[~ScrollViewer.VerticalScrollBarVisibilityProperty],
-                        [Grid.ColumnProperty] = 1,
-                    }.RegisterInNameScope(scope),
-                },
-            });
-        }
-
-        private void AssertArePixelEqual(Rect expected, Rect actual)
-        {
-            var expectedRounded = new Rect((int)expected.X, (int)expected.Y, (int)expected.Width, (int)expected.Height);
-            var actualRounded = new Rect((int)actual.X, (int)actual.Y, (int)actual.Width, (int)actual.Height);
-            Assert.Equal(expectedRounded, actualRounded);
-        }
-
-        private class TestCanvas : Canvas
-        {
-            public int MeasureCount { get; private set; }
-            public int ArrangeCount { get; private set; }
-
-            protected override Size MeasureOverride(Size availableSize)
-            {
-                ++MeasureCount;
-                return base.MeasureOverride(availableSize);
-            }
-
-            protected override Size ArrangeOverride(Size finalSize)
-            {
-                ++ArrangeCount;
-                return base.ArrangeOverride(finalSize);
-            }
-        }
-
-        private static class RunOnUIThread
-        {
-            public static async Task Execute(Func<Task> func)
-            {
-                await func();
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/MeasureTests.cs b/tests/Avalonia.Layout.UnitTests/MeasureTests.cs
deleted file mode 100644
index 140ebede15..0000000000
--- a/tests/Avalonia.Layout.UnitTests/MeasureTests.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class MeasureTests
-    {
-        [Fact]
-        public void Margin_Should_Be_Included_In_DesiredSize()
-        {
-            var decorator = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                Margin = new Thickness(8),
-            };
-
-            decorator.Measure(Size.Infinity);
-
-            Assert.Equal(new Size(116, 116), decorator.DesiredSize);
-        }
-
-        [Fact]
-        public void Invalidating_Child_Should_Not_Invalidate_Parent()
-        {
-            var panel = new StackPanel();
-            var child = new Border();
-            panel.Children.Add(child);
-
-            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-
-            Assert.Equal(new Size(0, 0), panel.DesiredSize);
-
-            child.Width = 100;
-            child.Height = 100;
-
-            Assert.True(panel.IsMeasureValid);
-            Assert.False(child.IsMeasureValid);
-
-            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            Assert.Equal(new Size(0, 0), panel.DesiredSize);
-        }
-
-        [Fact]
-        public void Removing_From_Parent_Should_Invalidate_Measure_Of_Control_And_Descendants()
-        {
-            var panel = new StackPanel();
-            var child2 = new Border();
-            var child1 = new Border { Child = child2 };
-            panel.Children.Add(child1);
-
-            panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            Assert.True(child1.IsMeasureValid);
-            Assert.True(child2.IsMeasureValid);
-
-            panel.Children.Remove(child1);
-            Assert.False(child1.IsMeasureValid);
-            Assert.False(child2.IsMeasureValid);
-        }
-
-        [Fact]
-        public void Negative_Margin_Larger_Than_Constraint_Should_Request_Width_0()
-        {
-            Control target;
-
-            var outer = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                Child = target = new Control
-                {
-                    Margin = new Thickness(-100, 0, 0, 0),
-                }
-            };
-
-            outer.Measure(Size.Infinity);
-
-            Assert.Equal(0, target.DesiredSize.Width);
-        }
-
-        [Fact]
-        public void Negative_Margin_Larger_Than_Constraint_Should_Request_Height_0()
-        {
-            Control target;
-
-            var outer = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                Child = target = new Control
-                {
-                    Margin = new Thickness(0, -100, 0, 0),
-                }
-            };
-
-            outer.Measure(Size.Infinity);
-
-            Assert.Equal(0, target.DesiredSize.Height);
-        }
-
-        [Fact]
-        public void Margin_Should_Affect_AvailableSize()
-        {
-            MeasureTest target;
-
-            var outer = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                Child = target = new MeasureTest
-                {
-                    Margin = new Thickness(10),
-                }
-            };
-
-            outer.Measure(Size.Infinity);
-
-            Assert.Equal(new Size(80, 80), target.AvailableSize);
-        }
-
-        [Fact]
-        public void Margin_Should_Be_Applied_Before_Width_Height()
-        {
-            MeasureTest target;
-
-            var outer = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                Child = target = new MeasureTest
-                {
-                    Width = 80,
-                    Height = 80,
-                    Margin = new Thickness(10),
-                }
-            };
-
-            outer.Measure(Size.Infinity);
-
-            Assert.Equal(new Size(80, 80), target.AvailableSize);
-        }
-
-        class MeasureTest : Control
-        {
-            public Size? AvailableSize { get; private set; }
-
-            protected override Size MeasureOverride(Size availableSize)
-            {
-                AvailableSize = availableSize;
-                return availableSize;
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/NonVirtualizingStackLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/NonVirtualizingStackLayoutTests.cs
deleted file mode 100644
index a7b378c322..0000000000
--- a/tests/Avalonia.Layout.UnitTests/NonVirtualizingStackLayoutTests.cs
+++ /dev/null
@@ -1,335 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-{
-    public class NonVirtualizingStackLayoutTests
-    {
-        [Fact]
-        public void Lays_Out_Children_Vertically()
-        {
-            var target = new NonVirtualizingStackLayout { Orientation = Orientation.Vertical };
-            var context = CreateContext(new[]
-            {
-                new Border { Height = 20, Width = 120 },
-                new Border { Height = 30 },
-                new Border { Height = 50 },
-            });
-
-            var desiredSize = target.Measure(context, Size.Infinity);
-            var arrangeSize = target.Arrange(context, desiredSize);
-
-            Assert.Equal(new Size(120, 100), desiredSize);
-            Assert.Equal(new Size(120, 100), arrangeSize);
-            Assert.Equal(new Rect(0, 0, 120, 20), context.Children[0].Bounds);
-            Assert.Equal(new Rect(0, 20, 120, 30), context.Children[1].Bounds);
-            Assert.Equal(new Rect(0, 50, 120, 50), context.Children[2].Bounds);
-        }
-
-        [Fact]
-        public void Lays_Out_Children_Horizontally()
-        {
-            var target = new NonVirtualizingStackLayout { Orientation = Orientation.Horizontal };
-            var context = CreateContext(new[]
-            {
-                new Border { Width = 20, Height = 120 },
-                new Border { Width = 30 },
-                new Border { Width = 50 },
-            });
-
-            var desiredSize = target.Measure(context, Size.Infinity);
-            var arrangeSize = target.Arrange(context, desiredSize);
-
-            Assert.Equal(new Size(100, 120), desiredSize);
-            Assert.Equal(new Size(100, 120), arrangeSize);
-            Assert.Equal(new Rect(0, 0, 20, 120), context.Children[0].Bounds);
-            Assert.Equal(new Rect(20, 0, 30, 120), context.Children[1].Bounds);
-            Assert.Equal(new Rect(50, 0, 50, 120), context.Children[2].Bounds);
-        }
-
-        [Fact]
-        public void Lays_Out_Children_Vertically_With_Spacing()
-        {
-            var target = new NonVirtualizingStackLayout 
-            { 
-                Orientation = Orientation.Vertical,
-                Spacing = 10,
-            };
-
-            var context = CreateContext(new[]
-            {
-                new Border { Height = 20, Width = 120 },
-                new Border { Height = 30 },
-                new Border { Height = 50 },
-            });
-
-            var desiredSize = target.Measure(context, Size.Infinity);
-            var arrangeSize = target.Arrange(context, desiredSize);
-
-            Assert.Equal(new Size(120, 120), desiredSize);
-            Assert.Equal(new Size(120, 120), arrangeSize);
-            Assert.Equal(new Rect(0, 0, 120, 20), context.Children[0].Bounds);
-            Assert.Equal(new Rect(0, 30, 120, 30), context.Children[1].Bounds);
-            Assert.Equal(new Rect(0, 70, 120, 50), context.Children[2].Bounds);
-        }
-
-        [Fact]
-        public void Lays_Out_Children_Horizontally_With_Spacing()
-        {
-            var target = new NonVirtualizingStackLayout 
-            { 
-                Orientation = Orientation.Horizontal,
-                Spacing = 10,
-            };
-
-            var context = CreateContext(new[]
-            {
-                new Border { Width = 20, Height = 120 },
-                new Border { Width = 30 },
-                new Border { Width = 50 },
-            });
-
-            var desiredSize = target.Measure(context, Size.Infinity);
-            var arrangeSize = target.Arrange(context, desiredSize);
-
-            Assert.Equal(new Size(120, 120), desiredSize);
-            Assert.Equal(new Size(120, 120), arrangeSize);
-            Assert.Equal(new Rect(0, 0, 20, 120), context.Children[0].Bounds);
-            Assert.Equal(new Rect(30, 0, 30, 120), context.Children[1].Bounds);
-            Assert.Equal(new Rect(70, 0, 50, 120), context.Children[2].Bounds);
-        }
-
-        [Fact]
-        public void Arranges_Vertical_Children_With_Correct_Bounds()
-        {
-            var target = new NonVirtualizingStackLayout
-            {
-                Orientation = Orientation.Vertical
-            };
-            
-            var context = CreateContext(new[]
-            {
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Left,
-                    MeasureSize = new Size(50, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Left,
-                    MeasureSize = new Size(150, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    MeasureSize = new Size(50, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    MeasureSize = new Size(150, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    MeasureSize = new Size(50, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    MeasureSize = new Size(150, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Stretch,
-                    MeasureSize = new Size(50, 10),
-                },
-                new TestControl
-                {
-                    HorizontalAlignment = HorizontalAlignment.Stretch,
-                    MeasureSize = new Size(150, 10),
-                },
-            });
-
-            var desiredSize = target.Measure(context, new Size(100, 150));
-            Assert.Equal(new Size(100, 80), desiredSize);
-
-            target.Arrange(context, desiredSize);
-
-            var bounds = context.Children.Select(x => x.Bounds).ToArray();
-
-            Assert.Equal(
-                new[]
-                {
-                    new Rect(0, 0, 50, 10),
-                    new Rect(0, 10, 100, 10),
-                    new Rect(25, 20, 50, 10),
-                    new Rect(0, 30, 100, 10),
-                    new Rect(50, 40, 50, 10),
-                    new Rect(0, 50, 100, 10),
-                    new Rect(0, 60, 100, 10),
-                    new Rect(0, 70, 100, 10),
-
-                }, bounds);
-        }
-
-        [Fact]
-        public void Arranges_Horizontal_Children_With_Correct_Bounds()
-        {
-            var target = new NonVirtualizingStackLayout
-            {
-                Orientation = Orientation.Horizontal
-            };
-
-            var context = CreateContext(new[]
-            {
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Top,
-                    MeasureSize = new Size(10, 50),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Top,
-                    MeasureSize = new Size(10, 150),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Center,
-                    MeasureSize = new Size(10, 50),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Center,
-                    MeasureSize = new Size(10, 150),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Bottom,
-                    MeasureSize = new Size(10, 50),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Bottom,
-                    MeasureSize = new Size(10, 150),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Stretch,
-                    MeasureSize = new Size(10, 50),
-                },
-                new TestControl
-                {
-                    VerticalAlignment = VerticalAlignment.Stretch,
-                    MeasureSize = new Size(10, 150),
-                },
-            });
-
-            var desiredSize = target.Measure(context, new Size(150, 100));
-            Assert.Equal(new Size(80, 100), desiredSize);
-
-            target.Arrange(context, desiredSize);
-
-            var bounds = context.Children.Select(x => x.Bounds).ToArray();
-
-            Assert.Equal(
-                new[]
-                {
-                    new Rect(0, 0, 10, 50),
-                    new Rect(10, 0, 10, 100),
-                    new Rect(20, 25, 10, 50),
-                    new Rect(30, 0, 10, 100),
-                    new Rect(40, 50, 10, 50),
-                    new Rect(50, 0, 10, 100),
-                    new Rect(60, 0, 10, 100),
-                    new Rect(70, 0, 10, 100),
-                }, bounds);
-        }
-
-        [Theory]
-        [InlineData(Orientation.Horizontal)]
-        [InlineData(Orientation.Vertical)]
-        public void Spacing_Not_Added_For_Invisible_Children(Orientation orientation)
-        {
-            var targetThreeChildrenOneInvisble = new NonVirtualizingStackLayout
-            {
-                Orientation = orientation,
-                Spacing = 40,
-            };
-
-            var contextThreeChildrenOneInvisble = CreateContext(new[]
-            {
-                new StackPanel { Width = 10, Height= 10, IsVisible = false },
-                new StackPanel { Width = 10, Height= 10 },
-                new StackPanel { Width = 10, Height= 10 },
-            });
-
-            var targetTwoChildrenNoneInvisible = new NonVirtualizingStackLayout
-            {
-                Spacing = 40,
-                Orientation = orientation,
-            };
-
-            var contextTwoChildrenNoneInvisible = CreateContext(new[]
-            {
-                new StackPanel { Width = 10, Height = 10 },
-                new StackPanel { Width = 10, Height = 10 }
-            });
-
-            var desiredSize1 = targetThreeChildrenOneInvisble.Measure(contextThreeChildrenOneInvisble, Size.Infinity);
-            var desiredSize2 = targetTwoChildrenNoneInvisible.Measure(contextTwoChildrenNoneInvisible, Size.Infinity);
- 
-            Assert.Equal(desiredSize2, desiredSize1);
-        }
-
-        [Theory]
-        [InlineData(Orientation.Horizontal)]
-        [InlineData(Orientation.Vertical)]
-        public void Only_Arrange_Visible_Children(Orientation orientation)
-        {
-            var hiddenPanel = new Panel { Width = 10, Height = 10, IsVisible = false };
-            var panel = new Panel { Width = 10, Height = 10 };
-
-            var target = new NonVirtualizingStackLayout
-            {
-                Spacing = 40,
-                Orientation = orientation,
-            };
-
-            var context = CreateContext(new[]
-            {
-                hiddenPanel,
-                panel
-            });
-
-            var desiredSize = target.Measure(context, Size.Infinity);
-            var arrangeSize = target.Arrange(context, desiredSize);
-            Assert.Equal(new Size(10, 10), arrangeSize);
-        }
-
-        private NonVirtualizingLayoutContext CreateContext(Control[] children)
-        {
-            return new TestLayoutContext(children);
-        }
-
-        private class TestLayoutContext : NonVirtualizingLayoutContext
-        {
-            public TestLayoutContext(Control[] children) => ChildrenCore = children;
-            protected override IReadOnlyList<ILayoutable> ChildrenCore { get; }
-        }
-
-        private class TestControl : Control
-        {
-            public Size MeasureConstraint { get; private set; }
-            public Size MeasureSize { get; set; }
-
-            protected override Size MeasureOverride(Size availableSize)
-            {
-                MeasureConstraint = availableSize;
-                return MeasureSize;
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Layout.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Layout.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6f62e38bda..0000000000
--- a/tests/Avalonia.Layout.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using Xunit;
-
-[assembly: AssemblyTitle("Avalonia.Layout.UnitTests")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
index d49a859b89..a00b24bdd7 100644
--- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
+++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
@@ -9,16 +9,12 @@
   <Import Project="..\..\build\NetFX.props" />
   <Import Project="..\..\build\SharedVersion.props" />
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
     <Compile Remove="testproject/**/*.cs" />
diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index 087d42370e..bb520c16aa 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -1,17 +1,19 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
-using System.Runtime.Remoting.Contexts;
+using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
+using Avalonia.Data;
 using Avalonia.Diagnostics;
 using Avalonia.Input;
-using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Styling;
+using Avalonia.Threading;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using JetBrains.dotMemoryUnit;
@@ -24,11 +26,52 @@ namespace Avalonia.LeakTests
     [DotMemoryUnit(FailIfRunWithoutSupport = false)]
     public class ControlTests
     {
+        // Need to have the collection as field, so GC will not free it
+        private readonly ObservableCollection<string> _observableCollection = new();
+        
         public ControlTests(ITestOutputHelper atr)
         {
             DotMemoryUnitTestOutput.SetOutputMethod(atr.WriteLine);
         }
 
+ 
+        [Fact]
+        public void DataGrid_Is_Freed()
+        {
+            using (Start())
+            {
+                // When attached to INotifyCollectionChanged, DataGrid will subscribe to it's events, potentially causing leak
+                Func<Window> run = () =>
+                {
+                    var window = new Window
+                    {
+                        Content = new DataGrid
+                        {
+                            Items = _observableCollection
+                        }
+                    };
+
+                    window.Show();
+
+                    // Do a layout and make sure that DataGrid gets added to visual tree.
+                    window.LayoutManager.ExecuteInitialLayoutPass();
+                    Assert.IsType<DataGrid>(window.Presenter.Child);
+
+                    // Clear the content and ensure the DataGrid is removed.
+                    window.Content = null;
+                    window.LayoutManager.ExecuteLayoutPass();
+                    Assert.Null(window.Presenter.Child);
+
+                    return window;
+                };
+
+                var result = run();
+
+                dotMemory.Check(memory =>
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<DataGrid>()).ObjectsCount));
+            }
+        }
+
         [Fact]
         public void Canvas_Is_Freed()
         {
@@ -619,14 +662,96 @@ namespace Avalonia.LeakTests
             }
         }
 
+        [Fact]
+        public void ElementName_Binding_In_DataTemplate_Is_Freed()
+        {
+            using (Start())
+            {
+                var items = new ObservableCollection<int>(Enumerable.Range(0, 10));
+                NameScope ns;
+                TextBox tb;
+                ListBox lb;
+                var window = new Window
+                {
+                    [NameScope.NameScopeProperty] = ns = new NameScope(),
+                    Width = 100,
+                    Height = 100,
+                    Content = new StackPanel
+                    {
+                        Children =
+                        {
+                            (tb = new TextBox
+                            {
+                                Name = "tb",
+                                Text = "foo",
+                            }),
+                            (lb = new ListBox
+                            {
+                                Items = items,
+                                ItemTemplate = new FuncDataTemplate<int>((_, _) =>
+                                    new Canvas
+                                    {
+                                        Width = 10,
+                                        Height = 10,
+                                        [!Control.TagProperty] = new Binding
+                                        {
+                                            ElementName = "tb",
+                                            Path = "Text",
+                                            NameScope = new WeakReference<INameScope>(ns),
+                                        }
+                                    })
+                            }),
+                        }
+                    }
+                };
+
+                tb.RegisterInNameScope(ns);
+
+                window.Show();
+                window.LayoutManager.ExecuteInitialLayoutPass();
+
+                void AssertInitialItemState()
+                {
+                    var item0 = (ListBoxItem)lb.ItemContainerGenerator.Containers.First().ContainerControl;
+                    var canvas0 = (Canvas)item0.Presenter.Child;
+                    Assert.Equal("foo", canvas0.Tag);
+                }
+               
+                Assert.Equal(10, lb.ItemContainerGenerator.Containers.Count());
+                AssertInitialItemState();
+
+                items.Clear();
+                window.LayoutManager.ExecuteLayoutPass();
+
+                Assert.Empty(lb.ItemContainerGenerator.Containers);
+
+                dotMemory.Check(memory =>
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Canvas>()).ObjectsCount));
+            }
+        }
+
         private IDisposable Start()
         {
-            return UnitTestApplication.Start(TestServices.StyledWindow.With(
-                focusManager: new FocusManager(),
-                keyboardDevice: () => new KeyboardDevice(),
-                inputManager: new InputManager()));
+            void Cleanup()
+            {
+                // KeyboardDevice holds a reference to the focused item.
+                KeyboardDevice.Instance.SetFocusedElement(null, NavigationMethod.Unspecified, KeyModifiers.None);
+                
+                // Empty the dispatcher queue.
+                Dispatcher.UIThread.RunJobs();
+            }
+
+            return new CompositeDisposable
+            {
+                Disposable.Create(Cleanup),
+                UnitTestApplication.Start(TestServices.StyledWindow.With(
+                    focusManager: new FocusManager(),
+                    keyboardDevice: () => new KeyboardDevice(),
+                    inputManager: new InputManager()))
+            };
         }
 
+
         private class Node
         {
             public string Name { get; set; }
diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
index fceea56273..fc15ad8230 100644
--- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
+++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
@@ -13,14 +13,8 @@
   <Import Project="..\..\build\SharedVersion.props" />
   <ItemGroup>
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
index 055de999e2..11a22f0dec 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
@@ -617,6 +617,25 @@ namespace Avalonia.Markup.UnitTests.Data
             
             Assert.Equal(0, source.SubscriberCount);
         }
+        
+        [Fact]
+        public void Binding_Can_Resolve_Property_From_IReflectableType_Type()
+        {
+            var source = new DynamicReflectableType { ["Foo"] = "foo" };
+            var target = new TwoWayBindingTest { DataContext = source };
+            var binding = new Binding
+            {
+                Path = "Foo",
+            };
+
+            target.Bind(TwoWayBindingTest.TwoWayProperty, binding);
+
+            Assert.Equal("foo", target.TwoWay);
+            source["Foo"] = "bar";
+            Assert.Equal("bar", target.TwoWay);
+            target.TwoWay = "baz";
+            Assert.Equal("baz", source["Foo"]);
+        }
 
         private class StyledPropertyClass : AvaloniaObject
         {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Method.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Method.cs
new file mode 100644
index 0000000000..e613a178d5
--- /dev/null
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Method.cs
@@ -0,0 +1,32 @@
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Xunit;
+
+namespace Avalonia.Markup.UnitTests.Data
+{
+    public class BindingTests_Method
+    {
+        [Fact]
+        public void Binding_To_Private_Methods_Shouldnt_Work()
+        {
+            var vm = new TestClass();
+            var target = new Button
+            {
+                DataContext = vm,
+                [!Button.CommandProperty] = new Binding("MyMethod"),
+            };
+            target.RaiseEvent(new RoutedEventArgs(AccessKeyHandler.AccessKeyPressedEvent));
+
+            Assert.False(vm.IsSet);
+        }
+
+
+        class TestClass
+        {
+            public bool IsSet { get; set; }
+            private void MyMethod() => IsSet = true;
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs
index 37721badb0..f04b95aaff 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs
@@ -1,16 +1,11 @@
-using System;
+using System.Linq;
 using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using Moq;
 using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
 using Avalonia.Data;
-using Avalonia.Styling;
-using Xunit;
-using System.Reactive.Disposables;
-using Avalonia.UnitTests;
 using Avalonia.VisualTree;
-using System.Linq;
-using Avalonia.Markup.Data;
+using Xunit;
 
 namespace Avalonia.Markup.UnitTests.Data
 {
@@ -19,53 +14,57 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public void OneWay_Binding_Should_Be_Set_Up()
         {
-            var target = CreateTarget();
-            var binding = new Binding
+            var source = new Button
             {
-                Mode = BindingMode.OneWay,
-                RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
-                Priority = BindingPriority.TemplatedParent,
-                Path = "Foo",
+                Template = new FuncControlTemplate<Button>((parent, _) =>
+                    new ContentPresenter
+                    {
+                        [~ContentPresenter.ContentProperty] = new Binding
+                        {
+                            Mode = BindingMode.OneWay,
+                            RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
+                            Path = "Content",
+                        }
+                    }),
             };
 
-            target.Object.Bind(TextBox.TextProperty, binding);
+            source.ApplyTemplate();
 
-            target.Verify(x => x.Bind(
-                TextBox.TextProperty, 
-                It.IsAny<IObservable<BindingValue<string>>>()));
+            var target = (ContentPresenter)source.GetVisualChildren().Single();
+
+            Assert.Null(target.Content);
+            source.Content = "foo";
+            Assert.Equal("foo", target.Content);
+            source.Content = "bar";
+            Assert.Equal("bar", target.Content);
         }
 
         [Fact]
         public void TwoWay_Binding_Should_Be_Set_Up()
         {
-            var target = CreateTarget();
-            var binding = new Binding
+            var source = new Button
             {
-                Mode = BindingMode.TwoWay,
-                RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
-                Priority = BindingPriority.TemplatedParent,
-                Path = "Foo",
+                Template = new FuncControlTemplate<Button>((parent, _) =>
+                    new ContentPresenter
+                    {
+                        [~ContentPresenter.ContentProperty] = new Binding
+                        {
+                            Mode = BindingMode.TwoWay,
+                            RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
+                            Path = "Content",
+                        }
+                    }),
             };
 
-            target.Object.Bind(TextBox.TextProperty, binding);
-
-            target.Verify(x => x.Bind(
-                TextBox.TextProperty,
-                It.IsAny<IObservable<BindingValue<string>>>()));
-        }
+            source.ApplyTemplate();
 
-        private Mock<IControl> CreateTarget(
-            ITemplatedControl templatedParent = null,
-            string text = null)
-        {
-            var result = new Mock<IControl>();
+            var target = (ContentPresenter)source.GetVisualChildren().Single();
 
-            result.Setup(x => x.GetValue(Control.TemplatedParentProperty)).Returns(templatedParent);
-            result.Setup(x => x.GetValue(Control.TemplatedParentProperty)).Returns(templatedParent);
-            result.Setup(x => x.GetValue(TextBox.TextProperty)).Returns(text);
-            result.Setup(x => x.Bind(It.IsAny<DirectPropertyBase<string>>(), It.IsAny<IObservable<BindingValue<string>>>()))
-                .Returns(Disposable.Empty);
-            return result;
+            Assert.Null(target.Content);
+            source.Content = "foo";
+            Assert.Equal("foo", target.Content);
+            target.Content = "bar";
+            Assert.Equal("bar", source.Content);
         }
     }
 }
diff --git a/tests/Avalonia.Markup.UnitTests/Data/DynamicReflectableType.cs b/tests/Avalonia.Markup.UnitTests/Data/DynamicReflectableType.cs
new file mode 100644
index 0000000000..3c57bd38cf
--- /dev/null
+++ b/tests/Avalonia.Markup.UnitTests/Data/DynamicReflectableType.cs
@@ -0,0 +1,221 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Reflection;
+using Moq;
+
+namespace Avalonia.Markup.UnitTests.Data;
+
+class DynamicReflectableType : IReflectableType, INotifyPropertyChanged, IEnumerable<KeyValuePair<string, object>>
+{
+    private Dictionary<string, object> _dic = new();
+
+    public TypeInfo GetTypeInfo()
+    {
+        return new FakeTypeInfo();
+    }
+
+    public void Add(string key, object value)
+    {
+        _dic.Add(key, value);
+        
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(key));
+    }
+
+    public object this[string key]
+    {
+        get => _dic[key];
+        set
+        {
+            _dic[key] = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(key));
+        }
+    }
+    
+    public event PropertyChangedEventHandler PropertyChanged;
+    public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+    {
+        return _dic.GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return ((IEnumerable)_dic).GetEnumerator();
+    }
+
+
+    class FakeTypeInfo : TypeInfo
+    {
+        protected override PropertyInfo GetPropertyImpl(string name, BindingFlags bindingAttr, Binder binder, Type returnType, Type[] types,
+            ParameterModifier[] modifiers)
+        {
+            var propInfo = new Mock<PropertyInfo>();
+            propInfo.SetupGet(x => x.Name).Returns(name);
+            propInfo.SetupGet(x => x.PropertyType).Returns(typeof(object));
+            propInfo.SetupGet(x => x.CanWrite).Returns(true);
+            propInfo.Setup(x => x.GetValue(It.IsAny<object>(), It.IsAny<object[]>()))
+                .Returns((object target, object [] _) => ((DynamicReflectableType)target)._dic.GetValueOrDefault(name));
+            propInfo.Setup(x => x.SetValue(It.IsAny<object>(), It.IsAny<object>(), It.IsAny<object[]>()))
+                .Callback((object target, object value, object [] _) =>
+                {
+                    ((DynamicReflectableType)target)._dic[name] = value;
+                });
+            return propInfo.Object;
+        }
+
+        #region NotSupported
+
+        
+        public override object[] GetCustomAttributes(bool inherit)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override object[] GetCustomAttributes(Type attributeType, bool inherit)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override bool IsDefined(Type attributeType, bool inherit)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Module Module { get; }
+        public override string Namespace { get; }
+        public override string Name { get; }
+        protected override TypeAttributes GetAttributeFlagsImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override ConstructorInfo GetConstructorImpl(BindingFlags bindingAttr, Binder binder, CallingConventions callConvention,
+            Type[] types, ParameterModifier[] modifiers)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override ConstructorInfo[] GetConstructors(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Type GetElementType()
+        {
+            throw new NotSupportedException();
+        }
+
+        public override EventInfo GetEvent(string name, BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override EventInfo[] GetEvents(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override FieldInfo GetField(string name, BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override FieldInfo[] GetFields(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override MemberInfo[] GetMembers(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override MethodInfo GetMethodImpl(string name, BindingFlags bindingAttr, Binder binder, CallingConventions callConvention,
+            Type[] types, ParameterModifier[] modifiers)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override MethodInfo[] GetMethods(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override PropertyInfo[] GetProperties(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override object InvokeMember(string name, BindingFlags invokeAttr, Binder binder, object target, object[] args,
+            ParameterModifier[] modifiers, CultureInfo culture, string[] namedParameters)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Type UnderlyingSystemType { get; }
+
+        protected override bool IsArrayImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override bool IsByRefImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override bool IsCOMObjectImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override bool IsPointerImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        protected override bool IsPrimitiveImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Assembly Assembly { get; }
+        public override string AssemblyQualifiedName { get; }
+        public override Type BaseType { get; }
+        public override string FullName { get; }
+        public override Guid GUID { get; }
+
+        
+
+        protected override bool HasElementTypeImpl()
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Type GetNestedType(string name, BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Type[] GetNestedTypes(BindingFlags bindingAttr)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Type GetInterface(string name, bool ignoreCase)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Type[] GetInterfaces()
+        {
+            throw new NotSupportedException();
+        }
+        
+
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs b/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs
index 6fbf024ff1..b41f37eb3d 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs
@@ -469,6 +469,144 @@ namespace Avalonia.Markup.UnitTests.Parsers
                 result);
         }
 
+        [Fact]
+        public void Nesting_Class()
+        {
+            var result = SelectorGrammar.Parse("^.foo");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.ClassSyntax { Class = "foo" },
+                },
+                result);
+        }
+
+        [Fact]
+        public void Nesting_Child_Class()
+        {
+            var result = SelectorGrammar.Parse("^ > .foo");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.ChildSyntax { },
+                    new SelectorGrammar.ClassSyntax { Class = "foo" },
+                },
+                result);
+        }
+
+        [Fact]
+        public void Nesting_Descendant_Class()
+        {
+            var result = SelectorGrammar.Parse("^ .foo");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.DescendantSyntax { },
+                    new SelectorGrammar.ClassSyntax { Class = "foo" },
+                },
+                result);
+        }
+
+        [Fact]
+        public void Nesting_Template_Class()
+        {
+            var result = SelectorGrammar.Parse("^ /template/ .foo");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.TemplateSyntax { },
+                    new SelectorGrammar.ClassSyntax { Class = "foo" },
+                },
+                result);
+        }
+
+        [Fact]
+        public void OfType_Template_Nesting()
+        {
+            var result = SelectorGrammar.Parse("Button /template/ ^");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.OfTypeSyntax { TypeName = "Button" },
+                    new SelectorGrammar.TemplateSyntax { },
+                    new SelectorGrammar.NestingSyntax(),
+                },
+                result);
+        }
+
+        [Fact]
+        public void Nesting_Property()
+        {
+            var result = SelectorGrammar.Parse("^[Foo=bar]");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.PropertySyntax { Property = "Foo", Value = "bar" },
+                },
+                result);
+        }
+
+        [Fact]
+        public void Not_Nesting()
+        {
+            var result = SelectorGrammar.Parse(":not(^)");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NotSyntax
+                    {
+                        Argument = new[] { new SelectorGrammar.NestingSyntax() },
+                    }
+                },
+                result);
+        }
+
+        [Fact]
+        public void Nesting_NthChild()
+        {
+            var result = SelectorGrammar.Parse("^:nth-child(2n+1)");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.NthChildSyntax()
+                    {
+                        Step = 2,
+                        Offset = 1
+                    }
+                },
+                result);
+        }
+
+        [Fact]
+        public void Nesting_Comma_Nesting_Class()
+        {
+            var result = SelectorGrammar.Parse("^, ^.foo");
+
+            Assert.Equal(
+                new SelectorGrammar.ISyntax[]
+                {
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.CommaSyntax(),
+                    new SelectorGrammar.NestingSyntax(),
+                    new SelectorGrammar.ClassSyntax { Class = "foo" },
+                },
+                result);
+        }
+
         [Fact]
         public void Namespace_Alone_Fails()
         {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
index 14f6525dbe..a0efa7bdeb 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
@@ -16,14 +16,8 @@
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml.Loader\Avalonia.Markup.Xaml.Loader.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
index ecfb54a624..f3f2d2f1e4 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
@@ -8,12 +8,16 @@ using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
 using Avalonia.Data.Converters;
 using Avalonia.Data.Core;
 using Avalonia.Input;
 using Avalonia.Markup.Data;
+using Avalonia.Markup.Xaml.Templates;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.UnitTests;
+using JetBrains.Annotations;
 using XamlX;
 using Xunit;
 
@@ -410,11 +414,11 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
         x:DataType='local:TestDataContext'>
     <ItemsControl Items='{CompiledBinding ListProperty}' Name='target'>
-        <ItemsControl.DataTemplates>
+        <ItemsControl.ItemTemplate>
             <DataTemplate>
                 <TextBlock Text='{CompiledBinding}' Name='textBlock' />
             </DataTemplate>
-        </ItemsControl.DataTemplates>
+        </ItemsControl.ItemTemplate>
     </ItemsControl>
 </Window>";
                 var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
@@ -455,7 +459,106 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
                 ThrowsXamlTransformException(() => AvaloniaRuntimeXamlLoader.Load(xaml));
             }
         }
+        
+        [Fact]
+        public void IgnoresDataTemplateTypeFromDataTypePropertyIfXDataTypeDefined()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Window.DataTemplates>
+        <DataTemplate DataType='local:TestDataContextBaseClass' x:DataType='local:TestDataContext'>
+            <TextBlock Text='{CompiledBinding StringProperty}' Name='textBlock' />
+        </DataTemplate>
+    </Window.DataTemplates>
+    <ContentControl x:DataType='local:TestDataContext' Name='target' Content='{CompiledBinding}' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ContentControl>("target");
+
+                var dataContext = new TestDataContext();
+
+                dataContext.StringProperty = "Initial Value";
+
+                window.DataContext = dataContext;
 
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                ((ContentPresenter)target.Presenter).UpdateChild();
+
+                Assert.Equal(dataContext.StringProperty, ((TextBlock)target.Presenter.Child).Text);
+            }
+        }
+        
+        [Fact]
+        public void InfersCustomDataTemplateBasedOnAttribute()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Window.DataTemplates>
+        <local:CustomDataTemplate FancyDataType='local:TestDataContext'>
+            <TextBlock Text='{CompiledBinding StringProperty}' Name='textBlock' />
+        </local:CustomDataTemplate>
+    </Window.DataTemplates>
+    <ContentControl x:DataType='local:TestDataContext' Name='target' Content='{CompiledBinding}' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ContentControl>("target");
+
+                var dataContext = new TestDataContext();
+
+                dataContext.StringProperty = "Initial Value";
+
+                window.DataContext = dataContext;
+
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                ((ContentPresenter)target.Presenter).UpdateChild();
+
+                Assert.Equal(dataContext.StringProperty, ((TextBlock)target.Presenter.Child).Text);
+            }
+        }
+
+        [Fact]
+        public void InfersCustomDataTemplateBasedOnAttributeFromBaseClass()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Window.DataTemplates>
+        <local:CustomDataTemplateInherit FancyDataType='local:TestDataContext'>
+            <TextBlock Text='{CompiledBinding StringProperty}' Name='textBlock' />
+        </local:CustomDataTemplateInherit>
+    </Window.DataTemplates>
+    <ContentControl x:DataType='local:TestDataContext' Name='target' Content='{CompiledBinding}' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ContentControl>("target");
+
+                var dataContext = new TestDataContext();
+
+                dataContext.StringProperty = "Initial Value";
+
+                window.DataContext = dataContext;
+
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                ((ContentPresenter)target.Presenter).UpdateChild();
+
+                Assert.Equal(dataContext.StringProperty, ((TextBlock)target.Presenter.Child).Text);
+            }
+        }
+        
         [Fact]
         public void ResolvesElementNameBinding()
         {
@@ -1064,6 +1167,37 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             }
         }
 
+        [Fact]
+        public void Binds_To_Self_In_Style()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+       
+    <Window.Styles>
+        <Style Selector='Button'>
+            <Setter Property='IsVisible' Value='{CompiledBinding $self.IsEnabled}' />
+        </Style>
+    </Window.Styles>
+
+    <Button Name='button' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                Assert.True(button.IsVisible);
+
+                button.IsEnabled = false;
+
+                Assert.False(button.IsVisible);
+            }
+        }
+
         [Fact]
         public void SupportsMethodBindingAsDelegate()
         {
@@ -1293,7 +1427,9 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         public string StringProperty { get; set; }
     }
 
-    public class TestDataContext : IHasPropertyDerived
+    public class TestDataContextBaseClass {}
+    
+    public class TestDataContext : TestDataContextBaseClass, IHasPropertyDerived
     {
         public string StringProperty { get; set; }
 
@@ -1382,4 +1518,20 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             return ReferenceEquals(null, parameter) == false;
         }
     }
+
+    public class CustomDataTemplate : IDataTemplate
+    {
+        [DataType]
+        public Type FancyDataType { get; set; }
+
+        [Content]
+        [TemplateContent]
+        public object Content { get; set; }
+
+        public bool Match(object data) => FancyDataType?.IsInstanceOfType(data) ?? true;
+
+        public IControl Build(object data) => TemplateContent.Load(Content)?.Control;
+    }
+    
+    public class CustomDataTemplateInherit : CustomDataTemplate { }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index e51fff5416..f12785a7ce 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -16,6 +16,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Xml;
 using Xunit;
+using Avalonia.Controls.Documents;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 {
@@ -47,12 +48,12 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         public void Attached_Property_Is_Set()
         {
             var xaml =
-        @"<ContentControl xmlns='https://github.com/avaloniaui' TextBlock.FontSize='21'/>";
+        @"<ContentControl xmlns='https://github.com/avaloniaui' TextElement.FontSize='21'/>";
 
             var target = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
             Assert.NotNull(target);
-            Assert.Equal(21.0, TextBlock.GetFontSize(target));
+            Assert.Equal(21.0, TextElement.GetFontSize(target));
         }
 
         [Fact]
@@ -90,13 +91,13 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             using (UnitTestApplication.Start(TestServices.MockWindowingPlatform))
             {
                 var xaml =
-            @"<Window xmlns='https://github.com/avaloniaui' TextBlock.FontSize='{Binding}'/>";
+            @"<Window xmlns='https://github.com/avaloniaui' TextElement.FontSize='{Binding}'/>";
 
                 var target = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
                 target.DataContext = 21.0;
 
-                Assert.Equal(21.0, TextBlock.GetFontSize(target));
+                Assert.Equal(21.0, TextElement.GetFontSize(target));
             }
         }
 
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs
index 8af638c5d7..bcda3f855a 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs
@@ -183,6 +183,37 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Binding_To_Self_In_Style_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+       
+    <Window.Styles>
+        <Style Selector='Button'>
+            <Setter Property='IsVisible' Value='{Binding $self.IsEnabled}' />
+        </Style>
+    </Window.Styles>
+
+    <Button Name='button' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                Assert.True(button.IsVisible);
+
+                button.IsEnabled = false;
+
+                Assert.False(button.IsVisible);
+            }
+        }
+
         [Fact]
         public void Stream_Binding_To_Observable_Works()
         {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs
index 8188b212e1..affa292a7d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs
@@ -74,18 +74,18 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 <Window xmlns='https://github.com/avaloniaui'>
     <DockPanel>
         <TabStrip Name='strip' DockPanel.Dock='Top' Items='{Binding Items}' SelectedIndex='0'>
-          <TabStrip.DataTemplates>
+          <TabStrip.ItemTemplate>
             <DataTemplate>
               <TextBlock Text='{Binding Header}'/>
             </DataTemplate>
-          </TabStrip.DataTemplates>
+          </TabStrip.ItemTemplate>
         </TabStrip>
         <Carousel Name='carousel' Items='{Binding Items}' SelectedIndex='{Binding #strip.SelectedIndex}'>
-          <Carousel.DataTemplates>
+          <Carousel.ItemTemplate>
             <DataTemplate>
               <TextBlock Text='{Binding Detail}'/>
             </DataTemplate>
-          </Carousel.DataTemplates>
+          </Carousel.ItemTemplate>
         </Carousel>
     </DockPanel>
 </Window>";
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
index 53881467e7..e005964ad0 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
@@ -1,5 +1,11 @@
+using System;
+using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Markup.Xaml.Templates;
+using Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;
+using Avalonia.Metadata;
 using Avalonia.UnitTests;
 using Xunit;
 
@@ -89,6 +95,93 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void XDataType_Should_Be_Assigned_To_Clr_Property()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:sys='clr-namespace:System;assembly=netstandard'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.DataTemplates>
+        <DataTemplate x:DataType='sys:String'>
+            <Canvas Name='foo'/>
+        </DataTemplate>
+    </Window.DataTemplates>
+    <ContentControl Name='target' Content='Foo'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ContentControl>("target");
+                var template = (DataTemplate)window.DataTemplates.First();
+                
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                ((ContentPresenter)target.Presenter).UpdateChild();
+                
+                Assert.Equal(typeof(string), template.DataType);
+                Assert.IsType<Canvas>(target.Presenter.Child);
+            }
+        }
+        
+        [Fact]
+        public void XDataType_Should_Be_Ignored_If_DataType_Already_Set()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:sys='clr-namespace:System;assembly=netstandard'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.DataTemplates>
+        <DataTemplate DataType='sys:String' x:DataType='UserControl'>
+            <Canvas Name='foo'/>
+        </DataTemplate>
+    </Window.DataTemplates>
+    <ContentControl Name='target' Content='Foo'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ContentControl>("target");
+
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                ((ContentPresenter)target.Presenter).UpdateChild();
+
+                Assert.IsType<Canvas>(target.Presenter.Child);
+            }
+        }
+        
+        [Fact]
+        public void XDataType_Should_Be_Ignored_If_DataType_Has_Non_Standard_Name()
+        {
+            // We don't want DataType to be mapped to FancyDataType, avoid possible confusion.
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:sys='clr-namespace:System;assembly=netstandard'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <ContentControl Name='target' Content='Foo'>
+        <ContentControl.ContentTemplate>
+            <local:CustomDataTemplate x:DataType='local:TestDataContext'>
+                <TextBlock Text='{CompiledBinding StringProperty}' Name='textBlock' />
+            </local:CustomDataTemplate>
+        </ContentControl.ContentTemplate>
+    </ContentControl>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ContentControl>("target");
+                
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                ((ContentPresenter)target.Presenter).UpdateChild();
+
+                var dataTemplate = (CustomDataTemplate)target.ContentTemplate;
+                Assert.Null(dataTemplate.FancyDataType);
+            }
+        }
+        
         [Fact]
         public void Can_Set_DataContext_In_DataTemplate()
         {
@@ -132,5 +225,25 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.Same(viewModel.Child.Child, canvas.DataContext);
             }
         }
+        
+        [Fact]
+        public void DataTemplates_Without_Type_Should_Throw()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:sys='clr-namespace:System;assembly=netstandard'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.DataTemplates>
+        <DataTemplate>
+            <Canvas Name='foo'/>
+        </DataTemplate>
+    </Window.DataTemplates>
+    <ContentControl Name='target' Content='Foo'/>
+</Window>";
+                Assert.Throws<InvalidOperationException>(() => (Window)AvaloniaRuntimeXamlLoader.Load(xaml));
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/InitializationOrderTracker.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/InitializationOrderTracker.cs
index cb37dea220..7ba21c4673 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/InitializationOrderTracker.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/InitializationOrderTracker.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             base.OnAttachedToLogicalTree(e);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             Order.Add($"Property {change.Property.Name} Changed");
             base.OnPropertyChanged(change);
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
index 022ff0c3a4..682fc622b8 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
@@ -617,5 +617,35 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.Equal(Colors.Red, ((ISolidColorBrush)foo.Background).Color);
             }
         }
+
+        [Fact]
+        public void Can_Use_Nested_Styles()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Styles>
+        <Style Selector='Border'>
+            <Style Selector='^.foo'>
+                <Setter Property='Background' Value='Red'/>
+            </Style>
+        </Style>
+    </Window.Styles>
+    <StackPanel>
+        <Border Name='foo'/>
+    </StackPanel>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var foo = window.FindControl<Border>("foo");
+
+                Assert.Null(foo.Background);
+
+                foo.Classes.Add("foo");
+
+                Assert.Equal(Colors.Red, ((ISolidColorBrush)foo.Background).Color);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
index 3fdac49f31..81e94bde4f 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
@@ -14,12 +14,29 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         {
             using (UnitTestApplication.Start(TestServices.MockPlatformWrapper))
             {
-                var xaml = "<DataTemplates xmlns='https://github.com/avaloniaui'><TreeDataTemplate ItemsSource='{Binding}'/></DataTemplates>";
+                var xaml = "<DataTemplates xmlns='https://github.com/avaloniaui'><TreeDataTemplate DataType='Control' ItemsSource='{Binding}'/></DataTemplates>";
                 var templates = (DataTemplates)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var template = (TreeDataTemplate)(templates.First());
 
                 Assert.IsType<Binding>(template.ItemsSource);
             }                
         }
+        
+        [Fact]
+        public void XDataType_Should_Be_Assigned_To_Clr_Property()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformWrapper))
+            {
+                var xaml = @"
+<DataTemplates xmlns='https://github.com/avaloniaui'
+               xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <TreeDataTemplate x:DataType='x:String' />
+</DataTemplates>";
+                var templates = (DataTemplates)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var template = (TreeDataTemplate)(templates.First());
+
+                Assert.Equal(typeof(string), template.DataType);
+            }                
+        }
     }
 }
diff --git a/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs b/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs
new file mode 100644
index 0000000000..06e46c1a06
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs
@@ -0,0 +1,52 @@
+using Avalonia.Media;
+using Xunit;
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+
+using Avalonia.Direct2D1.RenderTests;
+
+namespace Avalonia.Direct2D1.RenderTests.Media
+#endif
+{
+    public class GeometryDrawingTests : TestBase
+    {
+        public GeometryDrawingTests()
+            : base(@"Media\GeometryDrawing")
+        {
+        }
+
+        private GeometryDrawing CreateGeometryDrawing()
+        {
+            GeometryDrawing geometryDrawing = new GeometryDrawing();
+            EllipseGeometry ellipse = new EllipseGeometry();
+            ellipse.RadiusX = 100;
+            ellipse.RadiusY = 100;
+            geometryDrawing.Geometry = ellipse;
+            return geometryDrawing;
+        }
+
+        [Fact]
+        public void DrawingGeometry_WithPen()
+        {
+            GeometryDrawing geometryDrawing = CreateGeometryDrawing();
+            geometryDrawing.Pen = new Pen(new SolidColorBrush(Color.FromArgb(255, 0, 0, 0)), 10);
+
+            Assert.Equal(210, geometryDrawing.GetBounds().Height);
+            Assert.Equal(210, geometryDrawing.GetBounds().Width);
+
+        }
+
+        [Fact]
+        public void DrawingGeometry_WithoutPen()
+        {
+            GeometryDrawing geometryDrawing = CreateGeometryDrawing();
+
+            Assert.Equal(200, geometryDrawing.GetBounds().Height);
+            Assert.Equal(200, geometryDrawing.GetBounds().Width);
+        }
+
+
+    }
+}
diff --git a/tests/Avalonia.RenderTests/Media/GlyphRunTests.cs b/tests/Avalonia.RenderTests/Media/GlyphRunTests.cs
new file mode 100644
index 0000000000..6a8884a33a
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Media/GlyphRunTests.cs
@@ -0,0 +1,81 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Documents;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Xunit;
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+namespace Avalonia.Direct2D1.RenderTests.Media
+#endif
+{
+    public class GlyphRunTests : TestBase
+    {
+        public GlyphRunTests()
+            : base(@"Media\GlyphRun")
+        {
+        }
+         
+        [Fact]
+        public async Task Should_Render_GlyphRun_Geometry()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 100,
+                Child = new GlyphRunGeometryControl
+                {
+                    [TextElement.ForegroundProperty] = new LinearGradientBrush
+                    {
+                        StartPoint = new RelativePoint(0, 0.5, RelativeUnit.Relative),
+                        EndPoint = new RelativePoint(1, 0.5, RelativeUnit.Relative),
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        }
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+
+            CompareImages();
+        }
+
+        public class GlyphRunGeometryControl : Control
+        {
+            private readonly Geometry _geometry;
+
+            public GlyphRunGeometryControl()
+            {
+                var glyphTypeface = new Typeface(TestFontFamily).GlyphTypeface;
+
+                var glyphIndices = new[] { glyphTypeface.GetGlyph('A'), glyphTypeface.GetGlyph('B'), glyphTypeface.GetGlyph('C') };
+
+                var characters = new[] { 'A', 'B', 'C' };
+
+                var glyphRun = new GlyphRun(glyphTypeface, 100, characters, glyphIndices);
+
+                _geometry = glyphRun.BuildGeometry();
+            }
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                return _geometry.Bounds.Size;
+            }
+
+            public override void Render(DrawingContext context)
+            {
+                var foreground = TextElement.GetForeground(this);
+
+                context.DrawGeometry(foreground, null, _geometry);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
index 6ed4ba0d4a..b668f4d39e 100644
--- a/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
@@ -1,11 +1,8 @@
 using Avalonia.Media;
-using Avalonia.Platform;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Media.TextFormatting;
diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index b70c721085..39250f2aa7 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -1,10 +1,9 @@
 using System.IO;
 using System.Runtime.CompilerServices;
-using ImageMagick;
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
 using Avalonia.Rendering;
-
+using SixLabors.ImageSharp;
 using Xunit;
 using Avalonia.Platform;
 using System.Threading.Tasks;
@@ -12,6 +11,8 @@ using System;
 using System.Threading;
 using Avalonia.Media;
 using Avalonia.Threading;
+using SixLabors.ImageSharp.PixelFormats;
+using Image = SixLabors.ImageSharp.Image;
 #if AVALONIA_SKIA
 using Avalonia.Skia;
 #else
@@ -24,8 +25,6 @@ namespace Avalonia.Skia.RenderTests
 namespace Avalonia.Direct2D1.RenderTests
 #endif
 {
-    using Avalonia.PlatformSupport;
-
     public class TestBase
     {
 #if AVALONIA_SKIA
@@ -119,12 +118,12 @@ namespace Avalonia.Direct2D1.RenderTests
             var immediatePath = Path.Combine(OutputPath, testName + ".immediate.out.png");
             var deferredPath = Path.Combine(OutputPath, testName + ".deferred.out.png");
 
-            using (var expected = new MagickImage(expectedPath))
-            using (var immediate = new MagickImage(immediatePath))
-            using (var deferred = new MagickImage(deferredPath))
+            using (var expected = Image.Load<Rgba32>(expectedPath))
+            using (var immediate = Image.Load<Rgba32>(immediatePath))
+            using (var deferred = Image.Load<Rgba32>(deferredPath))
             {
-                double immediateError = expected.Compare(immediate, ErrorMetric.RootMeanSquared);
-                double deferredError = expected.Compare(deferred, ErrorMetric.RootMeanSquared);
+                var immediateError = CompareImages(immediate, expected);
+                var deferredError = CompareImages(deferred, expected);
 
                 if (immediateError > 0.022)
                 {
@@ -143,10 +142,10 @@ namespace Avalonia.Direct2D1.RenderTests
             var expectedPath = Path.Combine(OutputPath, testName + ".expected.png");
             var actualPath = Path.Combine(OutputPath, testName + ".out.png");
 
-            using (var expected = new MagickImage(expectedPath))
-            using (var actual = new MagickImage(actualPath))
+            using (var expected = Image.Load<Rgba32>(expectedPath))
+            using (var actual = Image.Load<Rgba32>(actualPath))
             {
-                double immediateError = expected.Compare(actual, ErrorMetric.RootMeanSquared);
+                double immediateError = CompareImages(actual, expected);
 
                 if (immediateError > 0.022)
                 {
@@ -154,6 +153,53 @@ namespace Avalonia.Direct2D1.RenderTests
                 }
             }
         }
+        
+        /// <summary>
+        /// Calculates root mean square error for given two images.
+        /// Based roughly on ImageMagick implementation to ensure consistency.
+        /// </summary>
+        private static double CompareImages(Image<Rgba32> actual, Image<Rgba32> expected)
+        {
+            if (actual.Width != expected.Width || actual.Height != expected.Height)
+            {
+                throw new ArgumentException("Images have different resolutions");
+            }
+
+            var quantity = actual.Width * actual.Height;
+            double squaresError = 0;
+
+            const double scale = 1 / 255d;
+            
+            for (var x = 0; x < actual.Width; x++)
+            {
+                double localError = 0;
+                
+                for (var y = 0; y < actual.Height; y++)
+                {
+                    var expectedAlpha = expected[x, y].A * scale;
+                    var actualAlpha = actual[x, y].A * scale;
+                    
+                    var r = scale * (expectedAlpha * expected[x, y].R - actualAlpha * actual[x, y].R);
+                    var g = scale * (expectedAlpha * expected[x, y].G - actualAlpha * actual[x, y].G);
+                    var b = scale * (expectedAlpha * expected[x, y].B - actualAlpha * actual[x, y].B);
+                    var a = expectedAlpha - actualAlpha;
+
+                    var error = r * r + g * g + b * b + a * a;
+
+                    localError += error;
+                }
+
+                squaresError += localError;
+            }
+
+            var meanSquaresError = squaresError / quantity;
+
+            const int channelCount = 4;
+            
+            meanSquaresError = meanSquaresError / channelCount;
+            
+            return Math.Sqrt(meanSquaresError);
+        }
 
         private string GetTestsDirectory()
         {
diff --git a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
index 5189e9335a..d3f2b44968 100644
--- a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
+++ b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
@@ -12,21 +12,15 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
     <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Magick.NET-Q16-AnyCPU.props" />
+  <Import Project="..\..\build\ImageSharp.props" />
   <Import Project="..\..\build\SkiaSharp.props" />
   <Import Project="..\..\build\SharedVersion.props" />
 </Project>
diff --git a/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj b/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj
index e37cd25009..ccde66a50e 100644
--- a/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj
+++ b/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj
@@ -13,14 +13,8 @@
     <EmbeddedResource Include="..\Avalonia.RenderTests\**\*.ttf" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
diff --git a/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs b/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
index 904f0935c4..3b9caa393e 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
@@ -17,8 +17,9 @@ namespace Avalonia.Skia.UnitTests.Media
         {
             using (Start())
             {
+                var options = new TextShaperOptions(Typeface.Default.GlyphTypeface, 10, direction, CultureInfo.CurrentCulture);
                 var shapedBuffer =
-                    TextShaper.Current.ShapeText(text.AsMemory(), Typeface.Default.GlyphTypeface, 10, CultureInfo.CurrentCulture, direction);
+                    TextShaper.Current.ShapeText(text.AsMemory(), options);
 
                 var glyphRun = CreateGlyphRun(shapedBuffer);
 
@@ -59,8 +60,9 @@ namespace Avalonia.Skia.UnitTests.Media
         {
             using (Start())
             {
+                var options = new TextShaperOptions(Typeface.Default.GlyphTypeface, 10, direction, CultureInfo.CurrentCulture);
                 var shapedBuffer =
-                    TextShaper.Current.ShapeText(text.AsMemory(), Typeface.Default.GlyphTypeface, 10, CultureInfo.CurrentCulture, direction);
+                    TextShaper.Current.ShapeText(text.AsMemory(), options);
 
                 var glyphRun = CreateGlyphRun(shapedBuffer);
 
@@ -103,8 +105,9 @@ namespace Avalonia.Skia.UnitTests.Media
         {
             using (Start())
             {
+                var options = new TextShaperOptions(Typeface.Default.GlyphTypeface, 10, direction, CultureInfo.CurrentCulture);
                 var shapedBuffer =
-                   TextShaper.Current.ShapeText(text.AsMemory(), Typeface.Default.GlyphTypeface, 10, CultureInfo.CurrentCulture, direction);
+                   TextShaper.Current.ShapeText(text.AsMemory(), options);
 
                 var glyphRun = CreateGlyphRun(shapedBuffer);
 
diff --git a/tests/Avalonia.Skia.UnitTests/Media/SKTypefaceCollectionCacheTests.cs b/tests/Avalonia.Skia.UnitTests/Media/SKTypefaceCollectionCacheTests.cs
index ddf4a36dcd..64050bd85e 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/SKTypefaceCollectionCacheTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/SKTypefaceCollectionCacheTests.cs
@@ -28,7 +28,7 @@ namespace Avalonia.Skia.UnitTests.Media
         }
         
         [Fact]
-        public void Should_Get_Null_For_Invalid_FamilyName()
+        public void Should_Get_Typeface_For_Invalid_FamilyName()
         {
             using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
@@ -39,7 +39,24 @@ namespace Avalonia.Skia.UnitTests.Media
 
                 var typeface = notoMonoCollection.Get(new Typeface("ABC"));
                 
-                Assert.Null(typeface);
+                Assert.NotNull(typeface);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_Typeface_For_Partial_FamilyName()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var fontFamily = new FontFamily("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#T");
+
+                var fontCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(fontFamily);
+
+                var typeface = fontCollection.Get(new Typeface(fontFamily));
+
+                Assert.NotNull(typeface);
+
+                Assert.Equal("Twitter Color Emoji", typeface.FamilyName);
             }
         }
     }
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/MultiBufferTextSource.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/MultiBufferTextSource.cs
index 2a20fdd9fe..005bcdf70e 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/MultiBufferTextSource.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/MultiBufferTextSource.cs
@@ -20,15 +20,10 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
         public TextRun GetTextRun(int textSourceIndex)
         {
-            if (textSourceIndex > 50)
+            if (textSourceIndex >= 50)
             {
                 return null;
             }
-            
-            if (textSourceIndex == 50)
-            {
-                return new TextEndOfParagraph();
-            }
 
             var index = textSourceIndex / 10;
 
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/SingleBufferTextSource.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/SingleBufferTextSource.cs
index 65c342b065..dee4fe7f77 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/SingleBufferTextSource.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/SingleBufferTextSource.cs
@@ -23,13 +23,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             }
             
             var runText = _text.Skip(textSourceIndex);
-            
-            if (runText.IsEmpty)
-            {
-                return new TextEndOfParagraph();
-            }
 
-            return new TextCharacters(runText, _defaultGenericPropertiesRunProperties);
+            return runText.IsEmpty ? null : new TextCharacters(runText, _defaultGenericPropertiesRunProperties);
         }
     }
 }
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
index 326997328b..d395f68f96 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
@@ -58,7 +58,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 Assert.Equal(5, textLine.TextRuns.Count);
 
-                Assert.Equal(50, textLine.TextRange.Length);
+                Assert.Equal(50, textLine.Length);
             }
         }
 
@@ -89,7 +89,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 var textLine = formatter.FormatLine(textSource, 0, double.PositiveInfinity,
                     new GenericTextParagraphProperties(defaultProperties));
 
-                Assert.Equal(text.Length, textLine.TextRange.Length);
+                Assert.Equal(text.Length, textLine.Length);
 
                 for (var i = 0; i < GenericTextRunPropertiesRuns.Length; i++)
                 {
@@ -195,10 +195,10 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                     if (text.Length - currentPosition > expectedCharactersPerLine)
                     {
-                        Assert.Equal(expectedCharactersPerLine, textLine.TextRange.Length);
+                        Assert.Equal(expectedCharactersPerLine, textLine.Length);
                     }
 
-                    currentPosition += textLine.TextRange.Length;
+                    currentPosition += textLine.Length;
 
                     numberOfLines++;
                 }
@@ -249,16 +249,18 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         formatter.FormatLine(textSource, currentPosition, paragraphWidth,
                             new GenericTextParagraphProperties(defaultProperties, textWrap: TextWrapping.Wrap));
 
-                    Assert.True(expected.Contains(textLine.TextRange.End));
+                    var end = textLine.FirstTextSourceIndex + textLine.Length - 1;
 
-                    var index = expected.IndexOf(textLine.TextRange.End);
+                    Assert.True(expected.Contains(end));
+
+                    var index = expected.IndexOf(end);
 
                     for (var i = 0; i <= index; i++)
                     {
                         expected.RemoveAt(0);
                     }
 
-                    currentPosition += textLine.TextRange.Length;
+                    currentPosition += textLine.Length;
                 }
             }
         }
@@ -312,7 +314,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                     Assert.True(textLine.Width <= 200);
 
-                    textSourceIndex += textLine.TextRange.Length;
+                    textSourceIndex += textLine.Length;
                 }
             }
         }
@@ -336,9 +338,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     var textLine =
                         formatter.FormatLine(textSource, textSourceIndex, 3, paragraphProperties);
 
-                    Assert.NotEqual(0, textLine.TextRange.Length);
+                    Assert.NotEqual(0, textLine.Length);
 
-                    textSourceIndex += textLine.TextRange.Length;
+                    textSourceIndex += textLine.Length;
                 }
 
                 Assert.Equal(text.Length, textSourceIndex);
@@ -383,16 +385,16 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         formatter.FormatLine(textSource, currentPosition, 300,
                             new GenericTextParagraphProperties(defaultProperties, textWrap: TextWrapping.WrapWithOverflow));
 
-                    currentPosition += textLine.TextRange.Length;
+                    currentPosition += textLine.Length;
 
                     if (textLine.Width > 300 || currentHeight + textLine.Height > 240)
                     {
-                        textLine = textLine.Collapse(new TextTrailingWordEllipsis(300, defaultProperties));
+                        textLine = textLine.Collapse(new TextTrailingWordEllipsis(new ReadOnlySlice<char>(new[] {TextTrimming.s_defaultEllipsisChar}), 300, defaultProperties));
                     }
                     
                     currentHeight += textLine.Height;
 
-                    var currentText = text.Substring(textLine.TextRange.Start, textLine.TextRange.Length);
+                    var currentText = text.Substring(textLine.FirstTextSourceIndex, textLine.Length);
                     
                     Assert.Equal(expectedLines[currentLineIndex], currentText);
 
@@ -485,9 +487,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     var textLine =
                         formatter.FormatLine(textSource, textPosition, 50, paragraphProperties, lastBreak);
 
-                    Assert.Equal(textLine.TextRange.Length, textLine.TextRuns.Sum(x => x.TextSourceLength));
+                    Assert.Equal(textLine.Length, textLine.TextRuns.Sum(x => x.TextSourceLength));
                     
-                    textPosition += textLine.TextRange.Length;
+                    textPosition += textLine.Length;
 
                     lastBreak = textLine.TextLineBreak;
                 }
@@ -508,7 +510,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 var textLine =
                     formatter.FormatLine(textSource, 0, 33, paragraphProperties);
                 
-                Assert.NotNull(textLine.TextLineBreak?.RemainingCharacters);
+                Assert.NotNull(textLine.TextLineBreak?.RemainingRuns);
             }
         }
 
@@ -562,6 +564,98 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             }
         }
 
+        [Fact]
+        public void Should_FormatLine_With_DrawableRuns()
+        {
+            var defaultRunProperties = new GenericTextRunProperties(Typeface.Default, foregroundBrush: Brushes.Black);
+            var paragraphProperties = new GenericTextParagraphProperties(defaultRunProperties);
+            var textSource = new CustomTextSource("Hello World ->");
+
+            using (Start())
+            {
+                var textLine =
+                    TextFormatter.Current.FormatLine(textSource, 0, double.PositiveInfinity, paragraphProperties);
+                
+                Assert.Equal(3, textLine.TextRuns.Count);
+                
+                Assert.True(textLine.TextRuns[1] is RectangleRun);
+            }
+        }
+
+        [Fact]
+        public void Should_Format_With_EndOfLineRun()
+        {
+            using (Start())
+            {
+                var defaultRunProperties = new GenericTextRunProperties(Typeface.Default);
+                var paragraphProperties = new GenericTextParagraphProperties(defaultRunProperties);
+                var textSource = new EndOfLineTextSource();
+                
+                var textLine =
+                    TextFormatter.Current.FormatLine(textSource, 0, double.PositiveInfinity, paragraphProperties);
+                
+                Assert.NotNull(textLine.TextLineBreak);
+                
+                Assert.Equal(TextRun.DefaultTextSourceLength, textLine.Length);
+            }
+        }
+
+        private class EndOfLineTextSource : ITextSource
+        {
+            public TextRun GetTextRun(int textSourceIndex)
+            {
+                return new TextEndOfLine();
+            }
+        }
+
+        private class CustomTextSource : ITextSource
+        {
+            private readonly string _text;
+
+            public CustomTextSource(string text)
+            {
+                _text = text;
+            }
+            
+            public TextRun GetTextRun(int textSourceIndex)
+            {
+                if (textSourceIndex >= _text.Length + TextRun.DefaultTextSourceLength + _text.Length)
+                {
+                    return null;
+                }
+
+                if (textSourceIndex == _text.Length)
+                {
+                    return new RectangleRun(new Rect(0, 0, 50, 50), Brushes.Green);
+                }
+
+                return new TextCharacters(_text.AsMemory(),
+                    new GenericTextRunProperties(Typeface.Default, foregroundBrush: Brushes.Black));
+            }
+        }
+
+        private class RectangleRun : DrawableTextRun
+        {
+            private readonly Rect _rect;
+            private readonly IBrush _fill;
+
+            public RectangleRun(Rect rect, IBrush fill)
+            {
+                _rect = rect;
+                _fill = fill;
+            }
+
+            public override Size Size => _rect.Size;
+            public override double Baseline => 0;
+            public override void Draw(DrawingContext drawingContext, Point origin)
+            {
+                using (drawingContext.PushPreTransform(Matrix.CreateTranslation(new Vector(origin.X, 0))))
+                {
+                    drawingContext.FillRectangle(_fill, _rect);
+                }
+            }
+        }
+
         public static IDisposable Start()
         {
             var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
index d331def414..7e1103d624 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
@@ -88,8 +88,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     textWrapping: TextWrapping.Wrap,
                     maxWidth: 200);
 
-                var expectedLines = expected.TextLines.Select(x => text.Substring(x.TextRange.Start,
-                    x.TextRange.Length)).ToList();
+                var expectedLines = expected.TextLines.Select(x => text.Substring(x.FirstTextSourceIndex,
+                    x.Length)).ToList();
 
                 var spans = new[]
                 {
@@ -106,8 +106,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     maxWidth: 200,
                     textStyleOverrides: spans);
 
-                var actualLines = actual.TextLines.Select(x => text.Substring(x.TextRange.Start,
-                    x.TextRange.Length)).ToList();
+                var actualLines = actual.TextLines.Select(x => text.Substring(x.FirstTextSourceIndex,
+                    x.Length)).ToList();
 
                 Assert.Equal(expectedLines.Count, actualLines.Count);
 
@@ -140,7 +140,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     black,
                     textWrapping: TextWrapping.Wrap);
 
-                var expectedGlyphs = expected.TextLines.Select(x => string.Join('|', x.TextRuns.Cast<ShapedTextCharacters>().SelectMany(x => x.ShapedBuffer.GlyphIndices))).ToList();
+                var expectedGlyphs = expected.TextLines.Select(x => string.Join('|', x.TextRuns.Cast<ShapedTextCharacters>()
+                    .SelectMany(x => x.ShapedBuffer.GlyphIndices))).ToList();
 
                 var outer = new GraphemeEnumerator(text.AsMemory());
                 var inner = new GraphemeEnumerator(text.AsMemory());
@@ -172,7 +173,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                             textWrapping: TextWrapping.Wrap,
                             textStyleOverrides: spans);
 
-                        var actualGlyphs = actual.TextLines.Select(x => string.Join('|', x.TextRuns.Cast<ShapedTextCharacters>().SelectMany(x => x.ShapedBuffer.GlyphIndices))).ToList();
+                        var actualGlyphs = actual.TextLines.Select(x => string.Join('|', x.TextRuns.Cast<ShapedTextCharacters>()
+                            .SelectMany(x => x.ShapedBuffer.GlyphIndices))).ToList();
 
                         Assert.Equal(expectedGlyphs.Count, actualGlyphs.Count);
 
@@ -348,7 +350,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     12.0f,
                     Brushes.Black.ToImmutable());
 
-                Assert.Equal(MultiLineText.Length, layout.TextLines.Sum(x => x.TextRange.Length));
+                Assert.Equal(MultiLineText.Length, layout.TextLines.Sum(x => x.Length));
             }
         }
 
@@ -813,7 +815,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         Assert.True(textLine.Width <= maxWidth);
 
                         var actual = new string(textLine.TextRuns.Cast<ShapedTextCharacters>().OrderBy(x => x.Text.Start).SelectMany(x => x.Text).ToArray());
-                        var expected = text.Substring(textLine.TextRange.Start, textLine.TextRange.Length);
+                        var expected = text.Substring(textLine.FirstTextSourceIndex, textLine.Length);
 
                         Assert.Equal(expected, actual);
                     }                  
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
index d1a8f175e7..58cb84c4a4 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
@@ -35,9 +35,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                     var firstCharacterHit = textLine.GetPreviousCaretCharacterHit(new CharacterHit(int.MinValue));
 
-                    Assert.Equal(textLine.TextRange.Start, firstCharacterHit.FirstCharacterIndex);
+                    Assert.Equal(textLine.FirstTextSourceIndex, firstCharacterHit.FirstCharacterIndex);
 
-                    currentIndex += textLine.TextRange.Length;
+                    currentIndex += textLine.Length;
                 }
             }
         }
@@ -63,19 +63,19 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                     var lastCharacterHit = textLine.GetNextCaretCharacterHit(new CharacterHit(int.MaxValue));
 
-                    Assert.Equal(textLine.TextRange.Start + textLine.TextRange.Length,
+                    Assert.Equal(textLine.FirstTextSourceIndex + textLine.Length,
                         lastCharacterHit.FirstCharacterIndex + lastCharacterHit.TrailingLength);
 
-                    currentIndex += textLine.TextRange.Length;
+                    currentIndex += textLine.Length;
                 }
             }
         }
-        
+
         [Fact]
         public void Should_Get_Next_Caret_CharacterHit_Bidi()
         {
             const string text = "אבג 1 ABC";
-            
+
             using (Start())
             {
                 var defaultProperties = new GenericTextRunProperties(Typeface.Default);
@@ -90,7 +90,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var clusters = new List<int>();
 
-                foreach (var textRun in textLine.TextRuns.OrderBy(x=> x.Text.Start))
+                foreach (var textRun in textLine.TextRuns.OrderBy(x => x.Text.Start))
                 {
                     var shapedRun = (ShapedTextCharacters)textRun;
 
@@ -98,7 +98,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         shapedRun.ShapedBuffer.GlyphClusters.Reverse() :
                         shapedRun.ShapedBuffer.GlyphClusters);
                 }
-                
+
                 var nextCharacterHit = new CharacterHit(0, clusters[1] - clusters[0]);
 
                 foreach (var cluster in clusters)
@@ -122,7 +122,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
         public void Should_Get_Previous_Caret_CharacterHit_Bidi()
         {
             const string text = "אבג 1 ABC";
-            
+
             using (Start())
             {
                 var defaultProperties = new GenericTextRunProperties(Typeface.Default);
@@ -137,7 +137,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var clusters = new List<int>();
 
-                foreach (var textRun in textLine.TextRuns.OrderBy(x=> x.Text.Start))
+                foreach (var textRun in textLine.TextRuns.OrderBy(x => x.Text.Start))
                 {
                     var shapedRun = (ShapedTextCharacters)textRun;
 
@@ -147,13 +147,13 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 }
 
                 clusters.Reverse();
-                
+
                 var nextCharacterHit = new CharacterHit(text.Length - 1);
 
                 foreach (var cluster in clusters)
                 {
                     var currentCaretIndex = nextCharacterHit.FirstCharacterIndex + nextCharacterHit.TrailingLength;
-                    
+
                     Assert.Equal(cluster, currentCaretIndex);
 
                     nextCharacterHit = textLine.GetPreviousCaretCharacterHit(nextCharacterHit);
@@ -168,7 +168,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 Assert.Equal(lastCharacterHit.TrailingLength, nextCharacterHit.TrailingLength);
             }
         }
-        
+
         [InlineData("𐐷𐐷𐐷𐐷𐐷")]
         [InlineData("01234567🎉\n")]
         [InlineData("𐐷1234")]
@@ -277,6 +277,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 firstCharacterHit = previousCharacterHit;
 
+                firstCharacterHit = textLine.GetPreviousCaretCharacterHit(firstCharacterHit);
+
                 previousCharacterHit = textLine.GetPreviousCaretCharacterHit(firstCharacterHit);
 
                 Assert.Equal(firstCharacterHit.FirstCharacterIndex, previousCharacterHit.FirstCharacterIndex);
@@ -322,7 +324,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     }
                 }
 
-                Assert.Equal(currentDistance,textLine.GetDistanceFromCharacterHit(new CharacterHit(s_multiLineText.Length)));
+                Assert.Equal(currentDistance, textLine.GetDistanceFromCharacterHit(new CharacterHit(s_multiLineText.Length)));
             }
         }
 
@@ -360,12 +362,29 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             }
         }
 
-        [InlineData("01234 01234", 58, TextCollapsingStyle.TrailingCharacter, "01234 0\u2026")]
-        [InlineData("01234 01234", 58, TextCollapsingStyle.TrailingWord, "01234\u2026")]
-        [InlineData("01234", 9, TextCollapsingStyle.TrailingCharacter, "\u2026")]
-        [InlineData("01234", 2, TextCollapsingStyle.TrailingCharacter, "")]
+        public static IEnumerable<object[]> CollapsingData
+        {
+            get
+            {
+                yield return CreateData("01234 01234 01234", 120, TextTrimming.PrefixCharacterEllipsis, "01234 01\u20264 01234");
+                yield return CreateData("01234 01234", 58, TextTrimming.CharacterEllipsis, "01234 0\u2026");
+                yield return CreateData("01234 01234", 58, TextTrimming.WordEllipsis, "01234\u2026");
+                yield return CreateData("01234", 9, TextTrimming.CharacterEllipsis, "\u2026");
+                yield return CreateData("01234", 2, TextTrimming.CharacterEllipsis, "");
+
+                object[] CreateData(string text, double width, TextTrimming mode, string expected)
+                {
+                    return new object[]
+                    {
+                        text, width, mode, expected
+                    };
+                }
+            }
+        }
+
+        [MemberData(nameof(CollapsingData))]
         [Theory]
-        public void Should_Collapse_Line(string text, double width, TextCollapsingStyle style, string expected)
+        public void Should_Collapse_Line(string text, double width, TextTrimming trimming, string expected)
         {
             using (Start())
             {
@@ -381,16 +400,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 Assert.False(textLine.HasCollapsed);
 
-                TextCollapsingProperties collapsingProperties;
-
-                if (style == TextCollapsingStyle.TrailingCharacter)
-                {
-                    collapsingProperties = new TextTrailingCharacterEllipsis(width, defaultProperties);
-                }
-                else
-                {
-                    collapsingProperties = new TextTrailingWordEllipsis(width, defaultProperties);
-                }
+                TextCollapsingProperties collapsingProperties = trimming.CreateCollapsingProperties(new TextCollapsingCreateInfo(width, defaultProperties));
 
                 var collapsedLine = textLine.Collapse(collapsingProperties);
 
@@ -408,24 +418,252 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
         }
 
         [Fact]
-        public void TextLineBreak_Should_Contain_TextEndOfLine()
+        public void Should_Get_Next_CharacterHit_For_Drawable_Runs()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new DrawableRunTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                Assert.Equal(4, textLine.TextRuns.Count);
+
+                var currentHit = textLine.GetNextCaretCharacterHit(new CharacterHit(0));
+
+                Assert.Equal(1, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+
+                currentHit = textLine.GetNextCaretCharacterHit(currentHit);
+
+                Assert.Equal(2, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+
+                currentHit = textLine.GetNextCaretCharacterHit(currentHit);
+
+                Assert.Equal(3, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+
+                currentHit = textLine.GetNextCaretCharacterHit(currentHit);
+
+                Assert.Equal(3, currentHit.FirstCharacterIndex);
+                Assert.Equal(1, currentHit.TrailingLength);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_Previous_CharacterHit_For_Drawable_Runs()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new DrawableRunTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                Assert.Equal(4, textLine.TextRuns.Count);
+
+                var currentHit = textLine.GetPreviousCaretCharacterHit(new CharacterHit(3, 1));
+
+                Assert.Equal(3, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+
+                currentHit = textLine.GetPreviousCaretCharacterHit(currentHit);
+
+                Assert.Equal(2, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+
+                currentHit = textLine.GetPreviousCaretCharacterHit(currentHit);
+
+                Assert.Equal(1, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+
+                currentHit = textLine.GetPreviousCaretCharacterHit(currentHit);
+
+                Assert.Equal(0, currentHit.FirstCharacterIndex);
+                Assert.Equal(0, currentHit.TrailingLength);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_CharacterHit_From_Distance_For_Drawable_Runs()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new DrawableRunTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var characterHit = textLine.GetCharacterHitFromDistance(50);
+
+                Assert.Equal(3, characterHit.FirstCharacterIndex);
+                Assert.Equal(1, characterHit.TrailingLength);
+
+                characterHit = textLine.GetCharacterHitFromDistance(32);
+
+                Assert.Equal(2, characterHit.FirstCharacterIndex);
+                Assert.Equal(1, characterHit.TrailingLength);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_Distance_From_CharacterHit_Drawable_Runs()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new DrawableRunTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(1));
+
+                Assert.Equal(14, distance);
+
+                distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(2));
+
+                Assert.True(distance > 14);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_Distance_From_CharacterHit_Mixed_TextBuffer()
         {
             using (Start())
             {
-                var defaultTextRunProperties =
-                    new GenericTextRunProperties(Typeface.Default);
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new MixedTextBufferTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(10));
+
+                Assert.Equal(72.01171875, distance);
+
+                distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(20));
+
+                Assert.Equal(144.0234375, distance);
+
+                distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(30));
+
+                Assert.Equal(216.03515625, distance);
+
+                distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(40));
+
+                Assert.Equal(textLine.WidthIncludingTrailingWhitespace, distance);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_TextBounds_From_Mixed_TextBuffer()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new MixedTextBufferTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var textBounds = textLine.GetTextBounds(0, 10);
+
+                Assert.Equal(1, textBounds.Count);
+
+                Assert.Equal(72.01171875, textBounds[0].Rectangle.Width);
+
+                textBounds = textLine.GetTextBounds(0, 20);
 
-                const string text = "0123456789";
+                Assert.Equal(1, textBounds.Count);
 
-                var source = new SingleBufferTextSource(text, defaultTextRunProperties);
+                Assert.Equal(144.0234375, textBounds[0].Rectangle.Width);
 
-                var textParagraphProperties = new GenericTextParagraphProperties(defaultTextRunProperties);
+                textBounds = textLine.GetTextBounds(0, 30);
 
-                var formatter = TextFormatter.Current;
+                Assert.Equal(1, textBounds.Count);
 
-                var textLine = formatter.FormatLine(source, 0, double.PositiveInfinity, textParagraphProperties);
+                Assert.Equal(216.03515625, textBounds[0].Rectangle.Width);
+
+                textBounds = textLine.GetTextBounds(0, 40);
+
+                Assert.Equal(1, textBounds.Count);
+
+                Assert.Equal(textLine.WidthIncludingTrailingWhitespace, textBounds[0].Rectangle.Width);
+            }
+        }
+
+        private class MixedTextBufferTextSource : ITextSource
+        {
+            public TextRun? GetTextRun(int textSourceIndex)
+            {
+                switch (textSourceIndex)
+                {
+                    case 0:
+                        return new TextCharacters(new ReadOnlySlice<char>("aaaaaaaaaa".AsMemory()), new GenericTextRunProperties(Typeface.Default));
+                    case 10:
+                        return new TextCharacters(new ReadOnlySlice<char>("bbbbbbbbbb".AsMemory()), new GenericTextRunProperties(Typeface.Default));
+                    case 20:
+                        return new TextCharacters(new ReadOnlySlice<char>("cccccccccc".AsMemory()), new GenericTextRunProperties(Typeface.Default));
+                    case 30:
+                        return new TextCharacters(new ReadOnlySlice<char>("dddddddddd".AsMemory()), new GenericTextRunProperties(Typeface.Default));
+                    default:
+                        return null;
+                }
+            }
+        }
+
+        private class DrawableRunTextSource : ITextSource
+        {
+            const string Text = "_A_A";
+
+            public TextRun GetTextRun(int textSourceIndex)
+            {
+                switch (textSourceIndex)
+                {
+                    case 0:
+                        return new CustomDrawableRun();
+                    case 1:
+                        return new TextCharacters(new ReadOnlySlice<char>(Text.AsMemory(), 1, 1, 1), new GenericTextRunProperties(Typeface.Default));
+                    case 2:
+                        return new CustomDrawableRun();
+                    case 3:
+                        return new TextCharacters(new ReadOnlySlice<char>(Text.AsMemory(), 3, 1, 3), new GenericTextRunProperties(Typeface.Default));
+                    default:
+                        return null;
+                }
+            }
+        }
+
+        private class CustomDrawableRun : DrawableTextRun
+        {
+            public override Size Size => new(14, 14);
+            public override double Baseline => 14;
+            public override void Draw(DrawingContext drawingContext, Point origin)
+            {
 
-                Assert.NotNull(textLine.TextLineBreak.TextEndOfLine);
             }
         }
 
@@ -441,29 +679,29 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             var shapedTextRuns = textLine.TextRuns.Cast<ShapedTextCharacters>().ToList();
 
             var lastCluster = -1;
-            
+
             foreach (var textRun in shapedTextRuns)
             {
                 var shapedBuffer = textRun.ShapedBuffer;
 
                 var currentClusters = shapedBuffer.GlyphClusters.ToList();
 
-                foreach (var currentCluster in currentClusters) 
+                foreach (var currentCluster in currentClusters)
                 {
                     if (lastCluster == currentCluster)
                     {
                         continue;
                     }
-                    
+
                     glyphClusters.Add(currentCluster);
 
                     lastCluster = currentCluster;
                 }
             }
-            
+
             return glyphClusters;
         }
-        
+
         private static List<Rect> BuildRects(TextLine textLine)
         {
             var rects = new List<Rect>();
@@ -478,11 +716,11 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             foreach (var textRun in shapedTextRuns)
             {
                 var shapedBuffer = textRun.ShapedBuffer;
-            
+
                 for (var index = 0; index < shapedBuffer.GlyphAdvances.Count; index++)
                 {
                     var currentCluster = shapedBuffer.GlyphClusters[index];
-                
+
                     var advance = shapedBuffer.GlyphAdvances[index];
 
                     if (lastCluster != currentCluster)
@@ -496,10 +734,10 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         rects.Remove(rect);
 
                         rect = rect.WithWidth(rect.Width + advance);
-                    
+
                         rects.Add(rect);
                     }
-                    
+
                     currentX += advance;
 
                     lastCluster = currentCluster;
@@ -509,6 +747,184 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             return rects;
         }
 
+
+        [Fact]
+        public void Should_Get_TextBounds_Mixed()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var text = "0123".AsMemory();
+                var shaperOption = new TextShaperOptions(Typeface.Default.GlyphTypeface, 10, 0, CultureInfo.CurrentCulture);
+
+                var firstRun = new ShapedTextCharacters(TextShaper.Current.ShapeText(new ReadOnlySlice<char>(text, 1, text.Length), shaperOption), defaultProperties);
+
+                var textRuns = new List<TextRun>
+                {
+                    new CustomDrawableRun(),
+                    firstRun,
+                    new CustomDrawableRun(),
+                    new ShapedTextCharacters(TextShaper.Current.ShapeText(new ReadOnlySlice<char>(text, text.Length + 2, text.Length), shaperOption), defaultProperties),
+                    new CustomDrawableRun(),
+                    new ShapedTextCharacters(TextShaper.Current.ShapeText(new ReadOnlySlice<char>(text, text.Length * 2 + 3, text.Length), shaperOption), defaultProperties)
+                };
+
+                var textSource = new FixedRunsTextSource(textRuns);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var textBounds = textLine.GetTextBounds(0, text.Length * 3 + 3);
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(textLine.WidthIncludingTrailingWhitespace, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(0, 1);
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(14, textBounds[0].Rectangle.Width);
+
+                textBounds = textLine.GetTextBounds(0, firstRun.Text.Length + 1);
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(firstRun.Size.Width + 14, textBounds[0].Rectangle.Width);
+
+                textBounds = textLine.GetTextBounds(1, firstRun.Text.Length);
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(firstRun.Size.Width, textBounds[0].Rectangle.Width);
+
+                textBounds = textLine.GetTextBounds(1, firstRun.Text.Length + 1);
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(firstRun.Size.Width + 14, textBounds[0].Rectangle.Width);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_TextBounds_BiDi_LeftToRight()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var text = "אאא AAA";
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, 200,
+                        new GenericTextParagraphProperties(FlowDirection.LeftToRight, TextAlignment.Left, true, true, defaultProperties, TextWrapping.NoWrap, 0, 0));
+
+                var textBounds = textLine.GetTextBounds(0, 3);
+
+                var firstRun = textLine.TextRuns[0] as ShapedTextCharacters;
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(firstRun.Size.Width, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(3, 4);
+
+                var secondRun = textLine.TextRuns[1] as ShapedTextCharacters;
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(secondRun.Size.Width, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(0, 4);
+
+                Assert.Equal(2, textBounds.Count);
+
+                Assert.Equal(firstRun.Size.Width, textBounds[0].Rectangle.Width);           
+
+                Assert.Equal(7.201171875, textBounds[1].Rectangle.Width);
+
+                Assert.Equal(firstRun.Size.Width, textBounds[1].Rectangle.Left);             
+
+                textBounds = textLine.GetTextBounds(0, text.Length);
+
+                Assert.Equal(2, textBounds.Count);
+                Assert.Equal(textLine.WidthIncludingTrailingWhitespace, textBounds.Sum(x => x.Rectangle.Width));
+            }
+        }
+
+        [Fact]
+        public void Should_Get_TextBounds_BiDi_RightToLeft()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var text = "אאא AAA";
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, 200,
+                        new GenericTextParagraphProperties(FlowDirection.RightToLeft, TextAlignment.Left, true, true, defaultProperties, TextWrapping.NoWrap, 0, 0));
+
+                var textBounds = textLine.GetTextBounds(0, 4);
+
+                var firstRun = textLine.TextRuns[1] as ShapedTextCharacters;
+
+                Assert.Equal(1, textBounds.Count);
+                Assert.Equal(firstRun.Size.Width, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(4, 3);
+
+                var secondRun = textLine.TextRuns[0] as ShapedTextCharacters;
+
+                Assert.Equal(1, textBounds.Count);
+
+                Assert.Equal(3, textBounds[0].TextRunBounds.Sum(x=> x.Length));
+                Assert.Equal(secondRun.Size.Width, textBounds.Sum(x => x.Rectangle.Width));
+
+                textBounds = textLine.GetTextBounds(0, 5);
+
+                Assert.Equal(2, textBounds.Count);
+                Assert.Equal(5, textBounds.Sum(x=> x.TextRunBounds.Sum(x => x.Length)));
+
+                Assert.Equal(firstRun.Size.Width, textBounds[0].Rectangle.Width);
+                Assert.Equal(7.201171875, textBounds[1].Rectangle.Width);
+                Assert.Equal(textLine.Start + 7.201171875, textBounds[1].Rectangle.Right);
+
+                textBounds = textLine.GetTextBounds(0, text.Length);
+
+                Assert.Equal(2, textBounds.Count);
+                Assert.Equal(7, textBounds.Sum(x => x.TextRunBounds.Sum(x => x.Length)));
+                Assert.Equal(textLine.WidthIncludingTrailingWhitespace, textBounds.Sum(x => x.Rectangle.Width));
+            }
+        }
+
+        private class FixedRunsTextSource : ITextSource
+        {
+            private readonly IReadOnlyList<TextRun> _textRuns;
+
+            public FixedRunsTextSource(IReadOnlyList<TextRun> textRuns)
+            {
+                _textRuns = textRuns;
+            }
+
+            public TextRun GetTextRun(int textSourceIndex)
+            {
+                var currentPosition = 0;
+
+                foreach (var textRun in _textRuns)
+                {
+                    if (currentPosition == textSourceIndex)
+                    {
+                        return textRun;
+                    }
+
+                    currentPosition += textRun.TextSourceLength;
+                }
+
+                return null;
+            }
+        }
+
         private static IDisposable Start()
         {
             var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextShaperTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextShaperTests.cs
index 57676ad581..94933e334d 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextShaperTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextShaperTests.cs
@@ -15,12 +15,8 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             using (Start())
             {
                 var text = "\n\r\n".AsMemory();
-
-                var shapedBuffer = TextShaper.Current.ShapeText(
-                    text,
-                    Typeface.Default.GlyphTypeface,
-                    12,
-                    CultureInfo.CurrentCulture, 0);
+                var options = new TextShaperOptions(Typeface.Default.GlyphTypeface, 12,0, CultureInfo.CurrentCulture);
+                var shapedBuffer = TextShaper.Current.ShapeText(text, options);
                 
                 Assert.Equal(shapedBuffer.Text.Length, text.Length);
                 Assert.Equal(shapedBuffer.GlyphClusters.Count, text.Length);
@@ -29,7 +25,21 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 Assert.Equal(1, shapedBuffer.GlyphClusters[2]);
             }
         }
-        
+
+        [Fact]
+        public void Should_Apply_IncrementalTabWidth()
+        {
+            using (Start())
+            {
+                var text = "\t".AsMemory();
+                var options = new TextShaperOptions(Typeface.Default.GlyphTypeface, 12, 0, CultureInfo.CurrentCulture, 100);
+                var shapedBuffer = TextShaper.Current.ShapeText(text, options);
+
+                Assert.Equal(shapedBuffer.Length, text.Length);
+                Assert.Equal(100, shapedBuffer.GlyphAdvances[0]);
+            }
+        }
+
         private static IDisposable Start()
         {
             var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
diff --git a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
deleted file mode 100644
index c5eb636a9a..0000000000
--- a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <NoWarn>CS0067</NoWarn>
-    <IsTestProject>true</IsTestProject>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\UnitTests.NetFX.props" />
-  <Import Project="..\..\build\Moq.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <Import Project="..\..\build\SharedVersion.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-</Project>
diff --git a/tests/Avalonia.Styling.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Styling.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3bdb8a2f2e..0000000000
--- a/tests/Avalonia.Styling.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using Xunit;
-
-[assembly: AssemblyTitle("Avalonia.Styling.UnitTests")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs b/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs
deleted file mode 100644
index d91d1fab9e..0000000000
--- a/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class ResourceDictionaryTests
-    {
-        [Fact]
-        public void Cannot_Add_Null_Key()
-        {
-            var target = new ResourceDictionary();
-            Assert.Throws<ArgumentNullException>(() => target.Add(null, "null"));
-        }
-
-        [Fact]
-        public void Can_Add_Null_Value()
-        {
-            var target = new ResourceDictionary();
-            target.Add("null", null);
-        }
-
-        [Fact]
-        public void TryGetResource_Should_Find_Resource()
-        {
-            var target = new ResourceDictionary
-            {
-                { "foo", "bar" },
-            };
-
-            Assert.True(target.TryGetResource("foo", out var result));
-            Assert.Equal("bar", result);
-        }
-
-        [Fact]
-        public void TryGetResource_Should_Find_Resource_From_Merged_Dictionary()
-        {
-            var target = new ResourceDictionary
-            {
-                MergedDictionaries =
-                {
-                    new ResourceDictionary
-                    {
-                        { "foo", "bar" },
-                    }
-                }
-            };
-
-            Assert.True(target.TryGetResource("foo", out var result));
-            Assert.Equal("bar", result);
-        }
-
-        [Fact]
-        public void TryGetResource_Should_Find_Resource_From_Itself_Before_Merged_Dictionary()
-        {
-            var target = new ResourceDictionary
-            {
-                { "foo", "bar" },
-            };
-
-            target.MergedDictionaries.Add(new ResourceDictionary
-            {
-                { "foo", "baz" },
-            });
-
-            Assert.True(target.TryGetResource("foo", out var result));
-            Assert.Equal("bar", result);
-        }
-
-        [Fact]
-        public void TryGetResource_Should_Find_Resource_From_Later_Merged_Dictionary()
-        {
-            var target = new ResourceDictionary
-            {
-                MergedDictionaries =
-                {
-                    new ResourceDictionary
-                    {
-                        { "foo", "bar" },
-                    },
-                    new ResourceDictionary
-                    {
-                        { "foo", "baz" },
-                    }
-                }
-            };
-
-            Assert.True(target.TryGetResource("foo", out var result));
-            Assert.Equal("baz", result);
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Be_Called_On_AddOwner()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary { { "foo", "bar" } };
-
-            ((IResourceProvider)target).AddOwner(host.Object);
-
-            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Be_Called_On_RemoveOwner()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary { { "foo", "bar" } };
-
-            ((IResourceProvider)target).AddOwner(host.Object);
-            host.Invocations.Clear();
-            ((IResourceProvider)target).RemoveOwner(host.Object);
-
-            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Be_Called_On_Resource_Add()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary(host.Object);
-
-            host.Invocations.Clear();
-            target.Add("foo", "bar");
-
-            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Add()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary(host.Object);
-
-            host.Invocations.Clear();
-            target.MergedDictionaries.Add(new ResourceDictionary
-            {
-                { "foo", "bar" },
-            });
-
-            host.Verify(
-                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
-                Times.Once);
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Not_Be_Called_On_Empty_MergedDictionary_Add()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary(host.Object);
-
-            host.Invocations.Clear();
-            target.MergedDictionaries.Add(new ResourceDictionary());
-
-            host.Verify(
-                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
-                Times.Never);
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Remove()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary(host.Object)
-            {
-                MergedDictionaries =
-                {
-                    new ResourceDictionary { { "foo", "bar" } },
-                }
-            };
-
-            host.Invocations.Clear();
-            target.MergedDictionaries.RemoveAt(0);
-
-            host.Verify(
-                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
-                Times.Once);
-        }
-
-        [Fact]
-        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Resource_Add()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new ResourceDictionary(host.Object)
-            {
-                MergedDictionaries =
-                {
-                    new ResourceDictionary(),
-                }
-            };
-
-            host.Invocations.Clear();
-            ((IResourceDictionary)target.MergedDictionaries[0]).Add("foo", "bar");
-
-            host.Verify(
-                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
-                Times.Once);
-        }
-
-        [Fact]
-        public void Sets_Added_MergedDictionary_Owner()
-        {
-            var host = new Mock<IResourceHost>();
-
-            var target = new ResourceDictionary(host.Object);
-            target.MergedDictionaries.Add(new ResourceDictionary());
-
-            Assert.Same(host.Object, target.Owner);
-            Assert.Same(host.Object, ((ResourceDictionary)target.MergedDictionaries[0]).Owner);
-        }
-
-        [Fact]
-        public void AddOwner_Sets_MergedDictionary_Owner()
-        {
-            var host = new Mock<IResourceHost>();
-
-            var target = new ResourceDictionary
-            {
-                MergedDictionaries =
-                {
-                    new ResourceDictionary(),
-                }
-            };
-
-            ((IResourceProvider)target).AddOwner(host.Object);
-
-            Assert.Same(host.Object, target.Owner);
-            Assert.Same(host.Object, ((ResourceDictionary)target.MergedDictionaries[0]).Owner);
-        }
-
-        [Fact]
-        public void RemoveOwner_Clears_MergedDictionary_Owner()
-        {
-            var host = new Mock<IResourceHost>();
-
-            var target = new ResourceDictionary(host.Object)
-            {
-                MergedDictionaries =
-                {
-                    new ResourceDictionary(),
-                }
-            };
-
-            ((IResourceProvider)target).RemoveOwner(host.Object);
-
-            Assert.Null(target.Owner);
-            Assert.Null(((ResourceDictionary)target.MergedDictionaries[0]).Owner);
-        }
-
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs
deleted file mode 100644
index d011c16ebb..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System.Collections.Generic;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.LogicalTree;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Child
-    {
-        [Fact]
-        public void Child_Matches_Control_When_It_Is_Child_OfType()
-        {
-            var parent = new TestLogical1();
-            var child = new TestLogical2();
-
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical2>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(child).Result);
-        }
-
-        [Fact]
-        public void Child_Doesnt_Match_Control_When_It_Is_Grandchild_OfType()
-        {
-            var grandparent = new TestLogical1();
-            var parent = new TestLogical2();
-            var child = new TestLogical3();
-
-            parent.LogicalParent = grandparent;
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical3>();
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(child).Result);
-        }
-
-        [Fact]
-        public async Task Child_Matches_Control_When_It_Is_Child_OfType_And_Class()
-        {
-            var parent = new TestLogical1();
-            var child = new TestLogical2();
-
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Child().OfType<TestLogical2>();
-            var activator = selector.Match(child).Activator;
-            var result = new List<bool>();
-
-            Assert.False(await activator.Take(1));
-            parent.Classes.Add("foo");
-            Assert.True(await activator.Take(1));
-            parent.Classes.Remove("foo");
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public void Child_Doesnt_Match_Control_When_It_Has_No_Parent()
-        {
-            var control = new TestLogical3();
-            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical3>();
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(control).Result);
-        }
-
-        [Fact]
-        public void Child_Selector_Should_Have_Correct_String_Representation()
-        {
-            var selector = default(Selector).OfType<TestLogical1>().Child().OfType<TestLogical3>();
-
-            Assert.Equal("TestLogical1 > TestLogical3", selector.ToString());
-        }
-
-        public abstract class TestLogical : Control
-        {
-            public ILogical LogicalParent
-            {
-                get => Parent;
-                set => ((ISetLogicalParent)this).SetParent(value);
-            }
-        }
-
-        public class TestLogical1 : TestLogical
-        {
-        }
-
-        public class TestLogical2 : TestLogical
-        {
-        }
-
-        public class TestLogical3 : TestLogical
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Class.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Class.cs
deleted file mode 100644
index 72383501be..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Class.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using System;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Moq;
-using Avalonia.Controls;
-using Avalonia.Styling;
-using Xunit;
-using System.Collections.Generic;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Class
-    {
-        [Fact]
-        public void Class_Selector_Should_Have_Correct_String_Representation()
-        {
-            var target = default(Selector).Class("foo");
-
-            Assert.Equal(".foo", target.ToString());
-        }
-
-        [Fact]
-        public void PesudoClass_Selector_Should_Have_Correct_String_Representation()
-        {
-            var target = default(Selector).Class(":foo");
-
-            Assert.Equal(":foo", target.ToString());
-        }
-
-        [Fact]
-        public async Task Class_Matches_Control_With_Class()
-        {
-            var control = new Control1
-            {
-                Classes = { "foo" },
-            };
-
-            var target = default(Selector).Class("foo");
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            Assert.True(await match.Activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Class_Doesnt_Match_Control_Without_Class()
-        {
-            var control = new Control1
-            {
-                Classes = { "bar" },
-            };
-
-            var target = default(Selector).Class("foo");
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            Assert.False(await match.Activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Class_Matches_Control_With_TemplatedParent()
-        {
-            var control = new Control1
-            {
-                Classes = { "foo" },
-                TemplatedParent = new Mock<ITemplatedControl>().Object,
-            };
-
-            var target = default(Selector).Class("foo");
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            Assert.True(await match.Activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Class_Tracks_Additions()
-        {
-            var control = new Control1();
-
-            var target = default(Selector).Class("foo");
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            control.Classes.Add("foo");
-            Assert.True(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Class_Tracks_Removals()
-        {
-            var control = new Control1
-            {
-                Classes = { "foo" },
-            };
-
-            var target = default(Selector).Class("foo");
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.True(await activator.Take(1));
-            control.Classes.Remove("foo");
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Multiple_Classes()
-        {
-            var control = new Control1();
-            var target = default(Selector).Class("foo").Class("bar");
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            control.Classes.Add("foo");
-            Assert.False(await activator.Take(1));
-            control.Classes.Add("bar");
-            Assert.True(await activator.Take(1));
-            control.Classes.Remove("bar");
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public void Only_Notifies_When_Result_Changes()
-        {
-            // Test for #1698
-            var control = new Control1
-            {
-                Classes = { "foo" },
-            };
-
-            var target = default(Selector).Class("foo");
-            var activator = target.Match(control).Activator;
-            var result = new List<bool>();
-
-            using (activator.Subscribe(x => result.Add(x)))
-            {
-                control.Classes.Add("bar");
-                control.Classes.Remove("foo");
-            }
-
-            Assert.Equal(new[] { true, false }, result);
-        }
-
-        public class Control1 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
deleted file mode 100644
index aacf2ce223..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.LogicalTree;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Descendant
-    {
-        [Fact]
-        public void Descendant_Matches_Control_When_It_Is_Child_OfType()
-        {
-            var parent = new TestLogical1();
-            var child = new TestLogical2();
-
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Descendant().OfType<TestLogical2>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(child).Result);
-        }
-
-        [Fact]
-        public void Descendant_Matches_Control_When_It_Is_Descendant_OfType()
-        {
-            var grandparent = new TestLogical1();
-            var parent = new TestLogical2();
-            var child = new TestLogical3();
-
-            parent.LogicalParent = grandparent;
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Descendant().OfType<TestLogical3>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(child).Result);
-        }
-
-        [Fact]
-        public async Task Descendant_Matches_Control_When_It_Is_Descendant_OfType_And_Class()
-        {
-            var grandparent = new TestLogical1();
-            var parent = new TestLogical2();
-            var child = new TestLogical3();
-
-            grandparent.Classes.Add("foo");
-            parent.LogicalParent = grandparent;
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
-            var activator = selector.Match(child).Activator;
-
-            Assert.True(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Descendant_Doesnt_Match_Control_When_It_Is_Descendant_OfType_But_Wrong_Class()
-        {
-            var grandparent = new TestLogical1();
-            var parent = new TestLogical2();
-            var child = new TestLogical3();
-
-            grandparent.Classes.Add("bar");
-            parent.LogicalParent = grandparent;
-            parent.Classes.Add("foo");
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
-            var activator = selector.Match(child).Activator;
-
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Descendant_Matches_Any_Ancestor()
-        {
-            var grandparent = new TestLogical1();
-            var parent = new TestLogical1();
-            var child = new TestLogical3();
-
-            parent.LogicalParent = grandparent;
-            child.LogicalParent = parent;
-
-            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
-            var activator = selector.Match(child).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            parent.Classes.Add("foo");
-            Assert.True(await activator.Take(1));
-            grandparent.Classes.Add("foo");
-            Assert.True(await activator.Take(1));
-            parent.Classes.Remove("foo");
-            Assert.True(await activator.Take(1));
-            grandparent.Classes.Remove("foo");
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public void Descendant_Selector_Should_Have_Correct_String_Representation()
-        {
-            var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
-
-            Assert.Equal("TestLogical1.foo TestLogical3", selector.ToString());
-        }
-
-        public abstract class TestLogical : Control
-        {
-            public ILogical LogicalParent
-            {
-                get => Parent;
-                set => ((ISetLogicalParent)this).SetParent(value);
-            }
-        }
-
-        public class TestLogical1 : TestLogical
-        {
-        }
-
-        public class TestLogical2 : TestLogical
-        {
-        }
-
-        public class TestLogical3 : TestLogical
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs
deleted file mode 100644
index 4436f02429..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Controls.Templates;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Multiple
-    {
-        [Fact]
-        public void Named_Template_Child_Of_Control_With_Two_Classes()
-        {
-            var template = new FuncControlTemplate((parent, scope) =>
-            {
-                return new Border
-                {
-                    Name = "border",
-                }.RegisterInNameScope(scope);
-            });
-
-            var control = new Button
-            {
-                Template = template,
-            };
-
-            control.ApplyTemplate();
-
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Class("foo")
-                .Class("bar")
-                .Template()
-                .Name("border");
-
-            var border = (Border)((IVisual)control).VisualChildren.Single();
-            var values = new List<bool>();
-            var match = selector.Match(border);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            match.Activator.Subscribe(x => values.Add(x));
-
-            Assert.Equal(new[] { false }, values);
-            control.Classes.AddRange(new[] { "foo", "bar" });
-            Assert.Equal(new[] { false, true }, values);
-            control.Classes.Remove("foo");
-            Assert.Equal(new[] { false, true, false }, values);
-        }
-
-        [Fact]
-        public void Named_OfType_Template_Child_Of_Control_With_Two_Classes_Wrong_Type()
-        {
-            var template = new FuncControlTemplate((parent, scope) =>
-            {
-                return new Border
-                {
-                    Name = "border",
-                }.RegisterInNameScope(scope);
-            });
-
-            var control = new Button
-            {
-                Template = template,
-            };
-
-            control.ApplyTemplate();
-
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Class("foo")
-                .Class("bar")
-                .Template()
-                .OfType<TextBlock>()
-                .Name("baz");
-
-            var border = (Border)((IVisual)control).VisualChildren.Single();
-            var values = new List<bool>();
-            var match = selector.Match(border);
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
-        }
-
-        [Fact]
-        public void Control_With_Class_Descendent_Of_Control_With_Two_Classes()
-        {
-            var textBlock = new TextBlock();
-            var control = new Button { Content = textBlock };
-
-            control.ApplyTemplate();
-
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Class("foo")
-                .Class("bar")
-                .Descendant()
-                .OfType<TextBlock>()
-                .Class("baz");
-
-            var values = new List<bool>();
-            var match = selector.Match(textBlock);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            match.Activator.Subscribe(x => values.Add(x));
-
-            Assert.Equal(new[] { false }, values);
-            control.Classes.AddRange(new[] { "foo", "bar" });
-            Assert.Equal(new[] { false }, values);
-            textBlock.Classes.Add("baz");
-            Assert.Equal(new[] { false, true }, values);
-        }
-
-        [Fact]
-        public void Named_Class_Template_Child_Of_Control()
-        {
-            var template = new FuncControlTemplate((parent, scope) =>
-            {
-                return new Border
-                {
-                    Name = "border",
-                }.RegisterInNameScope(scope);
-            });
-
-            var control = new Button
-            {
-                Template = template,
-            };
-
-            control.ApplyTemplate();
-
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Template()
-                .Name("border")
-                .Class("foo");
-
-            var border = (Border)((IVisual)control).VisualChildren.Single();
-            var values = new List<bool>();
-            var match = selector.Match(border);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            match.Activator.Subscribe(x => values.Add(x));
-
-            Assert.Equal(new[] { false }, values);
-            border.Classes.AddRange(new[] { "foo" });
-            Assert.Equal(new[] { false, true }, values);
-            border.Classes.Remove("foo");
-            Assert.Equal(new[] { false, true, false }, values);
-        }
-
-        [Fact]
-        public async Task Nested_PropertyEquals()
-        {
-            var control = new Canvas();
-            var parent = new Border { Child = control };
-
-            var target = default(Selector)
-                .OfType<Border>()
-                .PropertyEquals(Border.TagProperty, "foo")
-                .Child()
-                .OfType<Canvas>()
-                .PropertyEquals(Canvas.TagProperty, "bar");
-
-            var match = target.Match(control);
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-
-            var activator = match.Activator;
-
-            Assert.False(await activator.Take(1));
-            control.Tag = "bar";
-            Assert.False(await activator.Take(1));
-            parent.Tag = "foo";
-            Assert.True(await activator.Take(1));
-        }
-
-        [Fact]
-        public void TargetType_OfType()
-        {
-            var selector = default(Selector).OfType<Button>();
-
-            Assert.Equal(typeof(Button), selector.TargetType);
-        }
-
-        [Fact]
-        public void TargetType_OfType_Class()
-        {
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Class("foo");
-
-            Assert.Equal(typeof(Button), selector.TargetType);
-        }
-
-        [Fact]
-        public void TargetType_Is_Class()
-        {
-            var selector = default(Selector)
-                .Is<Button>()
-                .Class("foo");
-
-            Assert.Equal(typeof(Button), selector.TargetType);
-        }
-
-        [Fact]
-        public void TargetType_Child()
-        {
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Child()
-                .OfType<TextBlock>();
-
-            Assert.Equal(typeof(TextBlock), selector.TargetType);
-        }
-
-        [Fact]
-        public void TargetType_Descendant()
-        {
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Descendant()
-                .OfType<TextBlock>();
-
-            Assert.Equal(typeof(TextBlock), selector.TargetType);
-        }
-
-        [Fact]
-        public void TargetType_Template()
-        {
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Template()
-                .OfType<TextBlock>();
-
-            Assert.Equal(typeof(TextBlock), selector.TargetType);
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Name.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Name.cs
deleted file mode 100644
index 308070c52f..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Name.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Avalonia.Controls;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Name
-    {
-        [Fact]
-        public void Name_Matches_Control_With_Correct_Name()
-        {
-            var control = new Control1 { Name = "foo" };
-            var target = default(Selector).Name("foo");
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Name_Doesnt_Match_Control_Of_Wrong_Name()
-        {
-            var control = new Control1 { Name = "foo" };
-            var target = default(Selector).Name("bar");
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Name_Doesnt_Match_Control_With_TemplatedParent()
-        {
-            var control = new Control1 { TemplatedParent = new Mock<ITemplatedControl>().Object };
-            var target = default(Selector).Name("foo");
-            var activator = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Name_Has_Correct_String_Representation()
-        {
-            var target = default(Selector).Name("foo");
-
-            Assert.Equal("#foo", target.ToString());
-        }
-
-        [Fact]
-        public void Type_And_Name_Has_Correct_String_Representation()
-        {
-            var target = default(Selector).OfType<Control1>().Name("foo");
-
-            Assert.Equal("Control1#foo", target.ToString());
-        }
-
-        public class Control1 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Not.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Not.cs
deleted file mode 100644
index 23b711725a..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Not.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Not
-    {
-        [Fact]
-        public void Not_Selector_Should_Have_Correct_String_Representation()
-        {
-            var target = default(Selector).Not(x => x.Class("foo"));
-
-            Assert.Equal(":not(.foo)", target.ToString());
-        }
-
-        [Fact]
-        public void Not_OfType_Matches_Control_Of_Incorrect_Type()
-        {
-            var control = new Control1();
-            var target = default(Selector).Not(x => x.OfType<Control1>());
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
-        }
-        
-        [Fact]
-        public void Not_OfType_Doesnt_Match_Control_Of_Correct_Type()
-        {
-            var control = new Control2();
-            var target = default(Selector).Not(x => x.OfType<Control1>());
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public async Task Not_Class_Doesnt_Match_Control_With_Class()
-        {
-            var control = new Control1
-            {
-                Classes = { "foo" },
-            };
-
-            var target = default(Selector).Not(x => x.Class("foo"));
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            Assert.False(await match.Activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Not_Class_Matches_Control_Without_Class()
-        {
-            var control = new Control1
-            {
-                Classes = { "bar" },
-            };
-
-            var target = default(Selector).Not(x => x.Class("foo"));
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            Assert.True(await match.Activator.Take(1));
-        }
-
-        [Fact]
-        public async Task OfType_Not_Class_Matches_Control_Without_Class()
-        {
-            var control = new Control1
-            {
-                Classes = { "bar" },
-            };
-
-            var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-            Assert.True(await match.Activator.Take(1));
-        }
-
-        [Fact]
-        public void OfType_Not_Class_Doesnt_Match_Control_Of_Wrong_Type()
-        {
-            var control = new Control2
-            {
-                Classes = { "foo" },
-            };
-
-            var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
-            var match = target.Match(control);
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, match.Result);
-        }
-
-        [Fact]
-        public void Returns_Correct_TargetType()
-        {
-            var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
-
-            Assert.Equal(typeof(Control1), target.TargetType);
-        }
-
-        public class Control1 : Control
-        {
-        }
-
-        public class Control2 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_NthChild.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_NthChild.cs
deleted file mode 100644
index e1507be110..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_NthChild.cs
+++ /dev/null
@@ -1,291 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_NthChild
-    {
-        [Theory]
-        [InlineData(2, 0, ":nth-child(2n)")]
-        [InlineData(2, 1, ":nth-child(2n+1)")]
-        [InlineData(1, 0, ":nth-child(1n)")]
-        [InlineData(4, -1, ":nth-child(4n-1)")]
-        [InlineData(0, 1, ":nth-child(1)")]
-        [InlineData(0, -1, ":nth-child(-1)")]
-        [InlineData(int.MaxValue, int.MinValue + 1, ":nth-child(2147483647n-2147483647)")]
-        public void Not_Selector_Should_Have_Correct_String_Representation(int step, int offset, string expected)
-        {
-            var target = default(Selector).NthChild(step, offset);
-
-            Assert.Equal(expected, target.ToString());
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(2, 0);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.False(await target.Match(b3).Activator!.Take(1));
-            Assert.True(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(2, 1);
-
-            Assert.True(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Negative_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(4, -1);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(1, 2);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.True(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step_With_Negative_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(1, -1);
-
-            Assert.True(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.True(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Zero_Step_With_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(0, 2);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.False(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Doesnt_Match_Control_In_Panel_With_Zero_Step_With_Negative_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthChild(0, -2);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.False(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Previous_Selector()
-        {
-            Border b1, b2;
-            Button b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new Control[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Button(),
-                b4 = new Button()
-            });
-
-            var previous = default(Selector).OfType<Border>();
-            var target = previous.NthChild(2, 0);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.Null(target.Match(b3).Activator);
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b3).Result);
-            Assert.Null(target.Match(b4).Activator);
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b4).Result);
-        }
-
-        [Fact]
-        public void Nth_Child_Doesnt_Match_Control_Out_Of_Panel_Parent()
-        {
-            Border b1;
-            var contentControl = new ContentControl();
-            contentControl.Content = b1 = new Border();
-
-            var target = default(Selector).NthChild(1, 0);
-
-            Assert.Equal(SelectorMatch.NeverThisInstance, target.Match(b1));
-        }
-
-
-        [Theory] // http://nthmaster.com/
-        [InlineData(+0, 8, false, false, false, false, false, false, false, true , false, false, false)]
-        [InlineData(+1, 6, false, false, false, false, false, true , true , true , true , true , true )]
-        [InlineData(-1, 9, true , true , true , true , true , true , true , true , true , false, false)]
-        public async Task Nth_Child_Master_Com_Test_Sigle_Selector(
-            int step, int offset, params bool[] items)
-        {
-            var panel = new StackPanel();
-            panel.Children.AddRange(items.Select(_ => new Border()));
-
-            var previous = default(Selector).OfType<Border>();
-            var target = previous.NthChild(step, offset);
-
-            var results = new bool[items.Length];
-            for (int index = 0; index < items.Length; index++)
-            {
-                var border = panel.Children[index];
-                results[index] = await target.Match(border).Activator!.Take(1);
-            }
-
-            Assert.Equal(items, results);
-        }
-
-        [Theory] // http://nthmaster.com/
-        [InlineData(+1, 4, -1, 8, false, false, false, true , true , true , true , true , false, false, false)]
-        [InlineData(+3, 1, +2, 0, false, false, false, true , false, false, false, false, false, true , false)]
-        public async Task Nth_Child_Master_Com_Test_Double_Selector(
-            int step1, int offset1, int step2, int offset2, params bool[] items)
-        {
-            var panel = new StackPanel();
-            panel.Children.AddRange(items.Select(_ => new Border()));
-
-            var previous = default(Selector).OfType<Border>();
-            var middle = previous.NthChild(step1, offset1);
-            var target = middle.NthChild(step2, offset2);
-
-            var results = new bool[items.Length];
-            for (int index = 0; index < items.Length; index++)
-            {
-                var border = panel.Children[index];
-                results[index] = await target.Match(border).Activator!.Take(1);
-            }
-
-            Assert.Equal(items, results);
-        }
-
-        [Theory] // http://nthmaster.com/
-        [InlineData(+1, 2, 2, 1, -1, 9, false, false, true , false, true , false, true , false, true , false, false)]
-        public async Task Nth_Child_Master_Com_Test_Triple_Selector(
-            int step1, int offset1, int step2, int offset2, int step3, int offset3, params bool[] items)
-        {
-            var panel = new StackPanel();
-            panel.Children.AddRange(items.Select(_ => new Border()));
-
-            var previous = default(Selector).OfType<Border>();
-            var middle1 = previous.NthChild(step1, offset1);
-            var middle2 = middle1.NthChild(step2, offset2);
-            var target = middle2.NthChild(step3, offset3);
-
-            var results = new bool[items.Length];
-            for (int index = 0; index < items.Length; index++)
-            {
-                var border = panel.Children[index];
-                results[index] = await target.Match(border).Activator!.Take(1);
-            }
-
-            Assert.Equal(items, results);
-        }
-
-        [Fact]
-        public void Returns_Correct_TargetType()
-        {
-            var target = new NthChildSelector(default(Selector).OfType<Control1>(), 1, 0);
-
-            Assert.Equal(typeof(Control1), target.TargetType);
-        }
-
-        public class Control1 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_NthLastChild.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_NthLastChild.cs
deleted file mode 100644
index 00a99523c7..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_NthLastChild.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_NthLastChild
-    {
-        [Theory]
-        [InlineData(2, 0, ":nth-last-child(2n)")]
-        [InlineData(2, 1, ":nth-last-child(2n+1)")]
-        [InlineData(1, 0, ":nth-last-child(1n)")]
-        [InlineData(4, -1, ":nth-last-child(4n-1)")]
-        [InlineData(0, 1, ":nth-last-child(1)")]
-        [InlineData(0, -1, ":nth-last-child(-1)")]
-        [InlineData(int.MaxValue, int.MinValue + 1, ":nth-last-child(2147483647n-2147483647)")]
-        public void Not_Selector_Should_Have_Correct_String_Representation(int step, int offset, string expected)
-        {
-            var target = default(Selector).NthLastChild(step, offset);
-
-            Assert.Equal(expected, target.ToString());
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(2, 0);
-
-            Assert.True(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(2, 1);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.False(await target.Match(b3).Activator!.Take(1));
-            Assert.True(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Negative_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(4, -1);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.False(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(1, 2);
-
-            Assert.True(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Singular_Step_With_Negative_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(1, -2);
-
-            Assert.True(await target.Match(b1).Activator!.Take(1));
-            Assert.True(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.True(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Zero_Step_With_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(0, 2);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.True(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Doesnt_Match_Control_In_Panel_With_Zero_Step_With_Negative_Offset()
-        {
-            Border b1, b2, b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Border(),
-                b4 = new Border()
-            });
-
-            var target = default(Selector).NthLastChild(0, -2);
-
-            Assert.False(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.False(await target.Match(b3).Activator!.Take(1));
-            Assert.False(await target.Match(b4).Activator!.Take(1));
-        }
-
-        [Fact]
-        public async Task Nth_Child_Match_Control_In_Panel_With_Previous_Selector()
-        {
-            Border b1, b2;
-            Button b3, b4;
-            var panel = new StackPanel();
-            panel.Children.AddRange(new Control[]
-            {
-                b1 = new Border(),
-                b2 = new Border(),
-                b3 = new Button(),
-                b4 = new Button()
-            });
-
-            var previous = default(Selector).OfType<Border>();
-            var target = previous.NthLastChild(2, 0);
-
-            Assert.True(await target.Match(b1).Activator!.Take(1));
-            Assert.False(await target.Match(b2).Activator!.Take(1));
-            Assert.Null(target.Match(b3).Activator);
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b3).Result);
-            Assert.Null(target.Match(b4).Activator);
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(b4).Result);
-        }
-
-        [Fact]
-        public void Nth_Child_Doesnt_Match_Control_Out_Of_Panel_Parent()
-        {
-            Border b1;
-            var contentControl = new ContentControl();
-            contentControl.Content = b1 = new Border();
-
-            var target = default(Selector).NthLastChild(1, 0);
-
-            Assert.Equal(SelectorMatch.NeverThisInstance, target.Match(b1));
-        }
-
-        [Fact]
-        public void Returns_Correct_TargetType()
-        {
-            var target = new NthLastChildSelector(default(Selector).OfType<Control1>(), 1, 0);
-
-            Assert.Equal(typeof(Control1), target.TargetType);
-        }
-
-        public class Control1 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_OfType.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_OfType.cs
deleted file mode 100644
index 2aef46575d..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_OfType.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Avalonia.Controls;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_OfType
-    {
-        [Fact]
-        public void OfType_Matches_Control_Of_Correct_Type()
-        {
-            var control = new Control1();
-            var target = default(Selector).OfType<Control1>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void OfType_Doesnt_Match_Control_Of_Wrong_Type()
-        {
-            var control = new Control2();
-            var target = default(Selector).OfType<Control1>();
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void OfType_Class_Doesnt_Match_Control_Of_Wrong_Type()
-        {
-            var control = new Control2();
-            var target = default(Selector).OfType<Control1>().Class("foo");
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void OfType_Matches_Control_With_TemplatedParent()
-        {
-            var control = new Control1 { TemplatedParent = new Mock<ITemplatedControl>().Object };
-            var target = default(Selector).OfType<Control1>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
-        }
-
-        public class Control1 : Control
-        {
-        }
-
-        public class Control2 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Or.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Or.cs
deleted file mode 100644
index 2b55482593..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Or.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Or
-    {
-        [Fact]
-        public void Or_Selector_Should_Have_Correct_String_Representation()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>().Class("foo"),
-                default(Selector).OfType<Control2>().Class("bar"));
-
-            Assert.Equal("Control1.foo, Control2.bar", target.ToString());
-        }
-
-        [Fact]
-        public void Or_Selector_Matches_Control_Of_Correct_Type()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>(),
-                default(Selector).OfType<Control2>().Class("bar"));
-            var control = new Control1();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Or_Selector_Matches_Control_Of_Correct_Type_With_Class()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>(),
-                default(Selector).OfType<Control2>().Class("bar"));
-            var control = new Control2();
-
-            Assert.Equal(SelectorMatchResult.Sometimes, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Or_Selector_Doesnt_Match_Control_Of_Incorrect_Type()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>(),
-                default(Selector).OfType<Control2>().Class("bar"));
-            var control = new Control3();
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Or_Selector_Doesnt_Match_Control_With_Incorrect_Name()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>().Name("foo"),
-                default(Selector).OfType<Control2>().Name("foo"));
-            var control = new Control1 { Name = "bar" };
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void Returns_Correct_TargetType_When_Types_Same()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>().Class("foo"),
-                default(Selector).OfType<Control1>().Class("bar"));
-
-            Assert.Equal(typeof(Control1), target.TargetType);
-        }
-
-        [Fact]
-        public void Returns_Common_TargetType()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>().Class("foo"),
-                default(Selector).OfType<Control2>().Class("bar"));
-
-            Assert.Equal(typeof(Control), target.TargetType);
-        }
-
-        [Fact]
-        public void Returns_Null_TargetType_When_A_Selector_Has_No_TargetType()
-        {
-            var target = Selectors.Or(
-                default(Selector).OfType<Control1>().Class("foo"),
-                default(Selector).Class("bar"));
-
-            Assert.Equal(null, target.TargetType);
-        }
-
-        public class Control1 : Control
-        {
-        }
-
-        public class Control2 : Control
-        {
-        }
-
-        public class Control3 : Control
-        {
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_PropertyEquals.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_PropertyEquals.cs
deleted file mode 100644
index 729b42196b..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_PropertyEquals.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_PropertyEquals
-    {
-        static SelectorTests_PropertyEquals()
-        {
-            //Ensure the attached properties are registered before run tests
-            System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(Grid).TypeHandle);
-            System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(Auth).TypeHandle);
-        }
-
-        class Auth
-        {
-            public readonly static AttachedProperty<string> NameProperty =
-                AvaloniaProperty.RegisterAttached<Auth, AvaloniaObject, string>("Name");
-
-            public static string GetName(AvaloniaObject avaloniaObject) =>
-                avaloniaObject.GetValue(NameProperty);
-
-            public static void SetName(AvaloniaObject avaloniaObject, string value) =>
-                avaloniaObject.SetValue(NameProperty, value);
-        }
-
-        [Fact]
-        public async Task PropertyEquals_Attached_Property_Matching_Value()
-        {
-            var target = new Markup.Parsers.SelectorParser((ns, type) =>
-            {
-                return (ns, type) switch
-                {
-                    ("", nameof(TextBlock)) => typeof(TextBlock),
-                    ("", nameof(Grid)) => typeof(Grid),
-                    _ => null
-                };
-            }).Parse("TextBlock[(Grid.Column)=1]");
-            
-
-            var control = new TextBlock();
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            Grid.SetColumn(control, 1);
-            Assert.True(await activator.Take(1));
-            Grid.SetColumn(control, 0);
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task PropertyEquals_Attached_Property_With_Namespace_Matching_Value()
-        {
-            var target = new Markup.Parsers.SelectorParser((ns, type) =>
-            {
-                return (ns, type) switch
-                {
-                    ("", nameof(TextBlock)) => typeof(TextBlock),
-                    ("l", nameof(Auth)) => typeof(Auth),
-                    _ => null
-                };
-            }).Parse("TextBlock[(l|Auth.Name)=Admin]");
-
-
-            var control = new TextBlock();
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            Auth.SetName(control, "Admin");
-            Assert.True(await activator.Take(1));
-            Auth.SetName(control, null);
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task PropertyEquals_Matches_When_Property_Has_Matching_Value()
-        {
-            var control = new TextBlock();
-            var target = default(Selector).PropertyEquals(TextBlock.TextProperty, "foo");
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            control.Text = "foo";
-            Assert.True(await activator.Take(1));
-            control.Text = null;
-            Assert.False(await activator.Take(1));
-        }
-
-        [Theory]
-        [InlineData("Bar", FooBar.Bar)]
-        [InlineData("352", 352)]
-        [InlineData("0.1", 0.1)]
-        public async Task PropertyEquals_Matches_When_Property_Has_Matching_Value_And_Different_Type(string literal, object value)
-        {
-            var control = new TextBlock();
-            var target = default(Selector).PropertyEquals(TextBlock.TagProperty, literal);
-            var activator = target.Match(control).Activator.ToObservable();
-
-            Assert.False(await activator.Take(1));
-            control.Tag = value;
-            Assert.True(await activator.Take(1));
-            control.Tag = null;
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public void OfType_PropertyEquals_Doesnt_Match_Control_Of_Wrong_Type()
-        {
-            var control = new TextBlock();
-            var target = default(Selector).OfType<Border>().PropertyEquals(TextBlock.TextProperty, "foo");
-
-            Assert.Equal(SelectorMatchResult.NeverThisType, target.Match(control).Result);
-        }
-
-        [Fact]
-        public void PropertyEquals_Selector_Should_Have_Correct_String_Representation()
-        {
-            var target = default(Selector)
-                .OfType<TextBlock>()
-                .PropertyEquals(TextBlock.TextProperty, "foo");
-
-            Assert.Equal("TextBlock[Text=foo]", target.ToString());
-        }
-
-        private enum FooBar
-        {
-            Foo,
-            Bar
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs
deleted file mode 100644
index 13cb2578cf..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System;
-using System.Linq;
-using System.Reactive.Linq;
-using Moq;
-using Avalonia.Controls;
-using Avalonia.VisualTree;
-using Avalonia.Diagnostics;
-using Xunit;
-using System.Threading.Tasks;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SelectorTests_Template
-    {
-        [Fact]
-        public void Control_In_Template_Is_Matched_With_Template_Selector()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            BuildVisualTree(target);
-
-            var border = (Border)target.Object.GetVisualChildren().Single();
-            var selector = default(Selector)
-                .OfType(target.Object.GetType())
-                .Template()
-                .OfType<Border>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(border).Result);
-        }
-
-        [Fact]
-        public void Control_Not_In_Template_Is_Not_Matched_With_Template_Selector()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            BuildVisualTree(target);
-
-            var border = (Border)target.Object.GetVisualChildren().Single();
-            border.SetValue(Control.TemplatedParentProperty, null);
-            var selector = default(Selector)
-                .OfType(target.Object.GetType())
-                .Template()
-                .OfType<Border>();
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(border).Result);
-        }
-
-        [Fact]
-        public void Control_In_Template_Of_Wrong_Type_Is_Not_Matched_With_Template_Selector()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            BuildVisualTree(target);
-
-            var border = (Border)target.Object.GetVisualChildren().Single();
-            var selector = default(Selector)
-                .OfType<Button>()
-                .Template()
-                .OfType<Border>();
-
-            Assert.Equal(SelectorMatchResult.NeverThisInstance, selector.Match(border).Result);
-        }
-
-        [Fact]
-        public void Nested_Control_In_Template_Is_Matched_With_Template_Selector()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            BuildVisualTree(target);
-
-            var textBlock = (TextBlock)target.Object.VisualChildren.Single().VisualChildren.Single();
-            var selector = default(Selector)
-                .OfType(target.Object.GetType())
-                .Template()
-                .OfType<TextBlock>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(textBlock).Result);
-        }
-
-        [Fact]
-        public void Control_In_Template_Is_Matched_With_TypeOf_TemplatedControl()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            var styleKey = templatedControl.Object.GetType();
-            BuildVisualTree(target);
-
-            var border = (Border)target.Object.VisualChildren.Single();
-
-            var selector = default(Selector).OfType(styleKey).Template().OfType<Border>();
-
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, selector.Match(border).Result);
-        }
-
-        [Fact]
-        public async Task Control_In_Template_Is_Matched_With_Correct_TypeOf_And_Class_Of_TemplatedControl()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            var styleKey = templatedControl.Object.GetType();
-            BuildVisualTree(target);
-
-            styleable.Setup(x => x.StyleKey).Returns(styleKey);
-            styleable.Setup(x => x.Classes).Returns(new Classes("foo"));
-            var border = (Border)target.Object.VisualChildren.Single();
-            var selector = default(Selector).OfType(styleKey).Class("foo").Template().OfType<Border>();
-            var activator = selector.Match(border).Activator;
-
-            Assert.True(await activator.Take(1));
-        }
-
-        [Fact]
-        public async Task Control_In_Template_Is_Not_Matched_With_Correct_TypeOf_And_Wrong_Class_Of_TemplatedControl()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            BuildVisualTree(target);
-
-            styleable.Setup(x => x.Classes).Returns(new Classes("bar"));
-            var border = (Border)target.Object.VisualChildren.Single();
-            var selector = default(Selector).OfType(templatedControl.Object.GetType()).Class("foo").Template().OfType<Border>();
-            var activator = selector.Match(border).Activator;
-
-            Assert.False(await activator.Take(1));
-        }
-
-        [Fact]
-        public void Nested_Selector_Is_Unsubscribed()
-        {
-            var target = new Mock<IVisual>();
-            var templatedControl = target.As<ITemplatedControl>();
-            var styleable = target.As<IStyleable>();
-            BuildVisualTree(target);
-
-            styleable.Setup(x => x.Classes).Returns(new Classes("foo"));
-            var border = (Border)target.Object.VisualChildren.Single();
-            var selector = default(Selector).OfType(templatedControl.Object.GetType()).Class("foo").Template().OfType<Border>();
-            var activator = selector.Match(border).Activator;
-            var inccDebug = (INotifyCollectionChangedDebug)styleable.Object.Classes;
-
-            using (activator.Subscribe(_ => { }))
-            {
-                Assert.Single(inccDebug.GetCollectionChangedSubscribers());
-            }
-
-            Assert.Null(inccDebug.GetCollectionChangedSubscribers());
-        }
-
-        private void BuildVisualTree<T>(Mock<T> templatedControl) where T : class, IVisual
-        {
-            templatedControl.Setup(x => x.VisualChildren).Returns(new Controls.Controls
-            {
-                new Border
-                {
-                    [Control.TemplatedParentProperty] = templatedControl.Object,
-                    Child = new TextBlock
-                    {
-                        [Control.TemplatedParentProperty] = templatedControl.Object,
-                    },
-                },
-            });
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/SetterTests.cs b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
deleted file mode 100644
index 901233801e..0000000000
--- a/tests/Avalonia.Styling.UnitTests/SetterTests.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-using System;
-using System.Globalization;
-using System.Reactive.Subjects;
-using Avalonia.Controls;
-using Avalonia.Controls.Templates;
-using Avalonia.Data;
-using Avalonia.Data.Converters;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class SetterTests
-    {
-        [Fact]
-        public void Cannot_Assign_Control_To_Value()
-        {
-            var target = new Setter();
-
-            Assert.Throws<InvalidOperationException>(() => target.Value = new Border());
-        }
-
-        [Fact]
-        public void Setter_Should_Apply_Binding_To_Property()
-        {
-            var control = new TextBlock();
-            var subject = new BehaviorSubject<object>("foo");
-            var descriptor = InstancedBinding.OneWay(subject);
-            var binding = Mock.Of<IBinding>(x => x.Initiate(control, TextBlock.TextProperty, null, false) == descriptor);
-            var style = Mock.Of<IStyle>();
-            var setter = new Setter(TextBlock.TextProperty, binding);
-
-            setter.Instance(control).Start(false);
-
-            Assert.Equal("foo", control.Text);
-        }
-
-        [Fact]
-        public void Setter_Should_Handle_Binding_Producing_UnsetValue()
-        {
-            var control = new TextBlock();
-            var subject = new BehaviorSubject<object>(AvaloniaProperty.UnsetValue);
-            var descriptor = InstancedBinding.OneWay(subject);
-            var binding = Mock.Of<IBinding>(x => x.Initiate(control, TextBlock.TagProperty, null, false) == descriptor);
-            var style = Mock.Of<IStyle>();
-            var setter = new Setter(TextBlock.TagProperty, binding);
-
-            setter.Instance(control).Start(false);
-
-            Assert.Equal("", control.Text);
-        }
-
-        [Fact]
-        public void Setter_Should_Materialize_Template_To_Property()
-        {
-            var control = new Decorator();
-            var template = new FuncTemplate<Canvas>(() => new Canvas());
-            var style = Mock.Of<IStyle>();
-            var setter = new Setter(Decorator.ChildProperty, template);
-
-            setter.Instance(control).Start(false);
-
-            Assert.IsType<Canvas>(control.Child);
-        }
-
-        [Fact]
-        public void Does_Not_Call_Converter_ConvertBack_On_OneWay_Binding()
-        {
-            var control = new Decorator { Name = "foo" };
-            var style = Mock.Of<IStyle>();
-            var binding = new Binding("Name", BindingMode.OneWay)
-            {
-                Converter = new TestConverter(),
-                RelativeSource = new RelativeSource(RelativeSourceMode.Self),
-            };
-            var setter = new Setter(Decorator.TagProperty, binding);
-
-            var instance = setter.Instance(control);
-            instance.Start(true);
-            instance.Activate();
-
-            Assert.Equal("foobar", control.Tag);
-
-            // Issue #1218 caused TestConverter.ConvertBack to throw here.
-            instance.Deactivate();
-            Assert.Null(control.Tag);
-        }
-
-        [Fact]
-        public void Setter_Should_Apply_Value_Without_Activator_With_Style_Priority()
-        {
-            var control = new Mock<IStyleable>();
-            var style = Mock.Of<Style>();
-            var setter = new Setter(TextBlock.TagProperty, "foo");
-
-            setter.Instance(control.Object).Start(false);
-
-            control.Verify(x => x.SetValue(
-                TextBlock.TagProperty,
-                "foo",
-                BindingPriority.Style));
-        }
-
-        [Fact]
-        public void Setter_Should_Apply_Value_With_Activator_As_Binding_With_StyleTrigger_Priority()
-        {
-            var control = new Mock<IStyleable>();
-            var style = Mock.Of<Style>();
-            var setter = new Setter(TextBlock.TagProperty, "foo");
-            var activator = new Subject<bool>();
-
-            var instance = setter.Instance(control.Object);
-            instance.Start(true);
-            instance.Activate();
-
-            control.Verify(x => x.Bind(
-                TextBlock.TagProperty,
-                It.IsAny<IObservable<BindingValue<object>>>(),
-                BindingPriority.StyleTrigger));
-        }
-
-        [Fact]
-        public void Setter_Should_Apply_Binding_Without_Activator_With_Style_Priority()
-        {
-            var control = new Mock<IStyleable>();
-            var style = Mock.Of<Style>();
-            var setter = new Setter(TextBlock.TagProperty, CreateMockBinding(TextBlock.TagProperty));
-
-            setter.Instance(control.Object).Start(false);
-
-            control.Verify(x => x.Bind(
-                TextBlock.TagProperty,
-                It.IsAny<PropertySetterBindingInstance<object>>(),
-                BindingPriority.Style));
-        }
-
-        [Fact]
-        public void Setter_Should_Apply_Binding_With_Activator_With_StyleTrigger_Priority()
-        {
-            var control = new Mock<IStyleable>();
-            var style = Mock.Of<Style>();
-            var setter = new Setter(TextBlock.TagProperty, CreateMockBinding(TextBlock.TagProperty));
-
-            var instance = setter.Instance(control.Object);
-            instance.Start(true);
-            instance.Activate();
-
-            control.Verify(x => x.Bind(
-                TextBlock.TagProperty,
-                It.IsAny<IObservable<BindingValue<object>>>(),
-                BindingPriority.StyleTrigger));
-        }
-
-        private IBinding CreateMockBinding(AvaloniaProperty property)
-        {
-            var subject = new Subject<object>();
-            var descriptor = InstancedBinding.OneWay(subject);
-            var binding = Mock.Of<IBinding>(x => 
-                x.Initiate(It.IsAny<IAvaloniaObject>(), property, null, false) == descriptor);
-            return binding;
-        }
-
-        private class TestConverter : IValueConverter
-        {
-            public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-            {
-                return value.ToString() + "bar";
-            }
-
-            public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-            {
-                throw new NotImplementedException();
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/StyleActivatorExtensions.cs b/tests/Avalonia.Styling.UnitTests/StyleActivatorExtensions.cs
deleted file mode 100644
index 22f4db79d1..0000000000
--- a/tests/Avalonia.Styling.UnitTests/StyleActivatorExtensions.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.Reactive;
-using Avalonia.Styling.Activators;
-
-namespace Avalonia.Styling.UnitTests
-{
-    internal static class StyleActivatorExtensions
-    {
-        public static IDisposable Subscribe(this IStyleActivator activator, Action<bool> action)
-        {
-            return activator.ToObservable().Subscribe(action);
-        }
-
-        public static async Task<bool> Take(this IStyleActivator activator, int value)
-        {
-            return await activator.ToObservable().Take(value);
-        }
-
-        public static IObservable<bool> ToObservable(this IStyleActivator activator)
-        {
-            if (activator == null)
-            {
-                throw new ArgumentNullException(nameof(activator));
-            }
-
-            return new ObservableAdapter(activator);
-        }
-
-        private class ObservableAdapter : LightweightObservableBase<bool>, IStyleActivatorSink
-        {
-            private readonly IStyleActivator _source;
-            
-            public ObservableAdapter(IStyleActivator source) => _source = source;
-            protected override void Initialize() => _source.Subscribe(this);
-            protected override void Deinitialize() => _source.Unsubscribe(this);
-
-            void IStyleActivatorSink.OnNext(bool value, int tag)
-            {
-                PublishNext(value);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/StyleTests.cs b/tests/Avalonia.Styling.UnitTests/StyleTests.cs
deleted file mode 100644
index 14710f44ba..0000000000
--- a/tests/Avalonia.Styling.UnitTests/StyleTests.cs
+++ /dev/null
@@ -1,750 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Controls;
-using Avalonia.Controls.Templates;
-using Avalonia.Data;
-using Avalonia.UnitTests;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class StyleTests
-    {
-        [Fact]
-        public void Style_With_Only_Type_Selector_Should_Update_Value()
-        {
-            Style style = new Style(x => x.OfType<Class1>())
-            {
-                Setters =
-                {
-                    new Setter(Class1.FooProperty, "Foo"),
-                },
-            };
-
-            var target = new Class1();
-
-            style.TryAttach(target, null);
-
-            Assert.Equal("Foo", target.Foo);
-        }
-
-        [Fact]
-        public void Style_With_Class_Selector_Should_Update_And_Restore_Value()
-        {
-            Style style = new Style(x => x.OfType<Class1>().Class("foo"))
-            {
-                Setters =
-                {
-                    new Setter(Class1.FooProperty, "Foo"),
-                },
-            };
-
-            var target = new Class1();
-
-            style.TryAttach(target, null);
-            Assert.Equal("foodefault", target.Foo);
-            target.Classes.Add("foo");
-            Assert.Equal("Foo", target.Foo);
-            target.Classes.Remove("foo");
-            Assert.Equal("foodefault", target.Foo);
-        }
-
-        [Fact]
-        public void Style_With_No_Selector_Should_Apply_To_Containing_Control()
-        {
-            Style style = new Style
-            {
-                Setters =
-                {
-                    new Setter(Class1.FooProperty, "Foo"),
-                },
-            };
-
-            var target = new Class1();
-
-            style.TryAttach(target, target);
-
-            Assert.Equal("Foo", target.Foo);
-        }
-
-        [Fact]
-        public void Style_With_No_Selector_Should_Not_Apply_To_Other_Control()
-        {
-            Style style = new Style
-            {
-                Setters =
-                {
-                    new Setter(Class1.FooProperty, "Foo"),
-                },
-            };
-
-            var target = new Class1();
-            var other = new Class1();
-
-            style.TryAttach(target, other);
-
-            Assert.Equal("foodefault", target.Foo);
-        }
-
-        [Fact]
-        public void LocalValue_Should_Override_Style()
-        {
-            Style style = new Style(x => x.OfType<Class1>())
-            {
-                Setters =
-                {
-                    new Setter(Class1.FooProperty, "Foo"),
-                },
-            };
-
-            var target = new Class1
-            {
-                Foo = "Original",
-            };
-
-            style.TryAttach(target, null);
-            Assert.Equal("Original", target.Foo);
-        }
-
-        [Fact]
-        public void Later_Styles_Should_Override_Earlier()
-        {
-            Styles styles = new Styles
-            {
-                new Style(x => x.OfType<Class1>().Class("foo"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.FooProperty, "Foo"),
-                    },
-                },
-
-                new Style(x => x.OfType<Class1>().Class("foo"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.FooProperty, "Bar"),
-                    },
-                }
-            };
-
-            var target = new Class1();
-
-            List<string> values = new List<string>();
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-
-            styles.TryAttach(target, null);
-            target.Classes.Add("foo");
-            target.Classes.Remove("foo");
-
-            Assert.Equal(new[] { "foodefault", "Foo", "Bar", "foodefault" }, values);
-        }
-
-        [Fact]
-        public void Later_Styles_Should_Override_Earlier_2()
-        {
-            Styles styles = new Styles
-            {
-                new Style(x => x.OfType<Class1>().Class("foo"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.FooProperty, "Foo"),
-                    },
-                },
-
-                new Style(x => x.OfType<Class1>().Class("bar"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.FooProperty, "Bar"),
-                    },
-                }
-            };
-
-            var target = new Class1();
-
-            List<string> values = new List<string>();
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-
-            styles.TryAttach(target, null);
-            target.Classes.Add("bar");
-            target.Classes.Add("foo");
-            target.Classes.Remove("foo");
-
-            Assert.Equal(new[] { "foodefault", "Bar" }, values);
-        }
-
-        [Fact]
-        public void Later_Styles_Should_Override_Earlier_3()
-        {
-            Styles styles = new Styles
-            {
-                new Style(x => x.OfType<Class1>().Class("foo"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.FooProperty, new Binding("Foo")),
-                    },
-                },
-
-                new Style(x => x.OfType<Class1>().Class("bar"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.FooProperty, new Binding("Bar")),
-                    },
-                }
-            };
-
-            var target = new Class1
-            {
-                DataContext = new
-                {
-                    Foo = "Foo",
-                    Bar = "Bar",
-                }
-            };
-
-            List<string> values = new List<string>();
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-
-            styles.TryAttach(target, null);
-            target.Classes.Add("bar");
-            target.Classes.Add("foo");
-            target.Classes.Remove("foo");
-
-            Assert.Equal(new[] { "foodefault", "Bar" }, values);
-        }
-
-        [Fact]
-        public void Inactive_Values_Should_Not_Be_Made_Active_During_Style_Attach()
-        {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-
-            var root = new TestRoot
-            {
-                Styles =
-                {
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, "Foo"),
-                        },
-                    },
-
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, "Bar"),
-                        },
-                    }
-                }
-            };
-
-            var values = new List<string>();
-            var target = new Class1();
-
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-            root.Child = target;
-
-            Assert.Equal(new[] { "foodefault", "Bar" }, values);
-        }
-
-        [Fact]
-        public void Inactive_Bindings_Should_Not_Be_Made_Active_During_Style_Attach()
-        {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-
-            var root = new TestRoot
-            {
-                Styles =
-                {
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, new Binding("Foo")),
-                        },
-                    },
-
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, new Binding("Bar")),
-                        },
-                    }
-                }
-            };
-
-            var values = new List<string>();
-            var target = new Class1
-            {
-                DataContext = new
-                {
-                    Foo = "Foo",
-                    Bar = "Bar",
-                }
-            };
-
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-            root.Child = target;
-
-            Assert.Equal(new[] { "foodefault", "Bar" }, values);
-        }
-
-        [Fact]
-        public void Inactive_Values_Should_Not_Be_Made_Active_During_Style_Detach()
-        {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-
-            var root = new TestRoot
-            {
-                Styles =
-                {
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, "Foo"),
-                        },
-                    },
-
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, "Bar"),
-                        },
-                    }
-                }
-            };
-
-            var target = new Class1();
-            root.Child = target;
-
-            var values = new List<string>();
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-            root.Child = null;
-
-            Assert.Equal(new[] { "Bar", "foodefault" }, values);
-        }
-
-        [Fact]
-        public void Inactive_Values_Should_Not_Be_Made_Active_During_Style_Detach_2()
-        {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-
-            var root = new TestRoot
-            {
-                Styles =
-                {
-                    new Style(x => x.OfType<Class1>().Class("foo"))
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, "Foo"),
-                        },
-                    },
-
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, "Bar"),
-                        },
-                    }
-                }
-            };
-
-            var target = new Class1 { Classes = { "foo" } };
-            root.Child = target;
-
-            var values = new List<string>();
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-            root.Child = null;
-
-            Assert.Equal(new[] { "Foo", "foodefault" }, values);
-        }
-
-        [Fact]
-        public void Inactive_Bindings_Should_Not_Be_Made_Active_During_Style_Detach()
-        {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-
-            var root = new TestRoot
-            {
-                Styles =
-                {
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, new Binding("Foo")),
-                        },
-                    },
-
-                    new Style(x => x.OfType<Class1>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Class1.FooProperty, new Binding("Bar")),
-                        },
-                    }
-                }
-            };
-
-            var target = new Class1
-            {
-                DataContext = new
-                {
-                    Foo = "Foo",
-                    Bar = "Bar",
-                }
-            };
-
-            root.Child = target;
-
-            var values = new List<string>();
-            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
-            root.Child = null;
-
-            Assert.Equal(new[] { "Bar", "foodefault" }, values);
-        }
-
-        [Fact]
-        public void Template_In_Non_Matching_Style_Is_Not_Built()
-        {
-            var instantiationCount = 0;
-            var template = new FuncTemplate<Class1>(() =>
-            {
-                ++instantiationCount;
-                return new Class1();
-            });
-
-            Styles styles = new Styles
-            {
-                new Style(x => x.OfType<Class1>().Class("foo"))
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.ChildProperty, template),
-                    },
-                },
-
-                new Style(x => x.OfType<Class1>())
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.ChildProperty, template),
-                    },
-                }
-            };
-
-            var target = new Class1();
-            styles.TryAttach(target, null);
-
-            Assert.NotNull(target.Child);
-            Assert.Equal(1, instantiationCount);
-        }
-
-        [Fact]
-        public void Template_In_Inactive_Style_Is_Not_Built()
-        {
-            var instantiationCount = 0;
-            var template = new FuncTemplate<Class1>(() =>
-            {
-                ++instantiationCount;
-                return new Class1();
-            });
-
-            Styles styles = new Styles
-            {
-                new Style(x => x.OfType<Class1>())
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.ChildProperty, template),
-                    },
-                },
-
-                new Style(x => x.OfType<Class1>())
-                {
-                    Setters =
-                    {
-                        new Setter(Class1.ChildProperty, template),
-                    },
-                }
-            };
-
-            var target = new Class1();
-            target.BeginBatchUpdate();
-            styles.TryAttach(target, null);
-            target.EndBatchUpdate();
-
-            Assert.NotNull(target.Child);
-            Assert.Equal(1, instantiationCount);
-        }
-
-        [Fact]
-        public void Style_Should_Detach_When_Control_Removed_From_Logical_Tree()
-        {
-            Border border;
-
-            var style = new Style(x => x.OfType<Border>())
-            {
-                Setters =
-                {
-                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
-                }
-            };
-
-            var root = new TestRoot
-            {
-                Child = border = new Border(),
-            };
-
-            style.TryAttach(border, null);
-
-            Assert.Equal(new Thickness(4), border.BorderThickness);
-            root.Child = null;
-            Assert.Equal(new Thickness(0), border.BorderThickness);
-        }
-
-        [Fact]
-        public void Removing_Style_Should_Detach_From_Control()
-        {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
-            {
-                var border = new Border();
-                var root = new TestRoot
-                {
-                    Styles =
-                    { 
-                        new Style(x => x.OfType<Border>())
-                        {
-                            Setters =
-                            {
-                                new Setter(Border.BorderThicknessProperty, new Thickness(4)),
-                            }
-                        }
-                    },
-                    Child = border,
-                };
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(4), border.BorderThickness);
-
-                root.Styles.RemoveAt(0);
-                Assert.Equal(new Thickness(0), border.BorderThickness);
-            }
-        }
-
-        [Fact]
-        public void Adding_Style_Should_Attach_To_Control()
-        {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
-            {
-                var border = new Border();
-                var root = new TestRoot
-                {
-                    Styles =
-                    {
-                        new Style(x => x.OfType<Border>())
-                        {
-                            Setters =
-                            {
-                                new Setter(Border.BorderThicknessProperty, new Thickness(4)),
-                            }
-                        }
-                    },
-                    Child = border,
-                };
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(4), border.BorderThickness);
-
-                root.Styles.Add(new Style(x => x.OfType<Border>())
-                {
-                    Setters =
-                    {
-                        new Setter(Border.BorderThicknessProperty, new Thickness(6)),
-                    }
-                });
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(6), border.BorderThickness);
-            }
-        }
-
-        [Fact]
-        public void Removing_Style_With_Nested_Style_Should_Detach_From_Control()
-        {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
-            {
-                var border = new Border();
-                var root = new TestRoot
-                {
-                    Styles =
-                    {
-                        new Styles
-                        {
-                            new Style(x => x.OfType<Border>())
-                            {
-                                Setters =
-                                {
-                                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
-                                }
-                            }
-                        }
-                    },
-                    Child = border,
-                };
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(4), border.BorderThickness);
-
-                root.Styles.RemoveAt(0);
-                Assert.Equal(new Thickness(0), border.BorderThickness);
-            }
-        }
-        
-        [Fact]
-        public void Adding_Nested_Style_Should_Attach_To_Control()
-        {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
-            {
-                var border = new Border();
-                var root = new TestRoot
-                {
-                    Styles =
-                    {
-                        new Styles
-                        {
-                            new Style(x => x.OfType<Border>())
-                            {
-                                Setters =
-                                {
-                                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
-                                }
-                            }
-                        }
-                    },
-                    Child = border,
-                };
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(4), border.BorderThickness);
-
-                ((Styles)root.Styles[0]).Add(new Style(x => x.OfType<Border>())
-                {
-                    Setters =
-                    {
-                        new Setter(Border.BorderThicknessProperty, new Thickness(6)),
-                    }
-                });
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(6), border.BorderThickness);
-            }
-        }
-
-        [Fact]
-        public void Removing_Nested_Style_Should_Detach_From_Control()
-        {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
-            {
-                var border = new Border();
-                var root = new TestRoot
-                {
-                    Styles =
-                    {
-                        new Styles
-                        {
-                            new Style(x => x.OfType<Border>())
-                            {
-                                Setters =
-                                {
-                                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
-                                }
-                            },
-                            new Style(x => x.OfType<Border>())
-                            {
-                                Setters =
-                                {
-                                    new Setter(Border.BorderThicknessProperty, new Thickness(6)),
-                                }
-                            },
-                        }
-                    },
-                    Child = border,
-                };
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(6), border.BorderThickness);
-
-                ((Styles)root.Styles[0]).RemoveAt(1);
-
-                root.Measure(Size.Infinity);
-                Assert.Equal(new Thickness(4), border.BorderThickness);
-            }
-        }
-
-        [Fact]
-        public void Should_Set_Owner_On_Assigned_Resources()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Style();
-            ((IResourceProvider)target).AddOwner(host.Object);
-
-            var resources = new Mock<IResourceDictionary>();
-            target.Resources = resources.Object;
-
-            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
-        }
-
-        [Fact]
-        public void Should_Set_Owner_On_Assigned_Resources_2()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Style();
-
-            var resources = new Mock<IResourceDictionary>();
-            target.Resources = resources.Object;
-
-            host.Invocations.Clear();
-            ((IResourceProvider)target).AddOwner(host.Object);
-            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
-        }
-
-        private class Class1 : Control
-        {
-            public static readonly StyledProperty<string> FooProperty =
-                AvaloniaProperty.Register<Class1, string>(nameof(Foo), "foodefault");
-
-            public static readonly StyledProperty<Class1> ChildProperty =
-                AvaloniaProperty.Register<Class1, Class1>(nameof(Child));
-
-            public string Foo
-            {
-                get { return GetValue(FooProperty); }
-                set { SetValue(FooProperty, value); }
-            }
-
-            public Class1 Child
-            {
-                get => GetValue(ChildProperty);
-                set => SetValue(ChildProperty, value);
-            }
-
-            protected override Size MeasureOverride(Size availableSize)
-            {
-                throw new NotImplementedException();
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/StyledElementTests.cs b/tests/Avalonia.Styling.UnitTests/StyledElementTests.cs
deleted file mode 100644
index fcbccba695..0000000000
--- a/tests/Avalonia.Styling.UnitTests/StyledElementTests.cs
+++ /dev/null
@@ -1,638 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reactive.Linq;
-using Moq;
-using Avalonia.Styling;
-using Avalonia.UnitTests;
-using Xunit;
-using Avalonia.LogicalTree;
-using Avalonia.Controls;
-using System.ComponentModel;
-using Avalonia.Controls.Primitives;
-using Avalonia.Markup.Xaml.Templates;
-using Avalonia.Controls.Templates;
-using Avalonia.Data;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class StyledElementTests
-    {
-        [Fact]
-        public void Classes_Should_Initially_Be_Empty()
-        {
-            var target = new StyledElement();
-
-            Assert.Empty(target.Classes);
-        }
-
-        [Fact]
-        public void Setting_Parent_Should_Also_Set_InheritanceParent()
-        {
-            var parent = new Decorator();
-            var target = new TestControl();
-
-            parent.Child = target;
-
-            Assert.Equal(parent, target.Parent);
-            Assert.Equal(parent, target.InheritanceParent);
-        }
-
-        [Fact]
-        public void Setting_Parent_Should_Not_Set_InheritanceParent_If_Already_Set()
-        {
-            var parent = new Decorator();
-            var inheritanceParent = new Decorator();
-            var target = new TestControl();
-
-            ((ISetInheritanceParent)target).SetParent(inheritanceParent);
-            parent.Child = target;
-
-            Assert.Equal(parent, target.Parent);
-            Assert.Equal(inheritanceParent, target.InheritanceParent);
-        }
-
-        [Fact]
-        public void InheritanceParent_Should_Be_Cleared_When_Removed_From_Parent()
-        {
-            var parent = new Decorator();
-            var target = new TestControl();
-
-            parent.Child = target;
-            parent.Child = null;
-
-            Assert.Null(target.InheritanceParent);
-        }
-
-        [Fact]
-        public void InheritanceParent_Should_Be_Cleared_When_Removed_From_Parent_When_Has_Different_InheritanceParent()
-        {
-            var parent = new Decorator();
-            var inheritanceParent = new Decorator();
-            var target = new TestControl();
-
-            ((ISetInheritanceParent)target).SetParent(inheritanceParent);
-            parent.Child = target;
-            parent.Child = null;
-
-            Assert.Null(target.InheritanceParent);
-        }
-
-        [Fact]
-        public void Adding_Element_With_Null_Parent_To_Logical_Tree_Should_Throw()
-        {
-            var target = new Border();
-            var visualParent = new Panel();
-            var logicalParent = new Panel();
-            var root = new TestRoot();
-
-            // Set the logical parent...
-            ((ISetLogicalParent)target).SetParent(logicalParent);
-
-            // ...so that when it's added to `visualParent`, the parent won't be set again.
-            visualParent.Children.Add(target);
-
-            // Clear the logical parent. It's now a logical child of `visualParent` but doesn't have
-            // a logical parent itself.
-            ((ISetLogicalParent)target).SetParent(null);
-
-            // In this case, attaching the control to a logical tree should throw.
-            logicalParent.Children.Add(visualParent);
-            Assert.Throws<InvalidOperationException>(() => root.Child = logicalParent);
-        }
-
-        [Fact]
-        public void AttachedToLogicalTree_Should_Be_Called_When_Added_To_Tree()
-        {
-            var root = new TestRoot();
-            var parent = new Border();
-            var child = new Border();
-            var grandchild = new Border();
-            var parentRaised = false;
-            var childRaised = false;
-            var grandchildRaised = false;
-
-            parent.AttachedToLogicalTree += (s, e) => parentRaised = true;
-            child.AttachedToLogicalTree += (s, e) => childRaised = true;
-            grandchild.AttachedToLogicalTree += (s, e) => grandchildRaised = true;
-
-            parent.Child = child;
-            child.Child = grandchild;
-
-            Assert.False(parentRaised);
-            Assert.False(childRaised);
-            Assert.False(grandchildRaised);
-
-            root.Child = parent;
-
-            Assert.True(parentRaised);
-            Assert.True(childRaised);
-            Assert.True(grandchildRaised);
-        }
-        
-        [Fact]
-        public void AttachedToLogicalTree_Should_Be_Called_Before_Parent_Change_Signalled()
-        {
-            var root = new TestRoot();
-            var child = new Border();
-            var raised = new List<string>();
-
-            child.AttachedToLogicalTree += (s, e) =>
-            {
-                Assert.Equal(root, child.Parent);
-                raised.Add("attached");
-            };
-
-            child.GetObservable(StyledElement.ParentProperty).Skip(1).Subscribe(_ => raised.Add("parent"));
-
-            root.Child = child;
-
-            Assert.Equal(new[] { "attached", "parent" }, raised);
-        }
-
-        [Fact]
-        public void AttachedToLogicalTree_Should_Not_Be_Called_With_GlobalStyles_As_Root()
-        {
-            var globalStyles = Mock.Of<IGlobalStyles>();
-            var root = new TestRoot { StylingParent = globalStyles };
-            var child = new Border();
-            var raised = false;
-
-            child.AttachedToLogicalTree += (s, e) =>
-            {
-                Assert.Equal(root, e.Root);
-                raised = true;
-            };
-
-            root.Child = child;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void AttachedToLogicalTree_Should_Have_Source_Set()
-        {
-            var root = new TestRoot();
-            var canvas = new Canvas();
-            var border = new Border { Child = canvas };
-            var raised = 0;
-
-            void Attached(object sender, LogicalTreeAttachmentEventArgs e)
-            {
-                Assert.Same(border, e.Source);
-                ++raised;
-            }
-
-            border.AttachedToLogicalTree += Attached;
-            canvas.AttachedToLogicalTree += Attached;
-
-            root.Child = border;
-
-            Assert.Equal(2, raised);
-        }
-
-        [Fact]
-        public void AttachedToLogicalTree_Should_Have_Parent_Set()
-        {
-            var root = new TestRoot();
-            var canvas = new Canvas();
-            var border = new Border { Child = canvas };
-            var raised = 0;
-
-            void Attached(object sender, LogicalTreeAttachmentEventArgs e)
-            {
-                Assert.Same(root, e.Parent);
-                ++raised;
-            }
-
-            border.AttachedToLogicalTree += Attached;
-            canvas.AttachedToLogicalTree += Attached;
-
-            root.Child = border;
-
-            Assert.Equal(2, raised);
-        }
-
-        [Fact]
-        public void DetachedFromLogicalTree_Should_Be_Called_When_Removed_From_Tree()
-        {
-            var root = new TestRoot();
-            var parent = new Border();
-            var child = new Border();
-            var grandchild = new Border();
-            var parentRaised = false;
-            var childRaised = false;
-            var grandchildRaised = false;
-
-            parent.Child = child;
-            child.Child = grandchild;
-            root.Child = parent;
-
-            parent.DetachedFromLogicalTree += (s, e) => parentRaised = true;
-            child.DetachedFromLogicalTree += (s, e) => childRaised = true;
-            grandchild.DetachedFromLogicalTree += (s, e) => grandchildRaised = true;
-
-            root.Child = null;
-
-            Assert.True(parentRaised);
-            Assert.True(childRaised);
-            Assert.True(grandchildRaised);
-        }
-
-        [Fact]
-        public void DetachedFromLogicalTree_Should_Not_Be_Called_With_GlobalStyles_As_Root()
-        {
-            var globalStyles = Mock.Of<IGlobalStyles>();
-            var root = new TestRoot { StylingParent = globalStyles };
-            var child = new Border();
-            var raised = false;
-
-            child.DetachedFromLogicalTree += (s, e) =>
-            {
-                Assert.Equal(root, e.Root);
-                raised = true;
-            };
-
-            root.Child = child;
-            root.Child = null;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Parent_Should_Be_Null_When_DetachedFromLogicalTree_Called()
-        {
-            var target = new TestControl();
-            var root = new TestRoot(target);
-            var called = 0;
-
-            target.DetachedFromLogicalTree += (s, e) =>
-            {
-                Assert.Null(target.Parent);
-                Assert.Null(target.InheritanceParent);
-                ++called;
-            };
-
-            root.Child = null;
-
-            Assert.Equal(1, called);
-        }
-
-        [Fact]
-        public void Adding_Tree_To_IStyleRoot_Should_Style_Controls()
-        {
-            using (AvaloniaLocator.EnterScope())
-            {
-                var root = new TestRoot();
-                var parent = new Border();
-                var child = new Border();
-                var grandchild = new Control();
-                var styler = new Mock<IStyler>();
-
-                AvaloniaLocator.CurrentMutable.Bind<IStyler>().ToConstant(styler.Object);
-
-                parent.Child = child;
-                child.Child = grandchild;
-
-                styler.Verify(x => x.ApplyStyles(It.IsAny<IStyleable>()), Times.Never());
-
-                root.Child = parent;
-
-                styler.Verify(x => x.ApplyStyles(parent), Times.Once());
-                styler.Verify(x => x.ApplyStyles(child), Times.Once());
-                styler.Verify(x => x.ApplyStyles(grandchild), Times.Once());
-            }
-        }
-
-        [Fact]
-        public void Styles_Not_Applied_Until_Initialization_Finished()
-        {
-            using (AvaloniaLocator.EnterScope())
-            {
-                var root = new TestRoot();
-                var child = new Border();
-                var styler = new Mock<IStyler>();
-
-                AvaloniaLocator.CurrentMutable.Bind<IStyler>().ToConstant(styler.Object);
-
-                ((ISupportInitialize)child).BeginInit();
-                root.Child = child;
-                styler.Verify(x => x.ApplyStyles(It.IsAny<IStyleable>()), Times.Never());
-
-                ((ISupportInitialize)child).EndInit();
-                styler.Verify(x => x.ApplyStyles(child), Times.Once());
-            }
-        }
-
-        [Fact]
-        public void Name_Cannot_Be_Set_After_Added_To_Logical_Tree()
-        {
-            using (AvaloniaLocator.EnterScope())
-            {
-                var root = new TestRoot();
-                var child = new Border();
-
-                root.Child = child;
-
-                Assert.Throws<InvalidOperationException>(() => child.Name = "foo");
-            }
-        }
-
-        [Fact]
-        public void Name_Can_Be_Set_While_Initializing()
-        {
-            using (AvaloniaLocator.EnterScope())
-            {
-                var root = new TestRoot();
-                var child = new Border();
-
-                child.BeginInit();
-                root.Child = child;
-                child.Name = "foo";
-                child.EndInit();
-            }
-        }
-
-        [Fact]
-        public void StyleInstance_Is_Disposed_When_Control_Removed_From_Logical_Tree()
-        {
-            using (AvaloniaLocator.EnterScope())
-            {
-                var root = new TestRoot();
-                var child = new Border();
-
-                root.Child = child;
-
-                var styleInstance = new Mock<IStyleInstance>();
-                ((IStyleable)child).StyleApplied(styleInstance.Object);
-
-                root.Child = null;
-
-                styleInstance.Verify(x => x.Dispose(), Times.Once);
-            }
-        }
-
-        [Fact]
-        public void EndInit_Should_Raise_Initialized()
-        {
-            var root = new TestRoot();
-            var target = new Border();
-            var called = false;
-
-            target.Initialized += (s, e) => called = true;
-            ((ISupportInitialize)target).BeginInit();
-            root.Child = target;
-            ((ISupportInitialize)target).EndInit();
-
-            Assert.True(called);
-            Assert.True(target.IsInitialized);
-        }
-
-        [Fact]
-        public void Attaching_To_Visual_Tree_Should_Raise_Initialized()
-        {
-            var root = new TestRoot();
-            var target = new Border();
-            var called = false;
-
-            target.Initialized += (s, e) => called = true;
-            root.Child = target;
-
-            Assert.True(called);
-            Assert.True(target.IsInitialized);
-        }
-
-        [Fact]
-        public void DataContextChanged_Should_Be_Called()
-        {
-            var root = new TestStackPanel
-            {
-                Name = "root",
-                Children =
-                {
-                    new TestControl
-                    {
-                        Name = "a1",
-                        Child = new TestControl
-                        {
-                            Name = "b1",
-                        }
-                    },
-                    new TestControl
-                    {
-                        Name = "a2",
-                        DataContext = "foo",
-                    },
-                }
-            };
-
-            var called = new List<string>();
-            void Record(object sender, EventArgs e) => called.Add(((StyledElement)sender).Name);
-
-            root.DataContextChanged += Record;
-
-            foreach (TestControl c in root.GetLogicalDescendants())
-            {
-                c.DataContextChanged += Record;
-            }
-
-            root.DataContext = "foo";
-
-            Assert.Equal(new[] { "root", "a1", "b1", }, called);
-        }
-
-        [Fact]
-        public void DataContext_Notifications_Should_Be_Called_In_Correct_Order()
-        {
-            var root = new TestStackPanel
-            {
-                Name = "root",
-                Children =
-                {
-                    new TestControl
-                    {
-                        Name = "a1",
-                        Child = new TestControl
-                        {
-                            Name = "b1",
-                        }
-                    },
-                    new TestControl
-                    {
-                        Name = "a2",
-                        DataContext = "foo",
-                    },
-                }
-            };
-
-            var called = new List<string>();
-
-            foreach (IDataContextEvents c in root.GetSelfAndLogicalDescendants())
-            {
-                c.DataContextBeginUpdate += (s, e) => called.Add("begin " + ((StyledElement)s).Name);
-                c.DataContextChanged += (s, e) => called.Add("changed " + ((StyledElement)s).Name);
-                c.DataContextEndUpdate += (s, e) => called.Add("end " + ((StyledElement)s).Name);
-            }
-
-            root.DataContext = "foo";
-
-            Assert.Equal(
-                new[] 
-                {
-                    "begin root",
-                    "begin a1",
-                    "begin b1",
-                    "changed root",
-                    "changed a1",
-                    "changed b1",
-                    "end b1",
-                    "end a1",
-                    "end root",
-                },
-                called);
-        }
-
-        [Fact]
-        public void Resources_Owner_Is_Set()
-        {
-            var target = new TestControl();
-
-            Assert.Same(target, ((ResourceDictionary)target.Resources).Owner);
-        }
-
-        [Fact]
-        public void Assigned_Resources_Parent_Is_Set()
-        {
-            var resources = new Mock<IResourceDictionary>();
-            var target = new TestControl { Resources = resources.Object };
-
-            resources.Verify(x => x.AddOwner(target));
-        }
-
-        [Fact]
-        public void Assigning_Resources_Raises_ResourcesChanged()
-        {
-            var resources = new ResourceDictionary { { "foo", "bar" } };
-            var target = new TestControl();
-            var raised = 0;
-
-            target.ResourcesChanged += (s, e) => ++raised;
-            target.Resources = resources;
-
-            Assert.Equal(1, raised);
-        }
-
-        [Fact]
-        public void Styles_Owner_Is_Set()
-        {
-            var target = new TestControl();
-
-            Assert.Same(target, target.Styles.Owner);
-        }
-
-        [Fact]
-        public void Adding_To_Logical_Tree_Raises_ResourcesChanged()
-        {
-            var target = new TestRoot();
-            var parent = new Decorator { Resources = { { "foo", "bar" } } };
-            var raised = 0;
-
-            target.ResourcesChanged += (s, e) => ++raised;
-
-            parent.Child = target;
-
-            Assert.Equal(1, raised);
-        }
-
-        [Fact]
-        public void SetParent_Does_Not_Crash_Due_To_Reentrancy()
-        {
-            // Issue #3708
-            var app = UnitTestApplication.Start(TestServices.StyledWindow);
-
-            ContentControl target;
-            var root = new TestRoot
-            {
-                DataContext = false,
-                Child = target = new ContentControl
-                {
-                    Styles =
-                    {
-                        new Style(x => x.OfType<ContentControl>())
-                        {
-                            Setters =
-                            {
-                                new Setter(
-                                    ContentControl.ContentProperty,
-                                    new FuncTemplate<IControl>(() => new TextBlock { Text = "Enabled" })),
-                            },
-                        },
-                        new Style(x => x.OfType<ContentControl>().Class(":disabled"))
-                        {
-                            Setters =
-                            {
-                                new Setter(
-                                    ContentControl.ContentProperty,
-                                    new FuncTemplate<IControl>(() => new TextBlock { Text = "Disabled" })),
-                            },
-                        },
-                    },
-                    [!ContentControl.IsEnabledProperty] = new Binding(),
-                }
-            };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(0, 0, 100, 100));
-
-            var textBlock = Assert.IsType<TextBlock>(target.Content);
-            Assert.Equal("Disabled", textBlock.Text);
-
-            // #3708 was crashing here with AvaloniaInternalException.
-            root.Child = null;
-        }
-
-        private interface IDataContextEvents
-        {
-            event EventHandler DataContextBeginUpdate;
-            event EventHandler DataContextChanged;
-            event EventHandler DataContextEndUpdate;
-        }
-
-        private class TestControl : Decorator, IDataContextEvents
-        {
-            public event EventHandler DataContextBeginUpdate;
-            public event EventHandler DataContextEndUpdate;
-
-            public new IAvaloniaObject InheritanceParent => base.InheritanceParent;
-
-            protected override void OnDataContextBeginUpdate()
-            {
-                DataContextBeginUpdate?.Invoke(this, EventArgs.Empty);
-                base.OnDataContextBeginUpdate();
-            }
-
-            protected override void OnDataContextEndUpdate()
-            {
-                DataContextEndUpdate?.Invoke(this, EventArgs.Empty);
-                base.OnDataContextEndUpdate();
-            }
-        }
-
-        private class TestStackPanel : StackPanel, IDataContextEvents
-        {
-            public event EventHandler DataContextBeginUpdate;
-            public event EventHandler DataContextEndUpdate;
-
-            protected override void OnDataContextBeginUpdate()
-            {
-                DataContextBeginUpdate?.Invoke(this, EventArgs.Empty);
-                base.OnDataContextBeginUpdate();
-            }
-
-            protected override void OnDataContextEndUpdate()
-            {
-                DataContextEndUpdate?.Invoke(this, EventArgs.Empty);
-                base.OnDataContextEndUpdate();
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs b/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs
deleted file mode 100644
index 05315380fd..0000000000
--- a/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-using System;
-using Avalonia.Controls.Presenters;
-using Avalonia.Controls.Templates;
-using Avalonia.Styling;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Controls.UnitTests
-{
-    public class StyledElementTests_Resources
-    {
-        [Fact]
-        public void FindResource_Should_Find_Control_Resource()
-        {
-            var target = new StyledElement
-            {
-                Resources =
-                {
-                    { "foo", "foo-value" },
-                }
-            };
-
-            Assert.Equal("foo-value", target.FindResource("foo"));
-        }
-
-        [Fact]
-        public void FindResource_Should_Find_Control_Resource_In_Parent()
-        {
-            Control target;
-
-            var root = new Decorator
-            {
-                Resources =
-                {
-                    { "foo", "foo-value" },
-                },
-                Child = target = new Control(),
-            };
-
-            Assert.Equal("foo-value", target.FindResource("foo"));
-        }
-
-        [Fact]
-        public void FindResource_Should_Find_Application_Resource()
-        {
-            Control target;
-
-            var app = new Application
-            {
-                Resources =
-                {
-                    { "foo", "foo-value" },
-                },
-            };
-
-            var root = new TestRoot
-            {
-                Child = target = new Control(),
-                StylingParent = app,
-            };
-
-            Assert.Equal("foo-value", target.FindResource("foo"));
-        }
-
-        [Fact]
-        public void FindResource_Should_Find_Style_Resource()
-        {
-            var target = new StyledElement
-            {
-                Styles =
-                {
-                    new Style
-                    {
-                        Resources =
-                        {
-                            { "foo", "foo-value" },
-                        }
-                    }
-                },
-                Resources =
-                {
-                    { "bar", "bar-value" },
-                },
-            };
-
-            Assert.Equal("foo-value", target.FindResource("foo"));
-        }
-
-        [Fact]
-        public void FindResource_Should_Find_Styles_Resource()
-        {
-            var target = new StyledElement
-            {
-                Styles =
-                {
-                    new Styles
-                    {
-                        Resources =
-                        {
-                            { "foo", "foo-value" },
-                        }
-                    }
-                },
-                Resources =
-                {
-                    { "bar", "bar-value" },
-                },
-            };
-
-            Assert.Equal("foo-value", target.FindResource("foo"));
-        }
-
-        [Fact]
-        public void FindResource_Should_Find_Application_Style_Resource()
-        {
-            Control target;
-
-            var app = new Application
-            {
-                Styles =
-                {
-                    new Style
-                    {
-                        Resources =
-                        {
-                            { "foo", "foo-value" },
-                        },
-                    }
-                },
-                Resources =
-                {
-                    { "bar", "bar-value" },
-                },
-            };
-
-            var root = new TestRoot
-            {
-                Child = target = new Control(),
-                StylingParent = app,
-            };
-
-            Assert.Equal("foo-value", target.FindResource("foo"));
-        }
-
-        [Fact]
-        public void Adding_Resource_Should_Call_Raise_ResourceChanged_On_Logical_Children()
-        {
-            Border child;
-
-            var target = new ContentControl
-            {
-                Content = child = new Border(),
-                Template = ContentControlTemplate(),
-            };
-
-            var raisedOnTarget = false;
-            var raisedOnChild = false;
-
-            target.Measure(Size.Infinity);
-            target.ResourcesChanged += (_, __) => raisedOnTarget = true;
-            child.ResourcesChanged += (_, __) => raisedOnChild = true;
-
-            target.Resources.Add("foo", "bar");
-
-            Assert.True(raisedOnTarget);
-            Assert.True(raisedOnChild);
-        }
-
-        [Fact]
-        public void Adding_Resource_To_Styles_Should_Raise_ResourceChanged()
-        {
-            var target = new Decorator();
-            var raised = false;
-
-            target.ResourcesChanged += (_, __) => raised = true;
-            target.Styles.Resources.Add("foo", "bar");
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Adding_Resource_To_Nested_Style_Should_Raise_ResourceChanged()
-        {
-            Style style;
-            var target = new StyledElement
-            {
-                Styles =
-                {
-                    (style = new Style()),
-                }
-            };
-
-            var raised = false;
-
-            target.ResourcesChanged += (_, __) => raised = true;
-            style.Resources.Add("foo", "bar");
-
-            Assert.True(raised);
-        }
-
-        private IControlTemplate ContentControlTemplate()
-        {
-            return new FuncControlTemplate<ContentControl>((x, scope) =>
-                new ContentPresenter
-                {
-                    Name = "PART_ContentPresenter",
-                    [!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
-                }.RegisterInNameScope(scope));
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/StylesTests.cs b/tests/Avalonia.Styling.UnitTests/StylesTests.cs
deleted file mode 100644
index 88ab124e01..0000000000
--- a/tests/Avalonia.Styling.UnitTests/StylesTests.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class StylesTests
-    {
-        [Fact]
-        public void Adding_Style_Should_Set_Owner()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Styles(host.Object);
-            var style = new Mock<IStyle>();
-            var rp = style.As<IResourceProvider>();
-
-            host.Invocations.Clear();
-            target.Add(style.Object);
-
-            rp.Verify(x => x.AddOwner(host.Object));
-        }
-
-        [Fact]
-        public void Removing_Style_Should_Clear_Owner()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Styles(host.Object);
-            var style = new Mock<IStyle>();
-            var rp = style.As<IResourceProvider>();
-
-            host.Invocations.Clear();
-            target.Add(style.Object);
-            target.Remove(style.Object);
-
-            rp.Verify(x => x.RemoveOwner(host.Object));
-        }
-
-        [Fact]
-        public void Should_Set_Owner_On_Assigned_Resources()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Styles();
-            ((IResourceProvider)target).AddOwner(host.Object);
-
-            var resources = new Mock<IResourceDictionary>();
-            target.Resources = resources.Object;
-
-            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
-        }
-
-        [Fact]
-        public void Should_Set_Owner_On_Assigned_Resources_2()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Styles();
-
-            var resources = new Mock<IResourceDictionary>();
-            target.Resources = resources.Object;
-
-            host.Invocations.Clear();
-            ((IResourceProvider)target).AddOwner(host.Object);
-            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
-        }
-
-        [Fact]
-        public void Should_Set_Owner_On_Child_Style()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Styles();
-            ((IResourceProvider)target).AddOwner(host.Object);
-
-            var style = new Mock<IStyle>();
-            var resourceProvider = style.As<IResourceProvider>();
-            target.Add(style.Object);
-
-            resourceProvider.Verify(x => x.AddOwner(host.Object), Times.Once);
-        }
-
-        [Fact]
-        public void Should_Set_Owner_On_Child_Style_2()
-        {
-            var host = new Mock<IResourceHost>();
-            var target = new Styles();
-
-            var style = new Mock<IStyle>();
-            var resourceProvider = style.As<IResourceProvider>();
-            target.Add(style.Object);
-
-            host.Invocations.Clear();
-            ((IResourceProvider)target).AddOwner(host.Object);
-            resourceProvider.Verify(x => x.AddOwner(host.Object), Times.Once);
-        }
-        [Fact]
-        public void Finds_Resource_In_Merged_Dictionary()
-        {
-            var target = new Styles
-            {
-                Resources = new ResourceDictionary
-                {
-                    MergedDictionaries =
-                    {
-                        new ResourceDictionary
-                        {
-                            { "foo", "bar" },
-                        }
-                    }
-                }
-            };
-
-            Assert.True(target.TryGetResource("foo", out var result));
-            Assert.Equal("bar", result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/TestObservable.cs b/tests/Avalonia.Styling.UnitTests/TestObservable.cs
deleted file mode 100644
index 7a07f12883..0000000000
--- a/tests/Avalonia.Styling.UnitTests/TestObservable.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Reactive.Disposables;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class TestObservable : IObservable<bool>
-    {
-        public int SubscribedCount { get; private set; }
-
-        public IDisposable Subscribe(IObserver<bool> observer)
-        {
-            ++SubscribedCount;
-            observer.OnNext(true);
-            return Disposable.Create(() => --SubscribedCount);
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/TestObserver.cs b/tests/Avalonia.Styling.UnitTests/TestObserver.cs
deleted file mode 100644
index c18fa8618f..0000000000
--- a/tests/Avalonia.Styling.UnitTests/TestObserver.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-
-namespace Avalonia.Styling.UnitTests
-{
-    internal class TestObserver<T> : IObserver<T>
-    {
-        private bool _hasValue;
-
-        private T _value;
-
-        public bool Completed { get; private set; }
-
-        public Exception Error { get; private set; }
-
-        public T GetValue()
-        {
-            if (!_hasValue)
-            {
-                throw new Exception("Observable provided no value.");
-            }
-
-            if (Completed)
-            {
-                throw new Exception("Observable completed unexpectedly.");
-            }
-
-            if (Error != null)
-            {
-                throw new Exception("Observable errored unexpectedly.");
-            }
-
-            _hasValue = false;
-            return _value;
-        }
-
-        public void OnCompleted()
-        {
-            Completed = true;
-        }
-
-        public void OnError(Exception error)
-        {
-            Error = error;
-        }
-
-        public void OnNext(T value)
-        {
-            if (!_hasValue)
-            {
-                _value = value;
-                _hasValue = true;
-            }
-            else
-            {
-                throw new Exception("Observable pushed more than one value.");
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/TestSelectors.cs b/tests/Avalonia.Styling.UnitTests/TestSelectors.cs
deleted file mode 100644
index 44a087af19..0000000000
--- a/tests/Avalonia.Styling.UnitTests/TestSelectors.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using Avalonia.Styling;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public static class TestSelectors
-    {
-        public static Selector SubscribeCheck(this Selector selector)
-        {
-            throw new NotImplementedException();
-            //return new Selector(
-            //    selector,
-            //    control => new SelectorMatch(((TestControlBase)control).SubscribeCheckObservable),
-            //    "");
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/TestSubject.cs b/tests/Avalonia.Styling.UnitTests/TestSubject.cs
deleted file mode 100644
index 7550b545b6..0000000000
--- a/tests/Avalonia.Styling.UnitTests/TestSubject.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reactive.Disposables;
-
-namespace Avalonia.Styling.UnitTests
-{
-    internal class TestSubject<T> : IObserver<T>, IObservable<T>
-    {
-        private readonly T _initial;
-
-        private readonly List<IObserver<T>> _subscribers = new List<IObserver<T>>();
-
-        public TestSubject(T initial)
-        {
-            _initial = initial;
-        }
-
-        public int SubscriberCount => _subscribers.Count;
-
-        public void OnCompleted()
-        {
-            foreach (IObserver<T> subscriber in _subscribers.ToArray())
-            {
-                subscriber.OnCompleted();
-            }
-        }
-
-        public void OnError(Exception error)
-        {
-            foreach (IObserver<T> subscriber in _subscribers.ToArray())
-            {
-                subscriber.OnError(error);
-            }
-        }
-
-        public void OnNext(T value)
-        {
-            foreach (IObserver<T> subscriber in _subscribers.ToArray())
-            {
-                subscriber.OnNext(value);
-            }
-        }
-
-        public IDisposable Subscribe(IObserver<T> observer)
-        {
-            _subscribers.Add(observer);
-            observer.OnNext(_initial);
-            return Disposable.Create(() => _subscribers.Remove(observer));
-        }
-    }
-}
diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
index c3cf6cd8d3..52ef23c966 100644
--- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
+++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
@@ -14,17 +14,10 @@
     <EmbeddedResource Include="..\Avalonia.UnitTests\Assets\*.ttf" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.PlatformSupport\Avalonia.PlatformSupport.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
diff --git a/tests/Avalonia.UnitTests/HarfBuzzTextShaperImpl.cs b/tests/Avalonia.UnitTests/HarfBuzzTextShaperImpl.cs
index 8ad3284490..4bc30484e9 100644
--- a/tests/Avalonia.UnitTests/HarfBuzzTextShaperImpl.cs
+++ b/tests/Avalonia.UnitTests/HarfBuzzTextShaperImpl.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
 using Avalonia.Platform;
@@ -12,9 +11,13 @@ namespace Avalonia.UnitTests
 {
     public class HarfBuzzTextShaperImpl : ITextShaperImpl
     {
- public ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize,
-            CultureInfo culture, sbyte bidiLevel)
+        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options)
         {
+            var typeface = options.Typeface;
+            var fontRenderingEmSize = options.FontRenderingEmSize;
+            var bidiLevel = options.BidiLevel;
+            var culture = options.Culture;
+
             using (var buffer = new Buffer())
             {
                 buffer.AddUtf16(text.Buffer.Span, text.Start, text.Length);
diff --git a/tests/Avalonia.UnitTests/ImmediateDispatcher.cs b/tests/Avalonia.UnitTests/ImmediateDispatcher.cs
index 5f0d41590f..f6f3de3bc6 100644
--- a/tests/Avalonia.UnitTests/ImmediateDispatcher.cs
+++ b/tests/Avalonia.UnitTests/ImmediateDispatcher.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Threading;
 
@@ -16,39 +17,39 @@ namespace Avalonia.UnitTests
         }
 
         /// <inheritdoc/>
-        public void Post(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
+        public void Post(Action action, DispatcherPriority priority)
         {
             action();
         }
 
         /// <inheritdoc/>
-        public void Post<T>(Action<T> action, T arg, DispatcherPriority priority = DispatcherPriority.Normal)
+        public void Post(SendOrPostCallback action, object arg, DispatcherPriority priority)
         {
             action(arg);
         }
 
         /// <inheritdoc/>
-        public Task InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task InvokeAsync(Action action, DispatcherPriority priority)
         {
             action();
             return Task.CompletedTask;
         }
 
         /// <inheritdoc/>
-        public Task<TResult> InvokeAsync<TResult>(Func<TResult> function, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task<TResult> InvokeAsync<TResult>(Func<TResult> function, DispatcherPriority priority)
         {
             var result = function();
             return Task.FromResult(result);
         }
 
         /// <inheritdoc/>
-        public Task InvokeAsync(Func<Task> function, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task InvokeAsync(Func<Task> function, DispatcherPriority priority)
         {
             return function();
         }
         
         /// <inheritdoc/>
-        public Task<TResult> InvokeAsync<TResult>(Func<Task<TResult>> function, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task<TResult> InvokeAsync<TResult>(Func<Task<TResult>> function, DispatcherPriority priority)
         {
             return function();
         }
diff --git a/tests/Avalonia.UnitTests/MockAssetLoader.cs b/tests/Avalonia.UnitTests/MockAssetLoader.cs
index f591ac445f..6fe8cd54f7 100644
--- a/tests/Avalonia.UnitTests/MockAssetLoader.cs
+++ b/tests/Avalonia.UnitTests/MockAssetLoader.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 
 namespace Avalonia.UnitTests
 {
@@ -39,7 +40,9 @@ namespace Avalonia.UnitTests
 
         public IEnumerable<Uri> GetAssets(Uri uri, Uri baseUri)
         {
-            return _assets.Keys.Where(x => x.AbsolutePath.Contains(uri.AbsolutePath));
+            var absPath = uri.GetUnescapeAbsolutePath();
+            return _assets.Keys.Where(
+                x => x.GetUnescapeAbsolutePath().IndexOf(absPath, StringComparison.Ordinal) >= 0);
         }
 
         public void SetDefaultAssembly(Assembly asm)
diff --git a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
index 2858a9f228..c385e1c3eb 100644
--- a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
+++ b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using Avalonia.Media;
 using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Media.Imaging;
 using Moq;
 
 namespace Avalonia.UnitTests
@@ -122,6 +122,13 @@ namespace Avalonia.UnitTests
             return Mock.Of<IGlyphRunImpl>();
         }
 
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun, out Matrix scale)
+        {
+            scale = Matrix.Identity;
+
+            return Mock.Of<IGeometryImpl>();
+        }
+
         public bool SupportsIndividualRoundRects { get; set; }
 
         public AlphaFormat DefaultAlphaFormat => AlphaFormat.Premul;
diff --git a/tests/Avalonia.UnitTests/MockTextShaperImpl.cs b/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
index fc22791102..7c34bd192e 100644
--- a/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
+++ b/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
@@ -1,6 +1,4 @@
-using System.Globalization;
-using Avalonia.Media;
-using Avalonia.Media.TextFormatting;
+using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
 using Avalonia.Platform;
 using Avalonia.Utilities;
@@ -9,9 +7,12 @@ namespace Avalonia.UnitTests
 {
     public class MockTextShaperImpl : ITextShaperImpl
     {
-        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, GlyphTypeface typeface, double fontRenderingEmSize,
-            CultureInfo culture, sbyte bidiLevel)
+        public ShapedBuffer ShapeText(ReadOnlySlice<char> text, TextShaperOptions options)
         {
+            var typeface = options.Typeface;
+            var fontRenderingEmSize = options.FontRenderingEmSize;
+            var bidiLevel = options.BidiLevel;
+
             var shapedBuffer = new ShapedBuffer(text, text.Length, typeface, fontRenderingEmSize, bidiLevel);
 
             for (var i = 0; i < shapedBuffer.Length;)
diff --git a/tests/Avalonia.UnitTests/TestLogSink.cs b/tests/Avalonia.UnitTests/TestLogSink.cs
index e10292a59b..8b8084ca17 100644
--- a/tests/Avalonia.UnitTests/TestLogSink.cs
+++ b/tests/Avalonia.UnitTests/TestLogSink.cs
@@ -37,23 +37,6 @@ namespace Avalonia.UnitTests
             _callback(level, area, source, messageTemplate);
         }
 
-        public void Log<T0>(LogEventLevel level, string area, object source, string messageTemplate, T0 propertyValue0)
-        {
-            _callback(level, area, source, messageTemplate, propertyValue0);
-        }
-
-        public void Log<T0, T1>(LogEventLevel level, string area, object source, string messageTemplate,
-            T0 propertyValue0, T1 propertyValue1)
-        {
-            _callback(level, area, source, messageTemplate, propertyValue0, propertyValue1);
-        }
-
-        public void Log<T0, T1, T2>(LogEventLevel level, string area, object source, string messageTemplate,
-            T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
-        {
-            _callback(level, area, source, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
-        }
-
         public void Log(LogEventLevel level, string area, object source, string messageTemplate,
             params object[] propertyValues)
         {
diff --git a/tests/Avalonia.UnitTests/TestServices.cs b/tests/Avalonia.UnitTests/TestServices.cs
index 1d55b77aab..c1be745aca 100644
--- a/tests/Avalonia.UnitTests/TestServices.cs
+++ b/tests/Avalonia.UnitTests/TestServices.cs
@@ -5,7 +5,6 @@ using Avalonia.Layout;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Platform;
-using Avalonia.PlatformSupport;
 using Avalonia.Styling;
 using Avalonia.Themes.Default;
 using Avalonia.Rendering;
diff --git a/tests/Avalonia.UnitTests/UnitTestApplication.cs b/tests/Avalonia.UnitTests/UnitTestApplication.cs
index bb6e53d74f..63c2832b92 100644
--- a/tests/Avalonia.UnitTests/UnitTestApplication.cs
+++ b/tests/Avalonia.UnitTests/UnitTestApplication.cs
@@ -10,7 +10,6 @@ using System.Reactive.Disposables;
 using System.Reactive.Concurrency;
 using Avalonia.Input.Platform;
 using Avalonia.Animation;
-using Avalonia.PlatformSupport;
 
 namespace Avalonia.UnitTests
 {
diff --git a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
deleted file mode 100644
index 57de90114e..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Avalonia.RenderTests\**\*.ttf" />
-  </ItemGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\UnitTests.NetFX.props" />
-  <Import Project="..\..\build\Moq.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <Import Project="..\..\build\SharedVersion.props" />
-  <ItemGroup>
-    <EmbeddedResource Remove="..\Avalonia.RenderTests\Assets\NotoColorEmoji.ttf" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Remove="Media\TextFormatting\BreakPairTable.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Media\TextFormatting\BreakPairTable.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-</Project>
diff --git a/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs b/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs
deleted file mode 100644
index 21633b1cec..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Globalization;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class CornerRadiusTests
-    {
-        [Fact]
-        public void Parse_Parses_Single_Uniform_Radius()
-        {
-            var result = CornerRadius.Parse("3.4");
-
-            Assert.Equal(new CornerRadius(3.4), result);
-        }
-
-        [Fact]
-        public void Parse_Parses_Top_Bottom()
-        {
-            var result = CornerRadius.Parse("1.1,2.2");
-
-            Assert.Equal(new CornerRadius(1.1, 2.2), result);
-        }
-
-        [Fact]
-        public void Parse_Parses_TopLeft_TopRight_BottomRight_BottomLeft()
-        {
-            var result = CornerRadius.Parse("1.1,2.2,3.3,4.4");
-
-            Assert.Equal(new CornerRadius(1.1, 2.2, 3.3, 4.4), result);
-        }
-
-        [Fact]
-        public void Parse_Accepts_Spaces()
-        {
-            var result = CornerRadius.Parse("1.1 2.2 3.3 4.4");
-
-            Assert.Equal(new CornerRadius(1.1, 2.2, 3.3, 4.4), result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/BoxShadowTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/BoxShadowTests.cs
deleted file mode 100644
index e3b703baf2..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/BoxShadowTests.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class BoxShadowTests
-    {
-        [Fact]
-        public void BoxShadow_Should_Parse()
-        {
-            foreach (var extraSpaces in new[] { false, true })
-            foreach (var inset in new[] { false, true })
-                for (var componentCount = 2; componentCount < 5; componentCount++)
-                {
-                    var s = (inset ? "inset " : "") + "10 20";
-                    double blur = 0;
-                    double spread = 0;
-                    if (componentCount > 2)
-                    {
-                        s += " 30";
-                        blur = 30;
-                    }
-
-                    if (componentCount > 3)
-                    {
-                        s += " 40";
-                        spread = 40;
-                    }
-
-                    s += " red";
-
-                    if (extraSpaces)
-                        s = " " + s.Replace(" ", "  ") + "   ";
-
-                    var parsed = BoxShadow.Parse(s);
-                    Assert.Equal(inset, parsed.IsInset);
-                    Assert.Equal(10, parsed.OffsetX);
-                    Assert.Equal(20, parsed.OffsetY);
-                    Assert.Equal(blur, parsed.Blur);
-                    Assert.Equal(spread, parsed.Spread);
-                    Assert.Equal(Colors.Red, parsed.Color);
-                }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/BrushTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/BrushTests.cs
deleted file mode 100644
index 1a2f7732dd..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/BrushTests.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class BrushTests
-    {
-        [Fact]
-        public void Parse_Parses_RGB_Hash_Brush()
-        {
-            var result = (ISolidColorBrush)Brush.Parse("#ff8844");
-
-            Assert.Equal(0xff, result.Color.R);
-            Assert.Equal(0x88, result.Color.G);
-            Assert.Equal(0x44, result.Color.B);
-            Assert.Equal(0xff, result.Color.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_ARGB_Hash_Brush()
-        {
-            var result = (ISolidColorBrush)Brush.Parse("#40ff8844");
-
-            Assert.Equal(0xff, result.Color.R);
-            Assert.Equal(0x88, result.Color.G);
-            Assert.Equal(0x44, result.Color.B);
-            Assert.Equal(0x40, result.Color.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_Named_Brush_Lowercase()
-        {
-            var result = (ISolidColorBrush)Brush.Parse("red");
-
-            Assert.Equal(0xff, result.Color.R);
-            Assert.Equal(0x00, result.Color.G);
-            Assert.Equal(0x00, result.Color.B);
-            Assert.Equal(0xff, result.Color.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_Named_Brush_Uppercase()
-        {
-            var result = (ISolidColorBrush)Brush.Parse("RED");
-
-            Assert.Equal(0xff, result.Color.R);
-            Assert.Equal(0x00, result.Color.G);
-            Assert.Equal(0x00, result.Color.B);
-            Assert.Equal(0xff, result.Color.A);
-        }
-
-        [Fact]
-        public void Parse_ToString_Named_Brush_Roundtrip()
-        {
-            const string expectedName = "Red";
-            var brush = (ISolidColorBrush)Brush.Parse(expectedName);
-            var name = brush.ToString();
-
-            Assert.Equal(expectedName, name);
-        }
-
-        [Fact]
-        public void Parse_Hex_Value_Doesnt_Accept_Too_Few_Chars()
-        {
-            Assert.Throws<FormatException>(() => Brush.Parse("#ff"));
-        }
-
-        [Fact]
-        public void Parse_Hex_Value_Doesnt_Accept_Too_Many_Chars()
-        {
-            Assert.Throws<FormatException>(() => Brush.Parse("#ff5555555"));
-        }
-
-        [Fact]
-        public void Parse_Hex_Value_Doesnt_Accept_Invalid_Number()
-        {
-            Assert.Throws<FormatException>(() => Brush.Parse("#ff808g80"));
-        }
-
-        [Fact]
-        public void Changing_Opacity_Raises_Invalidated()
-        {
-            var target = new SolidColorBrush();
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            target.Opacity = 0.5;
-
-            Assert.True(raised);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/ColorTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/ColorTests.cs
deleted file mode 100644
index d68c2fd5fd..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/ColorTests.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-using System;
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class ColorTests
-    {
-        [Fact]
-        public void Parse_Parses_RGB_Hash_Color()
-        {
-            var result = Color.Parse("#ff8844");
-
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void Try_Parse_Parses_RGB_Hash_Color()
-        {
-            var success = Color.TryParse("#ff8844", out Color result);
-
-            Assert.True(success);
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_RGB_Hash_Shorthand_Color()
-        {
-            var result = Color.Parse("#f84");
-
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void Try_Parse_Parses_RGB_Hash_Shorthand_Color()
-        {
-            var success = Color.TryParse("#f84", out Color result);
-
-            Assert.True(success);
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_ARGB_Hash_Color()
-        {
-            var result = Color.Parse("#40ff8844");
-
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0x40, result.A);
-        }
-
-        [Fact]
-        public void Try_Parse_Parses_ARGB_Hash_Color()
-        {
-            var success = Color.TryParse("#40ff8844", out Color result);
-
-            Assert.True(success);
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0x40, result.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_ARGB_Hash_Shorthand_Color()
-        {
-            var result = Color.Parse("#4f84");
-
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0x44, result.A);
-        }
-
-        [Fact]
-        public void Try_Parse_Parses_ARGB_Hash_Shorthand_Color()
-        {
-            var success = Color.TryParse("#4f84", out Color result);
-
-            Assert.True(success);
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x88, result.G);
-            Assert.Equal(0x44, result.B);
-            Assert.Equal(0x44, result.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_Named_Color_Lowercase()
-        {
-            var result = Color.Parse("red");
-
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x00, result.G);
-            Assert.Equal(0x00, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void TryParse_Parses_Named_Color_Lowercase()
-        {
-            var success = Color.TryParse("red", out Color result);
-
-            Assert.True(success);
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x00, result.G);
-            Assert.Equal(0x00, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void Parse_Parses_Named_Color_Uppercase()
-        {
-            var result = Color.Parse("RED");
-
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x00, result.G);
-            Assert.Equal(0x00, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void TryParse_Parses_Named_Color_Uppercase()
-        {
-            var success = Color.TryParse("RED", out Color result);
-
-            Assert.True(success);
-            Assert.Equal(0xff, result.R);
-            Assert.Equal(0x00, result.G);
-            Assert.Equal(0x00, result.B);
-            Assert.Equal(0xff, result.A);
-        }
-
-        [Fact]
-        public void Parse_Hex_Value_Doesnt_Accept_Too_Few_Chars()
-        {
-            Assert.Throws<FormatException>(() => Color.Parse("#ff"));
-        }
-
-        [Fact]
-        public void TryParse_Hex_Value_Doesnt_Accept_Too_Few_Chars()
-        {
-            Assert.False(Color.TryParse("#ff", out _));
-        }
-
-        [Fact]
-        public void Parse_Hex_Value_Doesnt_Accept_Too_Many_Chars()
-        {
-            Assert.Throws<FormatException>(() => Color.Parse("#ff5555555"));
-        }
-
-        [Fact]
-        public void TryParse_Hex_Value_Doesnt_Accept_Too_Many_Chars()
-        {
-            Assert.False(Color.TryParse("#ff5555555", out _));
-        }
-
-        [Fact]
-        public void Parse_Hex_Value_Doesnt_Accept_Invalid_Number()
-        {
-            Assert.Throws<FormatException>(() => Color.Parse("#ff808g80"));
-        }
-
-        [Fact]
-        public void TryParse_Hex_Value_Doesnt_Accept_Invalid_Number()
-        {
-            Assert.False(Color.TryParse("#ff808g80", out _));
-        }
-
-        [Fact]
-        public void Parse_Throws_ArgumentNullException_For_Null_Input()
-        {
-            Assert.Throws<ArgumentNullException>(() => Color.Parse((string)null));
-        }
-
-        [Fact]
-        public void Parse_Throws_FormatException_For_Invalid_Input()
-        {
-            Assert.Throws<FormatException>(() => Color.Parse(string.Empty));
-        }
-
-        [Theory]
-        [InlineData("")]
-        [InlineData(null)]
-        public void TryParse_Returns_False_For_Invalid_Input(string input)
-        {
-            Assert.False(Color.TryParse(input, out _));
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/FontFamilyTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/FontFamilyTests.cs
deleted file mode 100644
index 8ed5e408fa..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/FontFamilyTests.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Media;
-using Avalonia.Media.Fonts;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class FontFamilyTests
-    {
-        [Fact]
-        public void Should_Implicitly_Convert_String_To_FontFamily()
-        {
-            FontFamily fontFamily = "Arial";
-
-            Assert.Equal(new FontFamily("Arial"), fontFamily);
-        }
-
-        [InlineData("Font A")]
-        [InlineData("Font A, Font B")]
-        [InlineData("resm: Avalonia.Visuals.UnitTests#MyFont")]
-        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
-        [Theory]
-        public void Should_Have_Equal_Hash(string s)
-        {
-            var fontFamily = new FontFamily(s);
-
-            Assert.Equal(new FontFamily(s).GetHashCode(), fontFamily.GetHashCode());
-        }
-
-        [InlineData("Font A, Font B", "Font B, Font A")]
-        [InlineData("Font A, Font B", "Font A, Font C")]
-        [Theory]
-        public void Should_Not_Have_Equal_Hash(string a, string b)
-        {
-            var fontFamily = new FontFamily(b);
-
-            Assert.NotEqual(new FontFamily(a).GetHashCode(), fontFamily.GetHashCode());
-        }
-
-        [InlineData("Font A")]
-        [InlineData("Font A, Font B")]
-        [InlineData("resm: Avalonia.Visuals.UnitTests#MyFont")]
-        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
-        [Theory]
-        public void Should_Be_Equal(string s)
-        {
-            var fontFamily = new FontFamily(s);
-
-            Assert.Equal(new FontFamily(s), fontFamily);
-        }
-
-        [InlineData("Font A, Font B", "Font B, Font A")]
-        [InlineData("Font A, Font B", "Font A, Font C")]
-        [Theory]
-        public void Should_Not_Be_Equal(string a, string b)
-        {
-            var fontFamily = new FontFamily(b);
-
-            Assert.NotEqual(new FontFamily(a), fontFamily);
-        }
-
-        [Fact]
-        public void Should_Parse_FontFamily_With_SystemFont_Name()
-        {
-            var fontFamily = FontFamily.Parse("Courier New");
-
-            Assert.Equal("Courier New", fontFamily.Name);
-        }
-
-        [Fact]
-        public void Should_Parse_FontFamily_With_Fallbacks()
-        {
-            var fontFamily = FontFamily.Parse("Courier New, Times New Roman");
-
-            Assert.Equal("Courier New", fontFamily.Name);
-
-            Assert.Equal(2, fontFamily.FamilyNames.Count());
-
-            Assert.Equal("Times New Roman", fontFamily.FamilyNames.Last());
-        }
-
-        [Fact]
-        public void Should_Parse_FontFamily_With_Resource_Folder()
-        {
-            var source = new Uri("resm:Avalonia.Visuals.UnitTests#MyFont");
-
-            var key = new FontFamilyKey(source);
-
-            var fontFamily = FontFamily.Parse(source.OriginalString);
-
-            Assert.Equal("MyFont", fontFamily.Name);
-
-            Assert.Equal(key, fontFamily.Key);
-        }
-
-        [Fact]
-        public void Should_Parse_FontFamily_With_Resource_Filename()
-        {
-            var source = new Uri("resm:Avalonia.Visuals.UnitTests.MyFont.ttf#MyFont");
-
-            var key = new FontFamilyKey(source);
-
-            var fontFamily = FontFamily.Parse(source.OriginalString);
-
-            Assert.Equal("MyFont", fontFamily.Name);
-
-            Assert.Equal(key, fontFamily.Key);
-        }
-
-        [Theory]
-        [InlineData("resm:Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
-        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts#MyFont")]
-        public void Should_Create_FontFamily_From_Uri(string name)
-        {
-            var fontFamily = new FontFamily(name);
-
-            Assert.Equal("MyFont", fontFamily.Name);
-
-            Assert.NotNull(fontFamily.Key);
-        }
-
-        [Theory]
-        [InlineData("resm:Avalonia.Visuals.UnitTests.Assets.Fonts", "#MyFont")]
-        [InlineData("avares://Avalonia.Visuals.UnitTests/Assets/Fonts", "#MyFont")]
-        [InlineData("avares://Avalonia.Visuals.UnitTests", "/Assets/Fonts#MyFont")]
-        public void Should_Create_FontFamily_From_Uri_With_Base_Uri(string @base, string name)
-        {
-            var baseUri = new Uri(@base);
-
-            var fontFamily = new FontFamily(baseUri, name);
-
-            Assert.Equal("MyFont", fontFamily.Name);
-
-            Assert.NotNull(fontFamily.Key);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/FontManagerTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/FontManagerTests.cs
deleted file mode 100644
index 2be0209c85..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/FontManagerTests.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class FontManagerTests
-    {
-        [Fact]
-        public void Should_Create_Single_Instance_Typeface()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var fontFamily = new FontFamily("MyFont");
-
-                var typeface = new Typeface(fontFamily);
-
-                var glyphTypeface = FontManager.Current.GetOrAddGlyphTypeface(typeface);
-
-                Assert.Same(glyphTypeface, FontManager.Current.GetOrAddGlyphTypeface(typeface));
-            }
-        }
-
-        [Fact]
-        public void Should_Throw_When_Default_FamilyName_Is_Null()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface.With(fontManagerImpl: new MockFontManagerImpl(null))))
-            {
-                Assert.Throws<InvalidOperationException>(() => FontManager.Current);
-            }
-        }
-
-        [Fact]
-        public void Should_Use_FontManagerOptions_DefaultFamilyName()
-        {
-            var options = new FontManagerOptions { DefaultFamilyName = "MyFont" };
-
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
-                .With(fontManagerImpl: new MockFontManagerImpl())))
-            {
-                AvaloniaLocator.CurrentMutable.Bind<FontManagerOptions>().ToConstant(options);
-
-                Assert.Equal("MyFont", FontManager.Current.DefaultFontFamilyName);
-            }
-        }
-
-        [Fact]
-        public void Should_Use_FontManagerOptions_FontFallback()
-        {
-            var options = new FontManagerOptions
-            {
-                FontFallbacks = new[]
-                {
-                    new FontFallback
-                    {
-                        FontFamily = new FontFamily("MyFont"), UnicodeRange = UnicodeRange.Default
-                    }
-                }
-            };
-
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
-                .With(fontManagerImpl: new MockFontManagerImpl())))
-            {
-                AvaloniaLocator.CurrentMutable.Bind<FontManagerOptions>().ToConstant(options);
-
-                FontManager.Current.TryMatchCharacter(1, FontStyle.Normal, FontWeight.Normal, FontStretch.Normal,
-                    FontFamily.Default, null, out var typeface);
-
-                Assert.Equal("MyFont", typeface.FontFamily.Name);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs
deleted file mode 100644
index f2fcd51629..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using Avalonia.Media.Fonts;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media.Fonts
-{
-    public class FamilyNameCollectionTests
-    {
-        [Fact]
-        public void Exception_Should_Be_Thrown_If_Names_Is_Null()
-        {
-            Assert.Throws<ArgumentNullException>(() => new FamilyNameCollection(null));
-        }
-
-        [Fact]
-        public void Should_Be_Equal()
-        {
-            var familyNames = new FamilyNameCollection("Arial, Times New Roman");
-
-            Assert.Equal(new FamilyNameCollection("Arial, Times New Roman"), familyNames);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyKeyTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyKeyTests.cs
deleted file mode 100644
index d99301ea6c..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyKeyTests.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using Avalonia.Media.Fonts;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media.Fonts
-{
-    public class FontFamilyKeyTests
-    {
-        [Fact]
-        public void Exception_Should_Be_Thrown_If_Source_Is_Null()
-        {
-            Assert.Throws<ArgumentNullException>(() => new FontFamilyKey(null));
-        }
-
-        [Fact]
-        public void Should_Initialize_With_Location()
-        {
-            var source = new Uri("resm:Avalonia.Visuals.UnitTests#MyFont");
-
-            var fontFamilyKey = new FontFamilyKey(source);
-
-            Assert.Equal(new Uri("resm:Avalonia.Visuals.UnitTests"), fontFamilyKey.Source);
-        }
-
-        [Fact]
-        public void Should_Initialize_With_Location_And_Filename()
-        {
-            var source = new Uri("resm:Avalonia.Visuals.UnitTests.MyFont.ttf#MyFont");
-
-            var fontFamilyKey = new FontFamilyKey(source);
-
-            Assert.Equal(new Uri("resm:Avalonia.Visuals.UnitTests.MyFont.ttf"), fontFamilyKey.Source);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
deleted file mode 100644
index a83c0562e7..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Media;
-using Avalonia.Media.Fonts;
-using Avalonia.Platform;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media.Fonts
-{
-    using System.Diagnostics;
-
-    public class FontFamilyLoaderTests : IDisposable
-    {
-        private const string FontName = "#MyFont";
-        private const string Assembly = "?assembly=Avalonia.Visuals.UnitTests";
-        private const string AssetLocation = "resm:Avalonia.Visuals.UnitTests.Assets";
-
-        private readonly IDisposable _testApplication;
-
-        public FontFamilyLoaderTests()
-        {
-            const string AssetMyFontRegular = AssetLocation + ".MyFont-Regular.ttf" + Assembly + FontName;
-            const string AssetMyFontBold = AssetLocation + ".MyFont-Bold.ttf" + Assembly + FontName;
-            const string AssetYourFont = AssetLocation + ".YourFont.ttf" + Assembly + FontName;
-
-            var fontAssets = new[]
-                                    {
-                                        (AssetMyFontRegular, "AssetData"),
-                                        (AssetMyFontBold, "AssetData"),
-                                        (AssetYourFont, "AssetData")
-                                    };
-
-            _testApplication = StartWithResources(fontAssets);
-        }
-
-        public void Dispose()
-        {
-            _testApplication.Dispose();
-        }
-
-        [Fact]
-        public void Should_Load_Single_FontAsset()
-        {
-            const string FontAsset = AssetLocation + ".MyFont-Regular.ttf" + Assembly + FontName;
-
-            var source = new Uri(FontAsset, UriKind.RelativeOrAbsolute);
-
-            var key = new FontFamilyKey(source);
-
-            var fontAssets = FontFamilyLoader.LoadFontAssets(key);
-
-            Assert.Single(fontAssets);
-        }
-
-        [Fact]
-        public void Should_Load_Matching_Assets()
-        {
-            var source = new Uri(AssetLocation + ".MyFont-*.ttf" + Assembly + FontName, UriKind.RelativeOrAbsolute);
-
-            var key = new FontFamilyKey(source);
-
-            var fontAssets = FontFamilyLoader.LoadFontAssets(key).ToArray();
-
-            foreach (var fontAsset in fontAssets)
-            {
-                Debug.WriteLine(fontAsset);
-            }
-
-            Assert.Equal(2, fontAssets.Length);
-        }
-
-        [Fact]
-        public void Should_Load_Embedded_Font()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var assetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>();
-
-                var fontFamily = new FontFamily("resm:Avalonia.Visuals.UnitTests.Assets?assembly=Avalonia.Visuals.UnitTests#Noto Mono");
-
-                var fontAssets = FontFamilyLoader.LoadFontAssets(fontFamily.Key).ToArray();
-
-                Assert.NotEmpty(fontAssets);
-
-                foreach (var fontAsset in fontAssets)
-                {
-                    var stream = assetLoader.Open(fontAsset);
-
-                    Assert.NotNull(stream);
-                }
-            }
-        }
-
-        private static IDisposable StartWithResources(params (string, string)[] assets)
-        {
-            var assetLoader = new MockAssetLoader(assets);
-            var services = new TestServices(assetLoader: assetLoader, platform: new AppBuilder().RuntimePlatform);
-            return UnitTestApplication.Start(services);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs
deleted file mode 100644
index 7b1ed7f977..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class GeometryTests
-    {
-        [Fact]
-        public void Changing_AffectsGeometry_Property_Causes_PlatformImpl_To_Be_Updated()
-        {
-            var target = new TestGeometry();
-            var platformImpl = target.PlatformImpl;
-
-            target.Foo = true;
-
-            Assert.NotSame(platformImpl, target.PlatformImpl);
-        }
-
-        [Fact]
-        public void Changing_AffectsGeometry_Property_Causes_Changed_To_Be_Raised()
-        {
-            var target = new TestGeometry();
-            var raised = false;
-
-            target.Changed += (s, e) => raised = true;
-            target.Foo = true;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Setting_Transform_Causes_Changed_To_Be_Raised()
-        {
-            var target = new TestGeometry();
-            var raised = false;
-
-            target.Changed += (s, e) => raised = true;
-            target.Transform = new RotateTransform(45);
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Changing_Transform_Causes_Changed_To_Be_Raised()
-        {
-            var transform = new RotateTransform(45);
-            var target = new TestGeometry { Transform = transform };
-            var raised = false;
-
-            target.Changed += (s, e) => raised = true;
-            transform.Angle = 90;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Removing_Transform_Causes_Changed_To_Be_Raised()
-        {
-            var transform = new RotateTransform(45);
-            var target = new TestGeometry { Transform = transform };
-            var raised = false;
-
-            target.Changed += (s, e) => raised = true;
-            target.Transform = null;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Transform_Produces_Transformed_PlatformImpl()
-        {
-            var target = new TestGeometry();
-            var rotate = new RotateTransform(45);
-
-            Assert.False(target.PlatformImpl is ITransformedGeometryImpl);
-            target.Transform = rotate;
-            Assert.True(target.PlatformImpl is ITransformedGeometryImpl);
-            rotate.Angle = 0;
-            Assert.False(target.PlatformImpl is ITransformedGeometryImpl);
-        }
-
-        private class TestGeometry : Geometry
-        {
-            public static readonly StyledProperty<bool> FooProperty =
-                AvaloniaProperty.Register<TestGeometry, bool>(nameof(Foo));
-
-            static TestGeometry()
-            {
-                AffectsGeometry(FooProperty);
-            }
-
-            public bool Foo
-            {
-                get => GetValue(FooProperty);
-                set => SetValue(FooProperty, value);
-            }
-
-            public override Geometry Clone()
-            {
-                throw new NotImplementedException();
-            }
-
-            protected override IGeometryImpl CreateDefiningGeometry()
-            {
-                return Mock.Of<IGeometryImpl>(
-                    x => x.WithTransform(It.IsAny<Matrix>()) == 
-                        Mock.Of<ITransformedGeometryImpl>(y =>
-                            y.SourceGeometry == x));
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/GlyphRunTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/GlyphRunTests.cs
deleted file mode 100644
index ba334fdb74..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/GlyphRunTests.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-using System.Linq;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.UnitTests;
-using Avalonia.Utilities;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class GlyphRunTests : TestWithServicesBase
-    {
-        public GlyphRunTests()
-        {
-            AvaloniaLocator.CurrentMutable
-                .Bind<IPlatformRenderInterface>().ToSingleton<MockPlatformRenderInterface>();
-        }
-
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0)]
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 3, 30)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 1, 0, 10)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 2, 0, 20)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 2, 1, 30)]
-        [Theory]
-        public void Should_Get_Distance_From_CharacterHit(double[] advances, int[] clusters, int start, int trailingLength, double expectedDistance)
-        {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            using (var glyphRun = CreateGlyphRun(advances, clusters))
-            {
-                var characterHit = new CharacterHit(start, trailingLength);
-
-                var distance = glyphRun.GetDistanceFromCharacterHit(characterHit);
-
-                Assert.Equal(expectedDistance, distance);
-            }
-        }
-
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 26.0, 0, 3, true)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 20.0, 1, 1, true)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 26.0, 2, 1, true)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 35.0, 2, 1, false)]
-        [Theory]
-        public void Should_Get_CharacterHit_FromDistance(double[] advances, int[] clusters, double distance, int start,
-            int trailingLengthExpected, bool isInsideExpected)
-        {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            using (var glyphRun = CreateGlyphRun(advances, clusters))
-            {
-                var textBounds = glyphRun.GetCharacterHitFromDistance(distance, out var isInside);
-
-                Assert.Equal(start, textBounds.FirstCharacterIndex);
-
-                Assert.Equal(trailingLengthExpected, textBounds.TrailingLength);
-
-                Assert.Equal(isInsideExpected, isInside);
-            }
-        }
-
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 10, 11, 12 }, 0, -1, 10, 1, 10)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 10, 11, 12 }, 0, 15, 12, 1, 10)]
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0, 3, 30.0)]
-        [InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 0, 1, 1, 1, 10.0)]
-        [InlineData(new double[] { 10, 20, 0, 10 }, new int[] { 0, 1, 1, 3 }, 0, 2, 1, 2, 20.0)]
-        [InlineData(new double[] { 10, 20, 0, 10 }, new int[] { 0, 1, 1, 3 }, 0, 1, 1, 2, 20.0)]
-        [InlineData(new double[] { 10, 0, 20, 10 }, new int[] { 3, 1, 1, 0 }, 1, 1, 1, 2, 20.0)]
-        [Theory]
-        public void Should_Find_Nearest_CharacterHit(double[] advances, int[] clusters, int bidiLevel,
-            int index, int expectedIndex, int expectedLength, double expectedWidth)
-        {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
-            {
-                var textBounds = glyphRun.FindNearestCharacterHit(index, out var width);
-
-                Assert.Equal(expectedIndex, textBounds.FirstCharacterIndex);
-
-                Assert.Equal(expectedLength, textBounds.TrailingLength);
-
-                Assert.Equal(expectedWidth, width, 2);
-            }
-        }
-
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0, 3, 0)]
-        [InlineData(new double[] { 0, 0, 30 }, new int[] { 0, 0, 0 }, 0, 0, 0, 3, 1)]
-        [InlineData(new double[] { 30, 0, 0, 10 }, new int[] { 0, 0, 0, 3 }, 3, 0, 3, 1, 0)]
-        [InlineData(new double[] { 10, 0, 0, 30 }, new int[] { 3, 0, 0, 0 }, 3, 0, 3, 1, 1)]
-        [InlineData(new double[] { 10, 30, 0, 0, 10 }, new int[] { 0, 1, 1, 1, 4 }, 1, 0, 4, 0, 0)]
-        [InlineData(new double[] { 10, 0, 0, 30, 10 }, new int[] { 4, 1, 1, 1, 0 }, 1, 0, 4, 0, 1)]
-        [Theory]
-        public void Should_Get_Next_CharacterHit(double[] advances,int[] clusters,
-            int firstCharacterIndex, int trailingLength,
-            int nextIndex, int nextLength,
-            int bidiLevel)
-        {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
-            {
-                var characterHit = glyphRun.GetNextCaretCharacterHit(new CharacterHit(firstCharacterIndex, trailingLength));
-
-                Assert.Equal(nextIndex, characterHit.FirstCharacterIndex);
-
-                Assert.Equal(nextLength, characterHit.TrailingLength);
-            }
-        }
-
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0, 0, 0)]
-        [InlineData(new double[] { 0, 0, 30 }, new int[] { 0, 0, 0 }, 0, 0, 0, 0, 1)]
-        [InlineData(new double[] { 30, 0, 0, 10 }, new int[] { 0, 0, 0, 3 }, 3, 1, 3, 0, 0)]
-        [InlineData(new double[] { 0, 0, 30, 10 }, new int[] { 3, 0, 0, 0 }, 3, 1, 3, 0, 1)]
-        [InlineData(new double[] { 10, 30, 0, 0, 10 }, new int[] { 0, 1, 1, 1, 4 }, 4, 1, 4, 0, 0)]
-        [InlineData(new double[] { 10, 0, 0, 30, 10 }, new int[] { 4, 1, 1, 1, 0 }, 4, 1, 4, 0, 1)]
-        [Theory]
-        public void Should_Get_Previous_CharacterHit(double[] advances, int[] clusters,
-            int currentIndex, int currentLength,
-            int previousIndex, int previousLength,
-            int bidiLevel)
-        {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
-            {
-                var characterHit = glyphRun.GetPreviousCaretCharacterHit(new CharacterHit(currentIndex, currentLength));
-
-                Assert.Equal(previousIndex, characterHit.FirstCharacterIndex);
-
-                Assert.Equal(previousLength, characterHit.TrailingLength);
-            }
-        }
-
-        [InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0)]
-        [InlineData(new double[] { 0, 0, 30 }, new int[] { 0, 0, 0 }, 1)]
-        [InlineData(new double[] { 10, 10, 10, 10 }, new int[] { 0, 0, 0, 3 }, 0)]
-        [InlineData(new double[] { 10, 10, 10, 10 }, new int[] { 3, 0, 0, 0 }, 1)]
-        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new int[] { 0, 1, 1, 1, 4 }, 0)]
-        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new int[] { 4, 1, 1, 1, 0 }, 1)]
-        [Theory]
-        public void Should_Find_Glyph_Index(double[] advances, int[] clusters, int bidiLevel)
-        {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
-            {
-                if (glyphRun.IsLeftToRight)
-                {
-                    for (var i = 0; i < clusters.Length; i++)
-                    {
-                        var cluster = clusters[i];
-
-                        var found = glyphRun.FindGlyphIndex(cluster);
-
-                        var expected = i;
-
-                        while (expected - 1 >= 0 && clusters[expected - 1] == cluster)
-                        {
-                            expected--;
-                        }
-
-                        Assert.Equal(expected, found);
-                    }
-                }
-                else
-                {
-                    for (var i = clusters.Length - 1; i > 0; i--)
-                    {
-                        var cluster = clusters[i];
-
-                        var found = glyphRun.FindGlyphIndex(cluster);
-
-                        var expected = i;
-
-                        while (expected + 1 < clusters.Length && clusters[expected + 1] == cluster)
-                        {
-                            expected++;
-                        }
-
-                        Assert.Equal(expected, found);
-                    }
-                }
-            }
-        }
-
-        private static GlyphRun CreateGlyphRun(double[] glyphAdvances, int[] glyphClusters, int bidiLevel = 0)
-        {
-            var count = glyphAdvances.Length;
-            var glyphIndices = new ushort[count];
-
-            var start = bidiLevel == 0 ? glyphClusters[0] : glyphClusters[^1];
-
-            var characters = new ReadOnlySlice<char>(Enumerable.Repeat('a', count).ToArray(), start, count);
-
-            return new GlyphRun(new GlyphTypeface(new MockGlyphTypeface()), 10, characters, glyphIndices, glyphAdvances,
-                glyphClusters: glyphClusters, biDiLevel: bidiLevel);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/ImageBrushTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/ImageBrushTests.cs
deleted file mode 100644
index ff7b94105a..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/ImageBrushTests.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Avalonia.Media;
-using Avalonia.Media.Imaging;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class ImageBrushTests
-    {
-        [Fact]
-        public void Changing_Source_Raises_Invalidated()
-        {
-            var bitmap1 = Mock.Of<IBitmap>();
-            var bitmap2 = Mock.Of<IBitmap>();
-            var target = new ImageBrush(bitmap1);
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            target.Source = bitmap2;
-
-            Assert.True(raised);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/LinearGradientBrushTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/LinearGradientBrushTests.cs
deleted file mode 100644
index b3f78dfe8f..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/LinearGradientBrushTests.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.Media.Imaging;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class LinearGradientBrushTests
-    {
-        [Fact]
-        public void Changing_StartPoint_Raises_Invalidated()
-        {
-            var bitmap1 = Mock.Of<IBitmap>();
-            var bitmap2 = Mock.Of<IBitmap>();
-            var target = new LinearGradientBrush();
-            var raised = false;
-
-            target.StartPoint = new RelativePoint();
-            target.Invalidated += (s, e) => raised = true;
-            target.StartPoint = new RelativePoint(10, 10, RelativeUnit.Absolute);
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Changing_EndPoint_Raises_Invalidated()
-        {
-            var bitmap1 = Mock.Of<IBitmap>();
-            var bitmap2 = Mock.Of<IBitmap>();
-            var target = new LinearGradientBrush();
-            var raised = false;
-
-            target.EndPoint = new RelativePoint();
-            target.Invalidated += (s, e) => raised = true;
-            target.EndPoint = new RelativePoint(10, 10, RelativeUnit.Absolute);
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Changing_GradientStops_Raises_Invalidated()
-        {
-            var bitmap1 = Mock.Of<IBitmap>();
-            var bitmap2 = Mock.Of<IBitmap>();
-            var target = new LinearGradientBrush();
-            var raised = false;
-
-            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
-            target.Invalidated += (s, e) => raised = true;
-            target.GradientStops = new GradientStops { new GradientStop(Colors.Green, 0) };
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Adding_GradientStop_Raises_Invalidated()
-        {
-            var bitmap1 = Mock.Of<IBitmap>();
-            var bitmap2 = Mock.Of<IBitmap>();
-            var target = new LinearGradientBrush();
-            var raised = false;
-
-            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
-            target.Invalidated += (s, e) => raised = true;
-            target.GradientStops.Add(new GradientStop(Colors.Green, 1));
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Changing_GradientStop_Offset_Raises_Invalidated()
-        {
-            var bitmap1 = Mock.Of<IBitmap>();
-            var bitmap2 = Mock.Of<IBitmap>();
-            var target = new LinearGradientBrush();
-            var raised = false;
-
-            target.GradientStops = new GradientStops { new GradientStop(Colors.Red, 0) };
-            target.Invalidated += (s, e) => raised = true;
-            target.GradientStops[0].Offset = 0.5;
-
-            Assert.True(raised);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/MatrixTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/MatrixTests.cs
deleted file mode 100644
index 6ef48b6161..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/MatrixTests.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using Avalonia.Utilities;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class MatrixTests
-    {
-        [Fact]
-        public void Can_Parse()
-        {
-            var matrix = Matrix.Parse("1,2,3,-4,5 6");
-            var expected = new Matrix(1, 2, 3, -4, 5, 6);
-            Assert.Equal(expected, matrix);
-        }
-
-        [Fact]
-        public void Singular_Has_No_Inverse()
-        {
-            var matrix = new Matrix(0, 0, 0, 0, 0, 0);
-
-            Assert.False(matrix.HasInverse);
-        }
-
-        [Fact]
-        public void Identity_Has_Inverse()
-        {
-            var matrix = Matrix.Identity;
-
-            Assert.True(matrix.HasInverse);
-        }
-
-        [Fact]
-        public void Can_Decompose_Translation()
-        {
-            var matrix = Matrix.CreateTranslation(5, 10);
-
-            var result = Matrix.TryDecomposeTransform(matrix, out Matrix.Decomposed decomposed);
-
-            Assert.Equal(true, result);
-            Assert.Equal(5, decomposed.Translate.X);
-            Assert.Equal(10, decomposed.Translate.Y);
-        }
-
-        [Theory]
-        [InlineData(30d)]
-        [InlineData(0d)]
-        [InlineData(90d)]
-        [InlineData(270d)]
-        public void Can_Decompose_Angle(double angleDeg)
-        {
-            var angleRad = MathUtilities.Deg2Rad(angleDeg);
-
-            var matrix = Matrix.CreateRotation(angleRad);
-
-            var result = Matrix.TryDecomposeTransform(matrix, out Matrix.Decomposed decomposed);
-
-            Assert.Equal(true, result);
-
-            var expected = NormalizeAngle(angleRad);
-            var actual = NormalizeAngle(decomposed.Angle);
-
-            Assert.Equal(expected, actual, 4);
-        }
-
-        [Theory]
-        [InlineData(1d, 1d)]
-        [InlineData(-1d, 1d)]
-        [InlineData(1d, -1d)]
-        [InlineData(5d, 10d)]
-        public void Can_Decompose_Scale(double x, double y)
-        {
-            var matrix = Matrix.CreateScale(x, y);
-
-            var result = Matrix.TryDecomposeTransform(matrix, out Matrix.Decomposed decomposed);
-
-            Assert.Equal(true, result);
-            Assert.Equal(x, decomposed.Scale.X);
-            Assert.Equal(y, decomposed.Scale.Y);
-        }
-
-        private static double NormalizeAngle(double rad)
-        {
-            double twoPi = 2 * Math.PI;
-
-            while (rad < 0)
-            {
-                rad += twoPi;
-            }
-
-            while (rad > twoPi)
-            {
-                rad -= twoPi;
-            }
-
-            return rad;
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs
deleted file mode 100644
index ba8c490829..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs
+++ /dev/null
@@ -1,324 +0,0 @@
-using Avalonia.Media;
-using Avalonia.Visuals.Platform;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    using System.Globalization;
-    using System.IO;
-    using Avalonia.Platform;
-    using Moq;
-
-    public class PathMarkupParserTests
-    {
-        [Fact]
-        public void Parses_Move()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("M10 10");
-
-                var figure = pathGeometry.Figures[0];
-
-                Assert.Equal(new Point(10, 10), figure.StartPoint);
-            }
-        }
-
-        [Fact]
-        public void Parses_Line()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("M0 0L10 10");
-
-                var figure = pathGeometry.Figures[0];
-
-                var segment = figure.Segments[0];
-
-                Assert.IsType<LineSegment>(segment);
-
-                var lineSegment = (LineSegment)segment;
-
-                Assert.Equal(new Point(10, 10), lineSegment.Point);
-            }
-        }
-
-        [Fact]
-        public void Parses_Close()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("M0 0L10 10z");
-
-                var figure = pathGeometry.Figures[0];
-
-                Assert.True(figure.IsClosed);
-            }
-        }
-
-        [Fact]
-        public void Parses_FillMode_Before_Move()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("F 1M0,0");
-
-                Assert.Equal(FillRule.NonZero, pathGeometry.FillRule);
-            }
-        }
-
-        [Theory]
-        [InlineData("M0 0 10 10 20 20")]
-        [InlineData("M0,0 10,10 20,20")]
-        [InlineData("M0,0,10,10,20,20")]
-        public void Parses_Implicit_Line_Command_After_Move(string pathData)
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse(pathData);
-
-                var figure = pathGeometry.Figures[0];
-
-                var segment = figure.Segments[0];
-
-                Assert.IsType<LineSegment>(segment);
-
-                var lineSegment = (LineSegment)segment;
-
-                Assert.Equal(new Point(10, 10), lineSegment.Point);
-
-                segment = figure.Segments[1];
-
-                Assert.IsType<LineSegment>(segment);
-
-                lineSegment = (LineSegment)segment;
-
-                Assert.Equal(new Point(20, 20), lineSegment.Point);
-            }
-        }
-
-        [Theory]
-        [InlineData("m0 0 10 10 20 20")]
-        [InlineData("m0,0 10,10 20,20")]
-        [InlineData("m0,0,10,10,20,20")]
-        public void Parses_Implicit_Line_Command_After_Relative_Move(string pathData)
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse(pathData);
-
-                var figure = pathGeometry.Figures[0];
-
-                var segment = figure.Segments[0];
-
-                Assert.IsType<LineSegment>(segment);
-
-                var lineSegment = (LineSegment)segment;
-
-                Assert.Equal(new Point(10, 10), lineSegment.Point);
-
-                segment = figure.Segments[1];
-
-                Assert.IsType<LineSegment>(segment);
-
-                lineSegment = (LineSegment)segment;
-
-                Assert.Equal(new Point(30, 30), lineSegment.Point);
-            }
-        }
-
-        [Fact]
-        public void Parses_Scientific_Notation_Double()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("M -1.01725E-005 -1.01725e-005");
-
-                var figure = pathGeometry.Figures[0];
-
-                Assert.Equal(
-                    new Point(
-                        double.Parse("-1.01725E-005", NumberStyles.Float, CultureInfo.InvariantCulture),
-                        double.Parse("-1.01725E-005", NumberStyles.Float, CultureInfo.InvariantCulture)),
-                    figure.StartPoint);
-            }
-        }
-
-        [Theory]
-        [InlineData("M5.5.5 5.5.5 5.5.5")]
-        [InlineData("F1M9.0771,11C9.1161,10.701,9.1801,10.352,9.3031,10L9.0001,10 9.0001,6.166 3.0001,9.767 3.0001,10 "
-                    + "9.99999999997669E-05,10 9.99999999997669E-05,0 3.0001,0 3.0001,0.234 9.0001,3.834 9.0001,0 "
-                    + "12.0001,0 12.0001,8.062C12.1861,8.043 12.3821,8.031 12.5941,8.031 15.3481,8.031 15.7961,9.826 "
-                    + "15.9201,11L16.0001,16 9.0001,16 9.0001,12.562 9.0001,11z")] // issue #1708
-        [InlineData("         M0 0")]
-        [InlineData("F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z")] // issue #1107
-        [InlineData("M0 0L10 10z")]
-        [InlineData("M50 50 L100 100 L150 50")]
-        [InlineData("M50 50L100 100L150 50")]
-        [InlineData("M50,50 L100,100 L150,50")]
-        [InlineData("M50 50 L-10 -10 L10 50")]
-        [InlineData("M50 50L-10-10L10 50")]
-        [InlineData("M50 50 L100 100 L150 50zM50 50 L70 70 L120 50z")]
-        [InlineData("M 50 50 L 100 100 L 150 50")]
-        [InlineData("M50 50 L100 100 L150 50 H200 V100Z")]
-        [InlineData("M 80 200 A 100 50 45 1 0 100 50")]
-        [InlineData(
-            "F1 M 16.6309 18.6563C 17.1309 8.15625 29.8809 14.1563 29.8809 14.1563C 30.8809 11.1563 34.1308 11.4063" +
-            " 34.1308 11.4063C 33.5 12 34.6309 13.1563 34.6309 13.1563C 32.1309 13.1562 31.1309 14.9062 31.1309 14.9" +
-            "062C 41.1309 23.9062 32.6309 27.9063 32.6309 27.9062C 24.6309 24.9063 21.1309 22.1562 16.6309 18.6563 Z" +
-            " M 16.6309 19.9063C 21.6309 24.1563 25.1309 26.1562 31.6309 28.6562C 31.6309 28.6562 26.3809 39.1562 18" +
-            ".3809 36.1563C 18.3809 36.1563 18 38 16.3809 36.9063C 15 36 16.3809 34.9063 16.3809 34.9063C 16.3809 34" +
-            ".9063 10.1309 30.9062 16.6309 19.9063 Z ")]
-        [InlineData(
-            "F1M16,12C16,14.209 14.209,16 12,16 9.791,16 8,14.209 8,12 8,11.817 8.03,11.644 8.054,11.467L6.585,10 4,10 " +
-            "4,6.414 2.5,7.914 0,5.414 0,3.586 3.586,0 4.414,0 7.414,3 7.586,3 9,1.586 11.914,4.5 10.414,6 " +
-            "12.461,8.046C14.45,8.278,16,9.949,16,12")]
-        public void Should_Parse(string pathData)
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse(pathData);
-
-                Assert.True(true);
-            }
-        }
-
-        [Theory]
-        [InlineData("M0 0L10 10")]
-        [InlineData("M0 0L10 10z")]
-        [InlineData("M0 0L10 10 \n ")]
-        [InlineData("M0 0L10 10z \n ")]
-        [InlineData("M0 0L10 10 ")]
-        [InlineData("M0 0L10 10z ")]
-        public void Should_AlwaysEndFigure(string pathData)
-        {
-            var context = new Mock<IGeometryContext>();
-
-            using (var parser = new PathMarkupParser(context.Object))
-            {
-                parser.Parse(pathData);
-            }
-
-            context.Verify(v => v.EndFigure(It.IsAny<bool>()), Times.AtLeastOnce());
-        }
-
-        [Theory]
-        [InlineData("M 5.5, 5 L 5.5, 5 L 5.5, 5")]
-        [InlineData("F1 M 9.0771, 11 C 9.1161, 10.701 9.1801, 10.352 9.3031, 10 L 9.0001, 10 L 9.0001, 6.166 L 3.0001, 9.767 L 3.0001, 10 "
-            + "L 9.99999999997669E-05, 10 L 9.99999999997669E-05, 0 L 3.0001, 0 L 3.0001, 0.234 L 9.0001, 3.834 L 9.0001, 0 "
-            + "L 12.0001, 0 L 12.0001, 8.062 C 12.1861, 8.043 12.3821, 8.031 12.5941, 8.031 C 15.3481, 8.031 15.7961, 9.826 "
-            + "15.9201, 11 L 16.0001, 16 L 9.0001, 16 L 9.0001, 12.562 L 9.0001, 11Z")]
-        [InlineData("F1 M 24, 14 A 2, 2 0 1 1 20, 14 A 2, 2 0 1 1 24, 14Z")]
-        [InlineData("M 0, 0 L 10, 10Z")]
-        [InlineData("M 50, 50 L 100, 100 L 150, 50")]
-        [InlineData("M 50, 50 L -10, -10 L 10, 50")]
-        [InlineData("M 50, 50 L 100, 100 L 150, 50Z M 50, 50 L 70, 70 L 120, 50Z")]
-        [InlineData("M 80, 200 A 100, 50 45 1 0 100, 50")]
-        [InlineData("F1 M 16, 12 C 16, 14.209 14.209, 16 12, 16 C 9.791, 16 8, 14.209 8, 12 C 8, 11.817 8.03, 11.644 8.054, 11.467 L 6.585, 10 "
-            + "L 4, 10 L 4, 6.414 L 2.5, 7.914 L 0, 5.414 L 0, 3.586 L 3.586, 0 L 4.414, 0 L 7.414, 3 L 7.586, 3 L 9, 1.586 L "
-            + "11.914, 4.5 L 10.414, 6 L 12.461, 8.046 C 14.45, 8.278 16, 9.949 16, 12")]
-        public void Parsed_Geometry_ToString_Should_Produce_Valid_Value(string pathData)
-        {
-            var target = PathGeometry.Parse(pathData);
-
-            string output = target.ToString();
-
-            Assert.Equal(pathData, output);
-        }
-
-        [Theory]
-        [InlineData("M5.5.5 5.5.5 5.5.5", "M 5.5, 0.5 L 5.5, 0.5 L 5.5, 0.5")]
-        [InlineData("F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z", "F1 M 24, 14 A 2, 2 0 1 1 20, 14 A 2, 2 0 1 1 24, 14Z")]
-        [InlineData("F1M16,12C16,14.209 14.209,16 12,16 9.791,16 8,14.209 8,12 8,11.817 8.03,11.644 8.054,11.467L6.585,10 4,10 "
-                    + "4,6.414 2.5,7.914 0,5.414 0,3.586 3.586,0 4.414,0 7.414,3 7.586,3 9,1.586 11.914,4.5 10.414,6 "
-                    + "12.461,8.046C14.45,8.278,16,9.949,16,12",
-                    "F1 M 16, 12 C 16, 14.209 14.209, 16 12, 16 C 9.791, 16 8, 14.209 8, 12 C 8, 11.817 8.03, 11.644 8.054, 11.467 L 6.585, 10 "
-                    + "L 4, 10 L 4, 6.414 L 2.5, 7.914 L 0, 5.414 L 0, 3.586 L 3.586, 0 L 4.414, 0 L 7.414, 3 L 7.586, 3 L 9, 1.586 L "
-                    + "11.914, 4.5 L 10.414, 6 L 12.461, 8.046 C 14.45, 8.278 16, 9.949 16, 12")]
-        public void Parsed_Geometry_ToString_Should_Format_Value(string pathData, string formattedPathData)
-        {
-            var target = PathGeometry.Parse(pathData);
-
-            string output = target.ToString();
-
-            Assert.Equal(formattedPathData, output);
-        }
-
-        [Theory]
-        [InlineData("0 0")]
-        [InlineData("j")]
-        public void Throws_InvalidDataException_On_None_Defined_Command(string pathData)
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                Assert.Throws<InvalidDataException>(() => parser.Parse(pathData));
-            }
-        }
-
-        [Fact]
-        public void CloseFigure_Should_Move_CurrentPoint_To_CreateFigurePoint()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("M10,10L100,100Z m10,10");
-
-                Assert.Equal(2, pathGeometry.Figures.Count);
-
-                var figure = pathGeometry.Figures[0];
-
-                Assert.Equal(new Point(10, 10), figure.StartPoint);
-
-                Assert.Equal(true, figure.IsClosed);
-
-                Assert.Equal(new Point(100, 100), ((LineSegment)figure.Segments[0]).Point);
-
-                figure = pathGeometry.Figures[1];
-
-                Assert.Equal(new Point(20, 20), figure.StartPoint);
-            }
-        }
-
-        [Fact]
-        public void Should_Parse_Flags_Without_Separator()
-        {
-            var pathGeometry = new PathGeometry();
-            using (var context = new PathGeometryContext(pathGeometry))
-            using (var parser = new PathMarkupParser(context))
-            {
-                parser.Parse("a.898.898 0 01.27.188");
-
-                var figure = pathGeometry.Figures[0];
-
-                var segments = figure.Segments;
-                
-                Assert.NotNull(segments);
-                
-                Assert.Equal(1, segments.Count);
-
-                var arcSegment = segments[0];
-
-                Assert.IsType<ArcSegment>(arcSegment);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PathSegmentTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PathSegmentTests.cs
deleted file mode 100644
index 0737b4dc88..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/PathSegmentTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class PathSegmentTests
-    {
-        [Fact]
-        public void PathSegment_Triggers_Invalidation_On_Property_Change()
-        {
-            var targetSegment = new ArcSegment()
-            {
-                Size = new Size(10, 10),
-                Point = new Point(5, 5)
-            };
-
-            var target = new PathGeometry
-            {
-                Figures = new PathFigures
-                {
-                    new PathFigure { IsClosed = false, Segments = new PathSegments { targetSegment } }
-                }
-            };
-            
-            var changed = false;
-
-            target.Changed += (s, e) => changed = true;
-
-            targetSegment.Size = new Size(20, 20);
-
-            Assert.True(changed);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs
deleted file mode 100644
index 8c25019606..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using Avalonia.Collections;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class PenTests
-    {
-        [Fact]
-        public void Changing_Thickness_Raises_Invalidated()
-        {
-            var target = new Pen();
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            target.Thickness = 18;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Changing_Brush_Color_Raises_Invalidated()
-        {
-            var brush = new SolidColorBrush(Colors.Red);
-            var target = new Pen { Brush = brush };
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            brush.Color = Colors.Green;
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Changing_DashStyle_Dashes_Raises_Invalidated()
-        {
-            var dashes = new DashStyle();
-            var target = new Pen { DashStyle = dashes };
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            dashes.Dashes = new AvaloniaList<double> { 0.1, 0.2 };
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Adding_DashStyle_Dashes_Raises_Invalidated()
-        {
-            var dashes = new DashStyle();
-            var target = new Pen { DashStyle = dashes };
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            dashes.Dashes.Add(0.3);
-
-            Assert.True(raised);
-        }
-
-        [Fact]
-        public void Equality_Is_Implemented_Between_Immutable_And_Mutable_Pens()
-        {
-            var brush = new ImmutableSolidColorBrush(Colors.Red);
-            var target1 = new ImmutablePen(
-                brush: brush,
-                thickness: 2,
-                dashStyle: (ImmutableDashStyle)DashStyle.Dash,
-                lineCap: PenLineCap.Round,
-                lineJoin: PenLineJoin.Round,
-                miterLimit: 21);
-            var target2 = new Pen(
-                brush: brush,
-                thickness: 2,
-                dashStyle: DashStyle.Dash,
-                lineCap: PenLineCap.Round,
-                lineJoin: PenLineJoin.Round,
-                miterLimit: 21);
-
-            Assert.True(Equals(target1, target2));
-        }
-
-        [Fact]
-        public void Equality_Is_Implemented_Between_Mutable_And_Immutable_DashStyles()
-        {
-            var brush = new ImmutableSolidColorBrush(Colors.Red);
-            var target1 = new ImmutablePen(
-                brush: brush,
-                thickness: 2,
-                dashStyle: new ImmutableDashStyle(new[] { 0.1, 0.2 }, 5),
-                lineCap: PenLineCap.Round,
-                lineJoin: PenLineJoin.Round,
-                miterLimit: 21);
-            var target2 = new Pen(
-                brush: brush,
-                thickness: 2,
-                dashStyle: new DashStyle(new[] { 0.1, 0.2 }, 5),
-                lineCap: PenLineCap.Round,
-                lineJoin: PenLineJoin.Round,
-                miterLimit: 21);
-
-            Assert.True(Equals(target1, target2));
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PixelRectTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PixelRectTests.cs
deleted file mode 100644
index c6da9b77e9..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/PixelRectTests.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class PixelRectTests
-    {
-        [Fact]
-        public void FromRect_Snaps_To_Device_Pixels()
-        {
-            var rect = new Rect(189, 189, 26, 164);
-            var result = PixelRect.FromRect(rect, 1.5);
-
-            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
-        }
-
-        [Fact]
-        public void FromRect_Vector_Snaps_To_Device_Pixels()
-        {
-            var rect = new Rect(189, 189, 26, 164);
-            var result = PixelRect.FromRect(rect, new Vector(1.5, 1.5));
-
-            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
-        }
-
-        [Fact]
-        public void FromRectWithDpi_Snaps_To_Device_Pixels()
-        {
-            var rect = new Rect(189, 189, 26, 164);
-            var result = PixelRect.FromRectWithDpi(rect, 144);
-
-            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
-        }
-
-        [Fact]
-        public void FromRectWithDpi_Vector_Snaps_To_Device_Pixels()
-        {
-            var rect = new Rect(189, 189, 26, 164);
-            var result = PixelRect.FromRectWithDpi(rect, new Vector(144, 144));
-
-            Assert.Equal(new PixelRect(283, 283, 40, 247), result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/RectTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/RectTests.cs
deleted file mode 100644
index cd0c7e1ace..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/RectTests.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Globalization;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class RectTests
-    {
-        [Fact]
-        public void Parse_Parses()
-        {
-            var rect = Rect.Parse("1,2 3,-4");
-            var expected = new Rect(1, 2, 3, -4);
-            Assert.Equal(expected, rect);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs
deleted file mode 100644
index 5af1bb572e..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.UnitTests;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class RectangleGeometryTests
-    {
-        [Fact]
-        public void Rectangle_With_Transform_Can_Be_Changed()
-        {
-            using (UnitTestApplication.Start(GetServices()))
-            {
-                var target = new RectangleGeometry
-                {
-                    Rect = new Rect(0, 0, 100, 100),
-                    Transform = new RotateTransform(45),
-                };
-
-                target.Rect = new Rect(50, 50, 150, 150);
-            }
-        }
-
-        private TestServices GetServices()
-        {
-            var context = Mock.Of<IStreamGeometryContextImpl>();
-            var transformedGeometry = new Mock<ITransformedGeometryImpl>();
-            var streamGeometry = Mock.Of<IStreamGeometryImpl>(x => 
-                x.Open() == context &&
-                x.WithTransform(It.IsAny<Matrix>()) == transformedGeometry.Object);
-            var renderInterface = Mock.Of<IPlatformRenderInterface>(x =>
-                x.CreateStreamGeometry() == streamGeometry);
-            return new TestServices(renderInterface: renderInterface);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/SolidColorBrushTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/SolidColorBrushTests.cs
deleted file mode 100644
index bcf63f9660..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/SolidColorBrushTests.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class SolidColorBrushTests
-    {
-        [Fact]
-        public void Changing_Color_Raises_Invalidated()
-        {
-            var target = new SolidColorBrush(Colors.Red);
-            var raised = false;
-
-            target.Invalidated += (s, e) => raised = true;
-            target.Color = Colors.Green;
-
-            Assert.True(raised);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextDecorationTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextDecorationTests.cs
deleted file mode 100644
index 60a41baaa7..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextDecorationTests.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class TextDecorationTests
-    {
-        [Fact]
-        public void Should_Parse_TextDecorations()
-        {
-            var baseline = TextDecorationCollection.Parse("baseline");
-
-            Assert.Equal(TextDecorationLocation.Baseline, baseline[0].Location);
-
-            var underline = TextDecorationCollection.Parse("underline");
-
-            Assert.Equal(TextDecorationLocation.Underline, underline[0].Location);
-
-            var overline = TextDecorationCollection.Parse("overline");
-
-            Assert.Equal(TextDecorationLocation.Overline, overline[0].Location);
-
-            var strikethrough = TextDecorationCollection.Parse("strikethrough");
-
-            Assert.Equal(TextDecorationLocation.Strikethrough, strikethrough[0].Location);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
deleted file mode 100644
index 2f1064be21..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    internal class BiDiClassTestDataGenerator : IEnumerable<BiDiClassData>
-    {
-        private readonly List<BiDiClassData> _testData;
-
-        public BiDiClassTestDataGenerator()
-        {
-            _testData = ReadData();
-        }
-        
-        public IEnumerator<BiDiClassData> GetEnumerator()
-        {
-            return _testData.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-        
-        private static List<BiDiClassData> ReadData()
-        {
-            var testData = new List<BiDiClassData>();
-            
-            using (var client = new HttpClient())
-            {
-                var url = Path.Combine(UnicodeDataGenerator.Ucd, "BidiCharacterTest.txt");
-
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                        return testData;
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        var lineNumber = 0;
-                        
-                        // Process each line
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            lineNumber++;
-                            
-                            if (line == null)
-                            {
-                                break;
-                            }
-
-                            if (line.StartsWith("#") || string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-                            
-                            // Split into fields
-                            var fields = line.Split(';');
-
-                            // Parse field 0 - code points
-                            var codePoints = fields[0].Split(' ').Select(x => x.Trim()).Where(x => !string.IsNullOrEmpty(x)).Select(x => Convert.ToInt32(x, 16)).ToArray();
-
-                            // Parse field 1 - paragraph level
-                            var paragraphLevel = sbyte.Parse(fields[1]);
-
-                            // Parse field 2 - resolved paragraph level
-                            var resolvedParagraphLevel = sbyte.Parse(fields[2]);
-
-                            // Parse field 3 - resolved levels
-                            var resolvedLevels = fields[3].Split(' ').Select(x => x.Trim()).Where(x => !string.IsNullOrEmpty(x)).Select(x => x == "x" ? (sbyte)-1 : Convert.ToSByte(x)).ToArray();
-
-                            // Parse field 4 - resolved levels
-                            var resolvedOrder = fields[4].Split(' ').Select(x => x.Trim()).Where(x => !string.IsNullOrEmpty(x)).Select(x => Convert.ToInt32(x)).ToArray();
-
-                            testData.Add(new BiDiClassData
-                            {
-                                LineNumber = lineNumber,
-                                CodePoints = codePoints,
-                                ParagraphLevel = paragraphLevel,
-                                ResolvedParagraphLevel = resolvedParagraphLevel,
-                                ResolvedLevels = resolvedLevels,
-                                ResolvedOrder = resolvedOrder
-                            });
-                        }
-                    }
-                }
-            }
-
-            return testData;
-        }
-        
-       
-    }
-    
-    internal struct BiDiClassData
-    {
-        public int LineNumber { get; set; }
-        public int[] CodePoints{ get; set; }
-        public sbyte ParagraphLevel{ get; set; }
-        public  sbyte ResolvedParagraphLevel{ get; set; }
-        public sbyte[] ResolvedLevels{ get; set; }
-        public int[] ResolvedOrder{ get; set; }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
deleted file mode 100644
index 4102de10ec..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using Avalonia.Media.TextFormatting.Unicode;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    internal class BiDiTestDataGenerator : IEnumerable<BiDiTestData>
-    {
-        private readonly List<BiDiTestData> _testData;
-
-        public BiDiTestDataGenerator()
-        {
-            _testData = ReadTestData();
-        }
-
-        public IEnumerator<BiDiTestData> GetEnumerator()
-        {
-            return _testData.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        private static List<BiDiTestData> ReadTestData()
-        {
-            var testData = new List<BiDiTestData>();
-
-            using (var client = new HttpClient())
-            {
-                var url = Path.Combine(UnicodeDataGenerator.Ucd, "BidiTest.txt");
-
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                        return testData;
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        var lineNumber = 0;
-
-                        // Process each line
-                        int[] levels = null;
-
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            lineNumber++;
-
-                            if (line == null)
-                            {
-                                break;
-                            }
-
-                            if (line.StartsWith("#") || string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-
-                            // Directive?
-                            if (line.StartsWith("@"))
-                            {
-                                if (line.StartsWith("@Levels:"))
-                                {
-                                    levels = line.Substring(8).Trim().Split(' ').Where(x => x.Length > 0).Select(x =>
-                                    {
-                                        if (x == "x")
-                                        {
-                                            return -1;
-                                        }
-
-                                        return int.Parse(x);
-
-                                    }).ToArray();
-                                }
-
-                                continue;
-                            }
-
-                            // Split data line
-                            var parts = line.Split(';');
-
-                            // Get the directions
-                            var directions = parts[0].Split(' ').Select(PropertyValueAliasHelper.GetBiDiClass)
-                                .ToArray();
-
-                            // Get the bit set
-                            var bitset = Convert.ToInt32(parts[1].Trim(), 16);
-
-                            for (var bit = 1; bit < 8; bit <<= 1)
-                            {
-                                if ((bitset & bit) == 0)
-                                {
-                                    continue;
-                                }
-
-                                sbyte paragraphEmbeddingLevel;
-
-                                switch (bit)
-                                {
-                                    case 1:
-                                        paragraphEmbeddingLevel = 2; // Auto
-                                        break;
-
-                                    case 2:
-                                        paragraphEmbeddingLevel = 0; // LTR
-                                        break;
-
-                                    case 4:
-                                        paragraphEmbeddingLevel = 1; // RTL
-                                        break;
-
-                                    default:
-                                        throw new NotSupportedException();
-                                }
-
-                                testData.Add(new BiDiTestData
-                                {
-                                    LineNumber = lineNumber,
-                                    Classes = directions,
-                                    ParagraphEmbeddingLevel = paragraphEmbeddingLevel,
-                                    Levels = levels
-                                });
-                            }
-                        }
-                    }
-                }
-            }
-
-            return testData;
-        }
-    }
-
-    internal class BiDiTestData
-    {
-        public int LineNumber { get; set; }
-        public BidiClass[] Classes { get; set; }
-        public sbyte ParagraphEmbeddingLevel { get; set; }
-        public int[] Levels { get; set; }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs
deleted file mode 100644
index c074e5a1f1..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net.Http;
-using System.Text.RegularExpressions;
-using Avalonia.Media.TextFormatting.Unicode;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    public static class GraphemeBreakClassTrieGenerator
-    {
-        public static void Execute()
-        {
-            if (!Directory.Exists("Generated"))
-            {
-                Directory.CreateDirectory("Generated");
-            }
-
-            using (var stream = File.Create("Generated\\GraphemeBreak.trie"))
-            {
-                var trie = GenerateBreakTypeTrie();
-
-                trie.Save(stream);
-            }
-        }
-
-        private static UnicodeTrie GenerateBreakTypeTrie()
-        {
-            var trieBuilder = new UnicodeTrieBuilder();
-
-            var graphemeBreakData = ReadBreakData(Path.Combine(UnicodeDataGenerator.Ucd, "auxiliary/GraphemeBreakProperty.txt"));
-
-            var emojiBreakData = ReadBreakData(Path.Combine(UnicodeDataGenerator.Ucd, "emoji/emoji-data.txt"));
-
-            foreach (var breakData in new [] { graphemeBreakData, emojiBreakData })
-            {
-                foreach (var (start, end, graphemeBreakType) in breakData)
-                {
-                    if (!Enum.TryParse<GraphemeBreakClass>(graphemeBreakType, out var value))
-                    {
-                        continue;
-                    }
-
-                    if (start == end)
-                    {
-                        trieBuilder.Set(start, (uint)value);
-                    }
-                    else
-                    {
-                        trieBuilder.SetRange(start, end, (uint)value);
-                    }
-                }
-            }
-
-            return trieBuilder.Freeze();
-        }
-
-        public static List<(int, int, string)> ReadBreakData(string file)
-        {
-            var data = new List<(int, int, string)>();
-
-            var rx = new Regex(@"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s*;\s*(\w+)\s*#.*", RegexOptions.Compiled);
-
-            using (var client = new HttpClient())
-            {
-                using (var result = client.GetAsync(file).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                    {
-                        return data;
-                    }
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-
-                            var match = rx.Match(line);
-
-                            if (!match.Success)
-                            {
-                                continue;
-                            }
-
-                            var start = Convert.ToInt32(match.Groups[1].Value, 16);
-
-                            var end = start;
-
-                            if (!string.IsNullOrEmpty(match.Groups[2].Value))
-                            {
-                                end = Convert.ToInt32(match.Groups[2].Value, 16);
-                            }
-
-                            var breakType = match.Groups[3].Value;
-
-                            data.Add((start, end, breakType));
-                        }
-                    }
-                }
-            }
-
-            return data;
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs
deleted file mode 100644
index 848b60b341..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using Avalonia.Media.TextFormatting.Unicode;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    /// <summary>
-    ///     This class is intended for use when the Unicode spec changes. Otherwise the containing tests are redundant.
-    ///     To update the <c>GraphemeBreak.trie</c> run the <see cref="Should_Generate_Trie"/> test.
-    /// </summary>
-    public class GraphemeBreakClassTrieGeneratorTests
-    {
-        [Theory(Skip = "Only run when we update the trie.")]
-        [ClassData(typeof(GraphemeBreakTestDataGenerator))]
-        public void Should_Enumerate(string text, int expectedLength)
-        {
-            var textMemory = text.AsMemory();
-
-            var enumerator = new GraphemeEnumerator(textMemory);
-
-            Assert.True(enumerator.MoveNext());
-
-            Assert.Equal(expectedLength, enumerator.Current.Text.Length);
-        }
-
-        [Fact(Skip = "Only run when we update the trie.")]
-        public void Should_Enumerate_Other()
-        {
-            const string text = "ABCDEFGHIJ";
-
-            var textMemory = text.AsMemory();
-
-            var enumerator = new GraphemeEnumerator(textMemory);
-
-            var count = 0;
-
-            while (enumerator.MoveNext())
-            {
-                Assert.Equal(1, enumerator.Current.Text.Length);
-
-                count++;
-            }
-
-            Assert.Equal(10, count);
-        }
-
-        [Fact(Skip = "Only run when we update the trie.")]
-        public void Should_Generate_Trie()
-        {
-            GraphemeBreakClassTrieGenerator.Execute();
-        }
-
-        private class GraphemeBreakTestDataGenerator : TestDataGenerator
-        {
-            public GraphemeBreakTestDataGenerator() 
-                : base("auxiliary/GraphemeBreakTest.txt")
-            {
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
deleted file mode 100644
index a90be6d519..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using Avalonia.Media.TextFormatting.Unicode;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    public class LineBreakEnumeratorTests
-    {
-        private readonly ITestOutputHelper _outputHelper;
-        
-        public LineBreakEnumeratorTests(ITestOutputHelper outputHelper)
-        {
-            _outputHelper = outputHelper;
-        }
-        
-        [Fact]
-        public void BasicLatinTest()
-        {
-            var lineBreaker = new LineBreakEnumerator("Hello World\r\nThis is a test.".AsMemory());
-
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(6, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
-
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(13, lineBreaker.Current.PositionWrap);
-            Assert.True(lineBreaker.Current.Required);
-
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(18, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
-
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(21, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
-
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(23, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
-
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(28, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
-
-            Assert.False(lineBreaker.MoveNext());
-        }
-
-
-        [Fact]
-        public void ForwardTextWithOuterWhitespace()
-        {
-            var lineBreaker = new LineBreakEnumerator(" Apples Pears Bananas   ".AsMemory());
-            var positionsF = GetBreaks(lineBreaker);
-            Assert.Equal(1, positionsF[0].PositionWrap);
-            Assert.Equal(0, positionsF[0].PositionMeasure);
-            Assert.Equal(8, positionsF[1].PositionWrap);
-            Assert.Equal(7, positionsF[1].PositionMeasure);
-            Assert.Equal(14, positionsF[2].PositionWrap);
-            Assert.Equal(13, positionsF[2].PositionMeasure);
-            Assert.Equal(24, positionsF[3].PositionWrap);
-            Assert.Equal(21, positionsF[3].PositionMeasure);
-        }
-
-        private static List<LineBreak> GetBreaks(LineBreakEnumerator lineBreaker)
-        {
-            var breaks = new List<LineBreak>();
-
-            while (lineBreaker.MoveNext())
-            {
-                breaks.Add(lineBreaker.Current);
-            }
-
-            return breaks;
-        }
-
-        [Fact]
-        public void ForwardTest()
-        {
-            var lineBreaker = new LineBreakEnumerator("Apples Pears Bananas".AsMemory());
-
-            var positionsF = GetBreaks(lineBreaker);
-            Assert.Equal(7, positionsF[0].PositionWrap);
-            Assert.Equal(6, positionsF[0].PositionMeasure);
-            Assert.Equal(13, positionsF[1].PositionWrap);
-            Assert.Equal(12, positionsF[1].PositionMeasure);
-            Assert.Equal(20, positionsF[2].PositionWrap);
-            Assert.Equal(20, positionsF[2].PositionMeasure);
-        }
-
-        [Theory(Skip = "Only run when the Unicode spec changes.")]
-        [ClassData(typeof(LineBreakTestDataGenerator))]
-        public void ShouldFindBreaks(int lineNumber, int[] codePoints, int[] breakPoints)
-        {
-            var text = string.Join(null, codePoints.Select(char.ConvertFromUtf32));
-
-            var lineBreaker = new LineBreakEnumerator(text.AsMemory());
-
-            var foundBreaks = new List<int>();
-            
-            while (lineBreaker.MoveNext())
-            {
-                foundBreaks.Add(lineBreaker.Current.PositionWrap);
-            }
-            
-            // Check the same
-            var pass = true;
-
-            if (foundBreaks.Count != breakPoints.Length)
-            {
-                pass = false;
-            }
-            else
-            {
-                for (var i = 0; i < foundBreaks.Count; i++)
-                {
-                    if (foundBreaks[i] != breakPoints[i])
-                    {
-                        pass = false;
-                    }
-                }
-            }
-
-            if (!pass)
-            {
-                _outputHelper.WriteLine($"Failed test on line {lineNumber}");
-                _outputHelper.WriteLine("");
-                _outputHelper.WriteLine($"    Code Points: {string.Join(" ", codePoints)}");
-                _outputHelper.WriteLine($"Expected Breaks: {string.Join(" ", breakPoints)}");
-                _outputHelper.WriteLine($"  Actual Breaks: {string.Join(" ", foundBreaks)}");
-                _outputHelper.WriteLine($"           Text: {text}");
-                _outputHelper.WriteLine($"     Char Props: {string.Join(" ", codePoints.Select(x => new Codepoint(x).LineBreakClass))}");
-                _outputHelper.WriteLine("");
-            }
-            
-            Assert.True(pass);
-        }
-
-        private class LineBreakTestDataGenerator : IEnumerable<object[]>
-        {
-            private readonly List<object[]> _testData;
-
-            public LineBreakTestDataGenerator()
-            {
-                _testData = GenerateTestData();
-            }
-
-            public IEnumerator<object[]> GetEnumerator()
-            {
-                return _testData.GetEnumerator();
-            }
-
-            IEnumerator IEnumerable.GetEnumerator()
-            {
-                return GetEnumerator();
-            }
-
-            private static List<object[]> GenerateTestData()
-            {
-                // Process each line
-                var tests = new List<object[]>();
-
-                // Read the test file
-                var url = Path.Combine(UnicodeDataGenerator.Ucd, "auxiliary/LineBreakTest.txt");
-
-                using (var client = new HttpClient())
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                    {
-                        return tests;
-                    }
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        var lineNumber = 1;
-
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (line is null)
-                            {
-                                break;
-                            }
-
-                            // Get the line, remove comments
-                            line = line.Split('#')[0].Trim();
-
-                            // Ignore blank/comment only lines
-                            if (string.IsNullOrWhiteSpace(line))
-                            {
-                                lineNumber++;
-                                continue;
-                            }
-
-                            var codePoints = new List<int>();
-                            var breakPoints = new List<int>();
-
-                            // Parse the test
-                            var p = 0;
-
-                            while (p < line.Length)
-                            {
-                                // Ignore white space
-                                if (char.IsWhiteSpace(line[p]))
-                                {
-                                    p++;
-                                    continue;
-                                }
-
-                                if (line[p] == '×')
-                                {
-                                    p++;
-                                    continue;
-                                }
-
-                                if (line[p] == '÷')
-                                {
-                                    breakPoints.Add(codePoints.Select(x=> x > ushort.MaxValue ? 2 : 1).Sum());
-                                    p++;
-                                    continue;
-                                }
-
-                                var codePointPos = p;
-
-                                while (p < line.Length && IsHexDigit(line[p]))
-                                {
-                                    p++;
-                                }
-
-                                var codePointStr = line.Substring(codePointPos, p - codePointPos);
-                                var codePoint = Convert.ToInt32(codePointStr, 16);
-                                codePoints.Add(codePoint);
-                            }
-
-                            tests.Add(new object[] { lineNumber, codePoints.ToArray(), breakPoints.ToArray() });
-
-                            lineNumber++;
-                        }
-                    }
-                }
-
-                return tests;
-            }
-
-            private static bool IsHexDigit(char ch)
-            {
-                return char.IsDigit(ch) || (ch >= 'A' && ch <= 'F') || (ch >= 'a' && ch <= 'f');
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/TestDataGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/TestDataGenerator.cs
deleted file mode 100644
index 058de909df..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/TestDataGenerator.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    public abstract class TestDataGenerator : IEnumerable<object[]>
-    {
-        private readonly string _fileName;
-        private readonly List<object[]> _testData;
-
-        protected TestDataGenerator(string fileName)
-        {
-            _fileName = fileName;
-            _testData = ReadTestData();
-        }
-
-        public IEnumerator<object[]> GetEnumerator()
-        {
-            return _testData.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        private List<object[]> ReadTestData()
-        {
-            var testData = new List<object[]>();
-
-            using (var client = new HttpClient())
-            {
-                var url = Path.Combine(UnicodeDataGenerator.Ucd, _fileName);
-
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                        return testData;
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (line == null)
-                            {
-                                break;
-                            }
-
-                            if (line.StartsWith("#") || string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-
-                            var elements = line.Split('#');
-
-                            elements = elements[0].Replace("÷\t", "÷").Trim('÷').Split('÷');
-
-                            var chars = elements[0].Replace(" × ", " ").Split(' ');
-
-                            var codepoints = chars.Where(x => x != "" && x != "×")
-                                .Select(x => Convert.ToInt32(x, 16)).ToArray();
-
-                            var text = string.Join(null, codepoints.Select(char.ConvertFromUtf32));
-
-                            var length = codepoints.Select(x => x > ushort.MaxValue ? 2 : 1).Sum();
-
-                            var data = new object[] { text, length };
-
-                            testData.Add(data);
-                        }
-                    }
-                }
-            }
-
-            return testData;
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
deleted file mode 100644
index da9e494405..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
+++ /dev/null
@@ -1,439 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net.Http;
-using System.Text.RegularExpressions;
-using Avalonia.Media.TextFormatting.Unicode;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    internal static class UnicodeDataGenerator
-    {
-        public const string Ucd = "https://www.unicode.org/Public/13.0.0/ucd/";
-
-        public static UnicodeTrie GenerateBiDiTrie(out BiDiDataEntries biDiDataEntries,out Dictionary<int, BiDiDataItem> biDiData)
-        {
-            biDiData = new Dictionary<int, BiDiDataItem>();
-
-            var biDiClassEntries =
-                UnicodeEnumsGenerator.CreateBiDiClassEnum();
-
-            var biDiClassMappings = CreateTagToIndexMappings(biDiClassEntries);
-
-            var biDiClassData = ReadBiDiData();
-
-            foreach (var (range, name) in biDiClassData)
-            {
-                var biDiClass = biDiClassMappings[name];
-
-                AddBiDiClassRange(biDiData, range, biDiClass);
-            }
-
-            var biDiPairedBracketTypeEntries = UnicodeEnumsGenerator.CreateBiDiPairedBracketTypeEnum();
-
-            var biDiPairedBracketTypeMappings = CreateTagToIndexMappings(biDiPairedBracketTypeEntries);
-
-            var biDiPairedBracketData = ReadBiDiPairedBracketData();
-            
-            foreach (var (range, name) in biDiPairedBracketData)
-            {
-                var bracketType = biDiPairedBracketTypeMappings[name];
-
-                AddBiDiBracket(biDiData, range, bracketType);
-            }
-            
-            var biDiTrieBuilder = new UnicodeTrieBuilder(/*initialValue*/);
-            
-            foreach (var properties in biDiData.Values)
-            {
-                //[bracket]|[bracketType]|[biDiClass]
-                var value = (properties.BiDiClass << UnicodeData.BIDICLASS_SHIFT) |
-                            (properties.BracketType << UnicodeData.BIDIPAIREDBRACKEDTYPE_SHIFT) | properties.Bracket;
-
-                biDiTrieBuilder.Set(properties.Codepoint, (uint)value);
-            }
-
-            biDiDataEntries = new BiDiDataEntries()
-            {
-                PairedBracketTypes = biDiPairedBracketTypeEntries, BiDiClasses = biDiClassEntries
-            };
-            
-            using (var stream = File.Create("Generated\\BiDi.trie"))
-            {
-                var trie = biDiTrieBuilder.Freeze();
-
-                trie.Save(stream);
-
-                return trie;
-            }
-        }
-
-        public static UnicodeTrie GenerateUnicodeDataTrie(out UnicodeDataEntries dataEntries, out Dictionary<int, UnicodeDataItem> unicodeData)
-        {
-            var generalCategoryEntries =
-                UnicodeEnumsGenerator.CreateGeneralCategoryEnum();
-
-            var generalCategoryMappings = CreateTagToIndexMappings(generalCategoryEntries);
-            
-            var scriptEntries = UnicodeEnumsGenerator.CreateScriptEnum();
-
-            var scriptMappings = CreateNameToIndexMappings(scriptEntries);
-            
-            var lineBreakClassEntries =
-                UnicodeEnumsGenerator.CreateLineBreakClassEnum();
-
-            var lineBreakClassMappings = CreateTagToIndexMappings(lineBreakClassEntries);
-
-            unicodeData = GetUnicodeData(generalCategoryMappings, scriptMappings, lineBreakClassMappings);
-            
-            var unicodeDataTrieBuilder = new UnicodeTrieBuilder(/*initialValue*/);
-            
-            foreach (var properties in unicodeData.Values)
-            {
-                //[line break]|[biDi]|[script]|[category]
-                var value = (properties.LineBreakClass << UnicodeData.LINEBREAK_SHIFT) |
-                            (properties.Script << UnicodeData.SCRIPT_SHIFT) | properties.GeneralCategory;
-
-                unicodeDataTrieBuilder.Set(properties.Codepoint, (uint)value);
-            }
-
-            dataEntries = new UnicodeDataEntries
-            {
-                Scripts = scriptEntries,
-                GeneralCategories = generalCategoryEntries,
-                LineBreakClasses = lineBreakClassEntries
-            };
-
-            using (var stream = File.Create("Generated\\UnicodeData.trie"))
-            {
-                var trie = unicodeDataTrieBuilder.Freeze();
-
-                trie.Save(stream);
-                
-                return trie;
-            }
-        }
-
-        private static Dictionary<int, UnicodeDataItem> GetUnicodeData(IReadOnlyDictionary<string, int> generalCategoryMappings, 
-            IReadOnlyDictionary<string, int> scriptMappings, IReadOnlyDictionary<string, int> lineBreakClassMappings)
-        {
-            var unicodeData = new Dictionary<int, UnicodeDataItem>();
-            
-            var generalCategoryData = ReadGeneralCategoryData();
-
-            foreach (var (range, name) in generalCategoryData)
-            {
-                var generalCategory = generalCategoryMappings[name];
-
-                AddGeneralCategoryRange(unicodeData, range, generalCategory);
-            }
-            
-            var scriptData = ReadScriptData();
-
-            foreach (var (range, name) in scriptData)
-            {
-                var script = scriptMappings[name];
-
-                AddScriptRange(unicodeData, range, script);
-            }
-            
-            var lineBreakClassData = ReadLineBreakClassData();
-
-            foreach (var (range, name) in lineBreakClassData)
-            {
-                var lineBreakClass = lineBreakClassMappings[name];
-
-                AddLineBreakClassRange(unicodeData, range, lineBreakClass);
-            }
-
-            return unicodeData;
-        }
-
-        private static Dictionary<string, int> CreateTagToIndexMappings(IReadOnlyList<DataEntry> entries)
-        {
-            var mappings = new Dictionary<string, int>();
-
-            for (var i = 0; i < entries.Count; i++)
-            {
-                mappings.Add(entries[i].Tag, i);
-            }
-
-            return mappings;
-        }
-
-        private static Dictionary<string, int> CreateNameToIndexMappings(IReadOnlyList<DataEntry> entries)
-        {
-            var mappings = new Dictionary<string, int>();
-
-            for (var i = 0; i < entries.Count; i++)
-            {
-                mappings.Add(entries[i].Name, i);
-            }
-
-            return mappings;
-        }
-
-        private static void AddGeneralCategoryRange(Dictionary<int, UnicodeDataItem> codepoints, CodepointRange range,
-            int generalCategory)
-        {
-            for (var i = range.Start; i <= range.End; i++)
-            {
-                if (!codepoints.ContainsKey(i))
-                {
-                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, GeneralCategory = generalCategory });
-                }
-                else
-                {
-                    codepoints[i].GeneralCategory = generalCategory;
-                }
-            }
-        }
-
-        private static void AddScriptRange(Dictionary<int, UnicodeDataItem> codepoints, CodepointRange range,
-            int script)
-        {
-            for (var i = range.Start; i <= range.End; i++)
-            {
-                if (!codepoints.ContainsKey(i))
-                {
-                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, Script = script });
-                }
-                else
-                {
-                    codepoints[i].Script = script;
-                }
-            }
-        }
-
-        private static void AddBiDiClassRange(Dictionary<int, BiDiDataItem> codepoints, CodepointRange range,
-            int biDiClass)
-        {
-            for (var i = range.Start; i <= range.End; i++)
-            {
-                if (!codepoints.ContainsKey(i))
-                {
-                    codepoints.Add(i, new BiDiDataItem { Codepoint = i, BiDiClass = biDiClass });
-                }
-                else
-                {
-                    codepoints[i].BiDiClass = biDiClass;
-                }
-            }
-        }
-
-        private static void AddBiDiBracket(Dictionary<int, BiDiDataItem> codepoints, CodepointRange range,
-            int bracketType)
-        {
-            if (!codepoints.ContainsKey(range.Start))
-            {
-                codepoints.Add(range.Start,
-                    new BiDiDataItem { Codepoint = range.Start, Bracket = range.End, BracketType = bracketType });
-            }
-            else
-            {
-                var codepoint = codepoints[range.Start];
-
-                codepoint.Bracket = range.End;
-                codepoint.BracketType = bracketType;
-            }
-        }
-
-        private static void AddLineBreakClassRange(Dictionary<int, UnicodeDataItem> codepoints, CodepointRange range,
-            int lineBreakClass)
-        {
-            for (var i = range.Start; i <= range.End; i++)
-            {
-                if (!codepoints.ContainsKey(i))
-                {
-                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, LineBreakClass = lineBreakClass });
-                }
-                else
-                {
-                    codepoints[i].LineBreakClass = lineBreakClass;
-                }
-            }
-        }
-
-        public static List<(CodepointRange, string)> ReadGeneralCategoryData()
-        {
-            return ReadUnicodeData("extracted/DerivedGeneralCategory.txt");
-        }
-
-        public static List<(CodepointRange, string)> ReadScriptData()
-        {
-            return ReadUnicodeData("Scripts.txt");
-        }
-
-        public static List<(CodepointRange, string)> ReadBiDiData()
-        {
-            return ReadUnicodeData("extracted/DerivedBidiClass.txt");
-        }
-
-        public static List<(CodepointRange, string)> ReadLineBreakClassData()
-        {
-            return ReadUnicodeData("extracted/DerivedLineBreak.txt");
-        }
-        
-        public static List<(CodepointRange, string)> ReadBiDiPairedBracketData()
-        {
-            const string file = "BidiBrackets.txt";
-        
-            var data = new List<(CodepointRange, string)>();
-            
-            var regex = new Regex(@"^([0-9A-F]+);\s([0-9A-F]+);\s([ocn])");
-
-            using (var client = new HttpClient())
-            {
-                var url = Path.Combine(Ucd, file);
-
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                    {
-                        return data;
-                    }
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-
-                            var match = regex.Match(line);
-
-                            if (!match.Success)
-                            {
-                                continue;
-                            }
-
-                            var start = Convert.ToInt32(match.Groups[1].Value, 16);
-
-                            var end = start;
-
-                            if (!string.IsNullOrEmpty(match.Groups[2].Value))
-                            {
-                                end = Convert.ToInt32(match.Groups[2].Value, 16);
-                            }
-
-                            data.Add((new CodepointRange(start, end), match.Groups[3].Value));
-                        }
-                    }
-                }
-            }
-
-            return data;
-        }
-
-        private static List<(CodepointRange, string)> ReadUnicodeData(string file)
-        {
-            var data = new List<(CodepointRange, string)>();
-
-            var regex = new Regex(@"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s+;\s+(\w+)\s+#.*", RegexOptions.Compiled);
-
-            using (var client = new HttpClient())
-            {
-                var url = Path.Combine(Ucd, file);
-
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                    {
-                        return data;
-                    }
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-
-                            var match = regex.Match(line);
-
-                            if (!match.Success)
-                            {
-                                continue;
-                            }
-
-                            var start = Convert.ToInt32(match.Groups[1].Value, 16);
-
-                            var end = start;
-
-                            if (!string.IsNullOrEmpty(match.Groups[2].Value))
-                            {
-                                end = Convert.ToInt32(match.Groups[2].Value, 16);
-                            }
-
-                            data.Add((new CodepointRange(start, end), match.Groups[3].Value));
-                        }
-                    }
-                }
-            }
-
-            return data;
-        }
-
-        internal class UnicodeDataItem
-        {
-            public int Codepoint { get; set; }
-
-            public int Script { get; set; }
-
-            public int GeneralCategory { get; set; }
-
-            public int BiDiClass { get; set; }
-
-            public int LineBreakClass { get; set; }
-        }
-        
-        internal class BiDiDataItem
-        {
-            public int Codepoint { get; set; }
-
-            public int Bracket { get; set; }
-
-            public int BracketType { get; set; }
-
-            public int BiDiClass { get; set; }
-        }
-        
-
-    }
-    
-    internal class UnicodeDataEntries
-    {
-        public IReadOnlyList<DataEntry> Scripts { get; set; }
-        public IReadOnlyList<DataEntry> GeneralCategories{ get; set; }
-        public IReadOnlyList<DataEntry> LineBreakClasses{ get; set; }
-    }
-    
-    internal class BiDiDataEntries
-    {
-        public IReadOnlyList<DataEntry> PairedBracketTypes { get; set; }
-        public IReadOnlyList<DataEntry> BiDiClasses{ get; set; }
-    }
-
-    internal readonly struct CodepointRange
-    {
-        public CodepointRange(int start, int end)
-        {
-            Start = start;
-            End = end;
-        }
-
-        public int Start { get; }
-        public int End { get; }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs
deleted file mode 100644
index f122876322..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.IO;
-using Avalonia.Media.TextFormatting.Unicode;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    public class UnicodeDataGeneratorTests
-    {
-        /// <summary>
-        ///     This test is used to generate all Unicode related types.
-        ///     We only need to run this when the Unicode spec changes.
-        /// </summary>
-        [Fact(Skip = "Only run when the Unicode spec changes.")]
-        public void Should_Generate_Data()
-        {
-            if (!Directory.Exists("Generated"))
-            {
-                Directory.CreateDirectory("Generated");
-            }
-
-            var unicodeDataTrie = UnicodeDataGenerator.GenerateUnicodeDataTrie(out var unicodeDataEntries, out var unicodeData);
-
-            foreach (var value in unicodeData.Values)
-            {
-                var data = unicodeDataTrie.Get(value.Codepoint);
-                
-                Assert.Equal(value.GeneralCategory, GetValue(data, 0, UnicodeData.CATEGORY_MASK));
-                
-                Assert.Equal(value.Script, GetValue(data, UnicodeData.SCRIPT_SHIFT, UnicodeData.SCRIPT_MASK));
-                
-                Assert.Equal(value.LineBreakClass, GetValue(data, UnicodeData.LINEBREAK_SHIFT, UnicodeData.LINEBREAK_MASK));
-            }
-            
-            var biDiTrie = UnicodeDataGenerator.GenerateBiDiTrie(out var biDiDataEntries, out var biDiData);
-
-            foreach (var value in biDiData.Values)
-            {
-                var data = biDiTrie.Get(value.Codepoint);
-                
-                Assert.Equal(value.Bracket, GetValue(data, 0, UnicodeData.BIDIPAIREDBRACKED_MASK));
-                
-                Assert.Equal(value.BracketType, GetValue(data, UnicodeData.BIDIPAIREDBRACKEDTYPE_SHIFT, UnicodeData.BIDIPAIREDBRACKEDTYPE_MASK));
-                
-                Assert.Equal(value.BiDiClass, GetValue(data, UnicodeData.BIDICLASS_SHIFT, UnicodeData.BIDICLASS_MASK));
-            }
-            
-            UnicodeEnumsGenerator.CreatePropertyValueAliasHelper(unicodeDataEntries, biDiDataEntries);
-        }
-
-        private static int GetValue(uint value, int shift, int mask)
-        {
-            return (int)((value >> shift) & mask);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
deleted file mode 100644
index e483728423..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
+++ /dev/null
@@ -1,474 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-
-namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
-{
-    internal static class UnicodeEnumsGenerator
-    {
-        public static List<DataEntry> CreateScriptEnum()
-        {
-            var entries = new List<DataEntry>
-            {
-                new DataEntry("Unknown", "Zzzz", string.Empty),
-                new DataEntry("Common", "Zyyy", string.Empty),
-                new DataEntry("Inherited", "Zinh", string.Empty)
-            };
-
-            ParseDataEntries("# Script (sc)", entries);
-
-            using (var stream = File.Create("Generated\\Script.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    public enum Script");
-                writer.WriteLine("    {");
-
-                foreach (var entry in entries)
-                {
-                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
-                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
-                }
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-
-            return entries;
-        }
-
-        public static List<DataEntry> CreateGeneralCategoryEnum()
-        {
-            var entries = new List<DataEntry> { new DataEntry("Other", "C", " Cc | Cf | Cn | Co | Cs") };
-
-            ParseDataEntries("# General_Category (gc)", entries);
-
-            using (var stream = File.Create("Generated\\GeneralCategory.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    public enum GeneralCategory");
-                writer.WriteLine("    {");
-
-                foreach (var entry in entries)
-                {
-                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
-                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
-                }
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-
-            return entries;
-        }
-
-        public static List<DataEntry> CreateGraphemeBreakTypeEnum()
-        {
-            var entries = new List<DataEntry> { new DataEntry("Other", "XX", string.Empty) };
-
-            ParseDataEntries("# Grapheme_Cluster_Break (GCB)", entries);
-
-            using (var stream = File.Create("Generated\\GraphemeBreakClass.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    public enum GraphemeBreakClass");
-                writer.WriteLine("    {");
-
-                foreach (var entry in entries)
-                {
-                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
-                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
-                }
-
-                writer.WriteLine("        ExtendedPictographic");
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-
-            return entries;
-        }
-
-        private static List<string> GenerateBreakPairTable()
-        {
-            var rows = new List<string[]>();
-
-            using (var stream =
-                typeof(UnicodeEnumsGenerator).Assembly.GetManifestResourceStream(
-                    "Avalonia.Visuals.UnitTests.Media.TextFormatting.BreakPairTable.txt"))
-            using (var reader = new StreamReader(stream))
-            {
-                while (!reader.EndOfStream)
-                {
-                    var line = reader.ReadLine();
-
-                    var columns = line.Split('\t');
-
-                    rows.Add(columns);
-                }
-            }
-
-            using (var stream = File.Create("Generated\\BreakPairTable.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    internal static class BreakPairTable");
-                writer.WriteLine("    {");
-
-                writer.WriteLine("        private static readonly byte[][] s_breakPairTable = ");
-                writer.WriteLine("            {");
-
-                for (var i = 1; i < rows.Count; i++)
-                {
-                    writer.Write("             new byte[] {");
-
-                    writer.Write($"{GetBreakPairType(rows[i][1])}");
-
-                    for (var index = 2; index < rows[i].Length; index++)
-                    {
-                        var column = rows[i][index];
-
-                        writer.Write($",{GetBreakPairType(column)}");
-                    }
-
-                    writer.Write("},");
-                    writer.Write(Environment.NewLine);
-                }
-                writer.WriteLine("        };");
-
-                writer.WriteLine();
-
-                writer.WriteLine("        public static PairBreakType Map(LineBreakClass first, LineBreakClass second)");
-                writer.WriteLine("        {");
-                writer.WriteLine("            return (PairBreakType)s_breakPairTable[(int)first][(int)second];");
-                writer.WriteLine("        }");
-
-                writer.WriteLine("    }");
-
-                writer.WriteLine();
-
-                writer.WriteLine("    internal enum PairBreakType : byte");
-                writer.WriteLine("    {");
-                writer.WriteLine("        DI = 0, // Direct break opportunity");
-                writer.WriteLine("        IN = 1, // Indirect break opportunity");
-                writer.WriteLine("        CI = 2, // Indirect break opportunity for combining marks");
-                writer.WriteLine("        CP = 3, // Prohibited break for combining marks");
-                writer.WriteLine("        PR = 4 // Prohibited break");
-                writer.WriteLine("    }");
-
-
-                writer.WriteLine("}");
-            }
-
-            return rows[0].Where(x => !string.IsNullOrEmpty(x)).ToList();
-        }
-
-        public const byte DI_BRK = 0; // Direct break opportunity
-        public const byte IN_BRK = 1; // Indirect break opportunity
-        public const byte CI_BRK = 2; // Indirect break opportunity for combining marks
-        public const byte CP_BRK = 3; // Prohibited break for combining marks
-        public const byte PR_BRK = 4; // Prohibited break
-
-        private static byte GetBreakPairType(string type)
-        {
-            switch (type)
-            {
-                case "_":
-                    return DI_BRK;
-                case "%":
-                    return IN_BRK;
-                case "#":
-                    return CI_BRK;
-                case "@":
-                    return CP_BRK;
-                case "^":
-                    return PR_BRK;
-                default:
-                    return byte.MaxValue;
-            }
-        }
-
-        public static List<DataEntry> CreateLineBreakClassEnum()
-        {
-            var usedLineBreakClasses = GenerateBreakPairTable();
-
-            var entries = new List<DataEntry> { new DataEntry("Unknown", "XX", string.Empty) };
-
-            ParseDataEntries("# Line_Break (lb)", entries);
-
-            var orderedLineBreakEntries = new Dictionary<string, DataEntry>();
-
-            foreach (var tag in usedLineBreakClasses)
-            {
-                var entry = entries.Single(x => x.Tag == tag);
-
-                orderedLineBreakEntries.Add(tag, entry);
-            }
-
-            foreach (var entry in entries)
-            {
-                if (orderedLineBreakEntries.ContainsKey(entry.Tag))
-                {
-                    continue;
-                }
-
-                orderedLineBreakEntries.Add(entry.Tag, entry);
-            }
-
-            using (var stream = File.Create("Generated\\LineBreakClass.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    public enum LineBreakClass");
-                writer.WriteLine("    {");
-
-                foreach (var entry in orderedLineBreakEntries.Values)
-                {
-                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
-                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
-                }
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-
-            return orderedLineBreakEntries.Values.ToList();
-        }
-
-        public static List<DataEntry> CreateBiDiClassEnum()
-        {
-            var entries = new List<DataEntry> { new DataEntry("Left_To_Right", "L", string.Empty) };
-
-            ParseDataEntries("# Bidi_Class (bc)", entries);
-
-            using (var stream = File.Create("Generated\\BiDiClass.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    public enum BiDiClass");
-                writer.WriteLine("    {");
-
-                foreach (var entry in entries)
-                {
-                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
-                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
-                }
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-
-            return entries;
-        }
-        
-        public static List<DataEntry> CreateBiDiPairedBracketTypeEnum()
-        {
-            var entries = new List<DataEntry> { new DataEntry("None", "n", string.Empty) };
-
-            ParseDataEntries("# Bidi_Paired_Bracket_Type (bpt)", entries);
-
-            using (var stream = File.Create("Generated\\BiDiPairedBracketType.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    public enum BiDiPairedBracketType");
-                writer.WriteLine("    {");
-
-                foreach (var entry in entries)
-                {
-                    writer.WriteLine("        " + entry.Name.Replace("_", "") + ", //" + entry.Tag +
-                                     (string.IsNullOrEmpty(entry.Comment) ? string.Empty : "#" + entry.Comment));
-                }
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-
-            return entries;
-        }
-
-        public static void CreatePropertyValueAliasHelper(UnicodeDataEntries unicodeDataEntries, 
-            BiDiDataEntries biDiDataEntries)
-        {
-            using (var stream = File.Create("Generated\\PropertyValueAliasHelper.cs"))
-            using (var writer = new StreamWriter(stream))
-            {
-                writer.WriteLine("using System.Collections.Generic;");
-                writer.WriteLine();
-
-                writer.WriteLine("namespace Avalonia.Media.TextFormatting.Unicode");
-                writer.WriteLine("{");
-                writer.WriteLine("    internal static class PropertyValueAliasHelper");
-                writer.WriteLine("    {");
-
-                WritePropertyValueAliasGetTag(writer, unicodeDataEntries.Scripts, "Script", "Zzzz");
-
-                WritePropertyValueAlias(writer, unicodeDataEntries.Scripts, "Script", "Unknown");
-
-                WritePropertyValueAlias(writer, unicodeDataEntries.GeneralCategories, "GeneralCategory", "Other");
-                
-                WritePropertyValueAlias(writer, unicodeDataEntries.LineBreakClasses, "LineBreakClass", "Unknown");
-
-                WritePropertyValueAlias(writer, biDiDataEntries.PairedBracketTypes, "BiDiPairedBracketType", "None");
-                
-                WritePropertyValueAlias(writer, biDiDataEntries.BiDiClasses, "BiDiClass", "LeftToRight");
-
-                writer.WriteLine("    }");
-                writer.WriteLine("}");
-            }
-        }
-
-        public static void ParseDataEntries(string property, List<DataEntry> entries)
-        {
-            using (var client = new HttpClient())
-            {
-                var url = Path.Combine(UnicodeDataGenerator.Ucd, "PropertyValueAliases.txt");
-
-                using (var result = client.GetAsync(url).GetAwaiter().GetResult())
-                {
-                    if (!result.IsSuccessStatusCode)
-                    {
-                        return;
-                    }
-
-                    using (var stream = result.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
-                    using (var reader = new StreamReader(stream))
-                    {
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (string.IsNullOrEmpty(line))
-                            {
-                                continue;
-                            }
-
-                            if (line != property)
-                            {
-                                continue;
-                            }
-
-                            reader.ReadLine();
-
-                            break;
-                        }
-
-                        while (!reader.EndOfStream)
-                        {
-                            var line = reader.ReadLine();
-
-                            if (string.IsNullOrEmpty(line) || line.StartsWith("#"))
-                            {
-                                break;
-                            }
-
-                            var elements = line.Split(';');
-
-                            var tag = elements[1].Trim();
-
-                            elements = elements[2].Split('#');
-
-                            var name = elements[0].Trim();
-
-                            if (entries.Any(x => x.Name == name))
-                            {
-                                continue;
-                            }
-
-                            var comment = string.Empty;
-
-                            if (elements.Length > 1)
-                            {
-                                comment = elements[1];
-                            }
-
-                            var entry = new DataEntry(name, tag, comment);
-
-                            entries.Add(entry);
-                        }
-                    }
-                }
-            }
-        }
-
-        private static void WritePropertyValueAliasGetTag(TextWriter writer, IEnumerable<DataEntry> entries,
-            string typeName, string defaultValue)
-        {
-            writer.WriteLine(
-                $"        private static readonly Dictionary<{typeName}, string> s_{typeName.ToLower()}ToTag = ");
-            writer.WriteLine($"            new Dictionary<{typeName}, string>{{");
-
-            foreach (var entry in entries)
-            {
-                writer.WriteLine($"                {{ {typeName}.{entry.Name.Replace("_", "")}, \"{entry.Tag}\"}},");
-            }
-
-            writer.WriteLine("        };");
-
-            writer.WriteLine();
-
-            writer.WriteLine($"        public static string GetTag({typeName} {typeName.ToLower()})");
-            writer.WriteLine("        {");
-            writer.WriteLine($"            if(!s_{typeName.ToLower()}ToTag.ContainsKey({typeName.ToLower()}))");
-            writer.WriteLine("            {");
-            writer.WriteLine($"                return \"{defaultValue}\";");
-            writer.WriteLine("            }");
-            writer.WriteLine($"            return s_{typeName.ToLower()}ToTag[{typeName.ToLower()}];");
-            writer.WriteLine("        }");
-
-            writer.WriteLine();
-        }
-
-        private static void WritePropertyValueAlias(TextWriter writer, IEnumerable<DataEntry> entries, string typeName,
-            string defaultValue)
-        {
-            writer.WriteLine($"        private static readonly Dictionary<string, {typeName}> s_tagTo{typeName} = ");
-            writer.WriteLine($"            new Dictionary<string,{typeName}>{{");
-
-            foreach (var entry in entries)
-            {
-                writer.WriteLine($"                {{ \"{entry.Tag}\", {typeName}.{entry.Name.Replace("_", "")}}},");
-            }
-
-            writer.WriteLine("        };");
-
-            writer.WriteLine();
-
-            writer.WriteLine($"        public static {typeName} Get{typeName}(string tag)");
-            writer.WriteLine("        {");
-            writer.WriteLine($"            if(!s_tagTo{typeName}.ContainsKey(tag))");
-            writer.WriteLine("            {");
-            writer.WriteLine($"                return {typeName}.{defaultValue};");
-            writer.WriteLine("            }");
-            writer.WriteLine($"            return s_tagTo{typeName}[tag];");
-            writer.WriteLine("        }");
-
-            writer.WriteLine();
-        }
-    }
-
-    public readonly struct DataEntry
-    {
-        public DataEntry(string name, string tag, string comment)
-        {
-            Name = name;
-            Tag = tag;
-            Comment = comment;
-        }
-
-        public string Name { get; }
-        public string Tag { get; }
-        public string Comment { get; }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TransformOperationsTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TransformOperationsTests.cs
deleted file mode 100644
index e4f88706d8..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TransformOperationsTests.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-using Avalonia.Media.Transformation;
-using Avalonia.Utilities;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class TransformOperationsTests
-    {
-        [Theory]
-        [InlineData("translate(10px)", 10d, 0d)]
-        [InlineData("translate(10px, 10px)", 10d, 10d)]
-        [InlineData("translate(0px, 10px)", 0d, 10d)]
-        [InlineData("translate(10px, 0px)", 10d, 0d)]
-        [InlineData("translateX(10px)", 10d, 0d)]
-        [InlineData("translateY(10px)", 0d, 10d)]
-        public void Can_Parse_Translation(string data, double x, double y)
-        {
-            var transform = TransformOperations.Parse(data);
-
-            var operations = transform.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Translate, operations[0].Type);
-            Assert.Equal(x, operations[0].Data.Translate.X);
-            Assert.Equal(y, operations[0].Data.Translate.Y);
-        }
-
-        [Theory]
-        [InlineData("rotate(90deg)", 90d)]
-        [InlineData("rotate(0.5turn)", 180d)]
-        [InlineData("rotate(200grad)", 180d)]
-        [InlineData("rotate(3.14159265rad)", 180d)]
-        public void Can_Parse_Rotation(string data, double angleDeg)
-        {
-            var transform = TransformOperations.Parse(data);
-
-            var operations = transform.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Rotate, operations[0].Type);
-            Assert.Equal(MathUtilities.Deg2Rad(angleDeg), operations[0].Data.Rotate.Angle, 4);
-        }
-
-        [Theory]
-        [InlineData("scale(10)", 10d, 10d)]
-        [InlineData("scale(10, 10)", 10d, 10d)]
-        [InlineData("scale(0, 10)", 0d, 10d)]
-        [InlineData("scale(10, 0)", 10d, 0d)]
-        [InlineData("scaleX(10)", 10d, 1d)]
-        [InlineData("scaleY(10)", 1d, 10d)]
-        public void Can_Parse_Scale(string data, double x, double y)
-        {
-            var transform = TransformOperations.Parse(data);
-
-            var operations = transform.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Scale, operations[0].Type);
-            Assert.Equal(x, operations[0].Data.Scale.X);
-            Assert.Equal(y, operations[0].Data.Scale.Y);
-        }
-
-        [Theory]
-        [InlineData("skew(90deg)", 90d, 0d)]
-        [InlineData("skew(0.5turn)", 180d, 0d)]
-        [InlineData("skew(200grad)", 180d, 0d)]
-        [InlineData("skew(3.14159265rad)", 180d, 0d)]
-        [InlineData("skewX(90deg)", 90d, 0d)]
-        [InlineData("skewX(0.5turn)", 180d, 0d)]
-        [InlineData("skewX(200grad)", 180d, 0d)]
-        [InlineData("skewX(3.14159265rad)", 180d, 0d)]
-        [InlineData("skew(0, 90deg)", 0d, 90d)]
-        [InlineData("skew(0, 0.5turn)", 0d, 180d)]
-        [InlineData("skew(0, 200grad)", 0d, 180d)]
-        [InlineData("skew(0, 3.14159265rad)", 0d, 180d)]
-        [InlineData("skewY(90deg)", 0d, 90d)]
-        [InlineData("skewY(0.5turn)", 0d, 180d)]
-        [InlineData("skewY(200grad)", 0d, 180d)]
-        [InlineData("skewY(3.14159265rad)", 0d, 180d)]
-        [InlineData("skew(90deg, 90deg)", 90d, 90d)]
-        [InlineData("skew(0.5turn, 0.5turn)", 180d, 180d)]
-        [InlineData("skew(200grad, 200grad)", 180d, 180d)]
-        [InlineData("skew(3.14159265rad, 3.14159265rad)", 180d, 180d)]
-        public void Can_Parse_Skew(string data, double x, double y)
-        {
-            var transform = TransformOperations.Parse(data);
-
-            var operations = transform.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Skew, operations[0].Type);
-            Assert.Equal(MathUtilities.Deg2Rad(x), operations[0].Data.Skew.X, 4);
-            Assert.Equal(MathUtilities.Deg2Rad(y), operations[0].Data.Skew.Y, 4);
-        }
-
-        [Fact]
-        public void Can_Parse_Compound_Operations()
-        {
-            var data = "scale(1,2) translate(3px,4px) rotate(5deg) skew(6deg,7deg)";
-
-            var transform = TransformOperations.Parse(data);
-
-            var operations = transform.Operations;
-
-            Assert.Equal(TransformOperation.OperationType.Scale, operations[0].Type);
-            Assert.Equal(1, operations[0].Data.Scale.X);
-            Assert.Equal(2, operations[0].Data.Scale.Y);
-
-            Assert.Equal(TransformOperation.OperationType.Translate, operations[1].Type);
-            Assert.Equal(3, operations[1].Data.Translate.X);
-            Assert.Equal(4, operations[1].Data.Translate.Y);
-
-            Assert.Equal(TransformOperation.OperationType.Rotate, operations[2].Type);
-            Assert.Equal(MathUtilities.Deg2Rad(5), operations[2].Data.Rotate.Angle);
-
-            Assert.Equal(TransformOperation.OperationType.Skew, operations[3].Type);
-            Assert.Equal(MathUtilities.Deg2Rad(6), operations[3].Data.Skew.X);
-            Assert.Equal(MathUtilities.Deg2Rad(7), operations[3].Data.Skew.Y);
-        }
-
-        [Fact]
-        public void Can_Parse_Matrix_Operation()
-        {
-            var data = "matrix(1,2,3,4,5,6)";
-
-            var transform = TransformOperations.Parse(data);
-
-            var operations = transform.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Matrix, operations[0].Type);
-
-            var expectedMatrix = new Matrix(1, 2, 3, 4, 5, 6);
-
-            Assert.Equal(expectedMatrix, operations[0].Matrix);
-        }
-
-        [Theory]
-        [InlineData(0d, 10d, 0d)]
-        [InlineData(0.5d, 5d, 10d)]
-        [InlineData(1d, 0d, 20d)]
-        public void Can_Interpolate_Translation(double progress, double x, double y)
-        {
-            var from = TransformOperations.Parse("translateX(10px)");
-            var to = TransformOperations.Parse("translateY(20px)");
-
-            var interpolated = TransformOperations.Interpolate(from, to, progress);
-
-            var operations = interpolated.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Translate, operations[0].Type);
-            Assert.Equal(x, operations[0].Data.Translate.X);
-            Assert.Equal(y, operations[0].Data.Translate.Y);
-        }
-
-        [Theory]
-        [InlineData(0d, 10d, 1d)]
-        [InlineData(0.5d, 5.5d, 10.5d)]
-        [InlineData(1d, 1d, 20d)]
-        public void Can_Interpolate_Scale(double progress, double x, double y)
-        {
-            var from = TransformOperations.Parse("scaleX(10)");
-            var to = TransformOperations.Parse("scaleY(20)");
-
-            var interpolated = TransformOperations.Interpolate(from, to, progress);
-
-            var operations = interpolated.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Scale, operations[0].Type);
-            Assert.Equal(x, operations[0].Data.Scale.X);
-            Assert.Equal(y, operations[0].Data.Scale.Y);
-        }
-
-        [Theory]
-        [InlineData(0d, 10d, 0d)]
-        [InlineData(0.5d, 5d, 10d)]
-        [InlineData(1d, 0d, 20d)]
-        public void Can_Interpolate_Skew(double progress, double x, double y)
-        {
-            var from = TransformOperations.Parse("skewX(10deg)");
-            var to = TransformOperations.Parse("skewY(20deg)");
-
-            var interpolated = TransformOperations.Interpolate(from, to, progress);
-
-            var operations = interpolated.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Skew, operations[0].Type);
-            Assert.Equal(MathUtilities.Deg2Rad(x), operations[0].Data.Skew.X);
-            Assert.Equal(MathUtilities.Deg2Rad(y), operations[0].Data.Skew.Y);
-        }
-
-        [Theory]
-        [InlineData(0d, 10d)]
-        [InlineData(0.5d, 15d)]
-        [InlineData(1d, 20d)]
-        public void Can_Interpolate_Rotation(double progress, double angle)
-        {
-            var from = TransformOperations.Parse("rotate(10deg)");
-            var to = TransformOperations.Parse("rotate(20deg)");
-
-            var interpolated = TransformOperations.Interpolate(from, to, progress);
-
-            var operations = interpolated.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Rotate, operations[0].Type);
-            Assert.Equal(MathUtilities.Deg2Rad(angle), operations[0].Data.Rotate.Angle);
-        }
-
-        [Fact]
-        public void Interpolation_Fallback_To_Matrix()
-        {
-            double progress = 0.5d;
-
-            var from = TransformOperations.Parse("rotate(45deg)");
-            var to = TransformOperations.Parse("translate(100px, 100px) rotate(1215deg)");
-
-            var interpolated = TransformOperations.Interpolate(from, to, progress);
-
-            var operations = interpolated.Operations;
-
-            Assert.Single(operations);
-            Assert.Equal(TransformOperation.OperationType.Matrix, operations[0].Type);
-        }
-
-        [Fact]
-        public void Order_Of_Operations_Is_Preserved_No_Prefix()
-        {
-            var from = TransformOperations.Parse("scale(1)");
-            var to = TransformOperations.Parse("translate(50px,50px) scale(0.5,0.5)");
-
-            var interpolated_0 = TransformOperations.Interpolate(from, to, 0);
-
-            Assert.True(interpolated_0.IsIdentity);
-
-            var interpolated_50 = TransformOperations.Interpolate(from, to, 0.5);
-
-            AssertMatrix(interpolated_50.Value, scaleX: 0.75, scaleY: 0.75, translateX: 12.5, translateY: 12.5);
-
-            var interpolated_100 = TransformOperations.Interpolate(from, to, 1);
-
-            AssertMatrix(interpolated_100.Value, scaleX: 0.5, scaleY: 0.5, translateX: 25, translateY: 25);
-        }
-
-        [Fact]
-        public void Order_Of_Operations_Is_Preserved_One_Prefix()
-        {
-            var from = TransformOperations.Parse("scale(1)");
-            var to = TransformOperations.Parse("scale(0.5,0.5) translate(50px,50px)");
-
-            var interpolated_0 = TransformOperations.Interpolate(from, to, 0);
-
-            Assert.True(interpolated_0.IsIdentity);
-
-            var interpolated_50 = TransformOperations.Interpolate(from, to, 0.5);
-
-            AssertMatrix(interpolated_50.Value, scaleX: 0.75, scaleY: 0.75, translateX: 25.0, translateY: 25);
-
-            var interpolated_100 = TransformOperations.Interpolate(from, to, 1);
-
-            AssertMatrix(interpolated_100.Value, scaleX: 0.5, scaleY: 0.5, translateX: 50, translateY: 50);
-        }
-
-        private static void AssertMatrix(Matrix matrix, double? angle = null, double? scaleX = null, double? scaleY = null, double? translateX = null, double? translateY = null)
-        {
-            Assert.True(Matrix.TryDecomposeTransform(matrix, out var composed));
-
-            if (angle.HasValue)
-            {
-                Assert.Equal(angle.Value, composed.Angle);
-            }
-
-            if (scaleX.HasValue)
-            {
-                Assert.Equal(scaleX.Value, composed.Scale.X);
-            }
-
-            if (scaleY.HasValue)
-            {
-                Assert.Equal(scaleY.Value, composed.Scale.Y);
-            }
-
-            if (translateX.HasValue)
-            {
-                Assert.Equal(translateX.Value, composed.Translate.X);
-            }
-
-            if (translateY.HasValue)
-            {
-                Assert.Equal(translateY.Value, composed.Translate.Y);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TypefaceTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TypefaceTests.cs
deleted file mode 100644
index e526172622..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Media/TypefaceTests.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using Avalonia.Media;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Media
-{
-    public class TypefaceTests
-    {
-        [Fact]
-        public void Exception_Should_Be_Thrown_If_FontWeight_LessThanEqualTo_Zero()
-        {
-            Assert.Throws<ArgumentException>(() => new Typeface("foo", (FontStyle)12, 0));
-        }
-
-        [Fact]
-        public void Should_Be_Equal()
-        {
-            Assert.Equal(new Typeface("Font A"), new Typeface("Font A"));
-        }
-
-        [Fact]
-        public void Should_Have_Equal_Hash()
-        {
-            Assert.Equal(new Typeface("Font A").GetHashCode(), new Typeface("Font A").GetHashCode());
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2251cc6e92..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using Xunit;
-
-[assembly: AssemblyTitle("Avalonia.Visuals.UnitTests")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.Visuals.UnitTests/RectTests.cs b/tests/Avalonia.Visuals.UnitTests/RectTests.cs
deleted file mode 100644
index a2b0569949..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/RectTests.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class RectTests
-    {
-        [Fact]
-        public void Union_Should_Return_Correct_Value_For_Intersecting_Rects()
-        {
-            var result = new Rect(0, 0, 100, 100).Union(new Rect(50, 50, 100, 100));
-
-            Assert.Equal(new Rect(0, 0, 150, 150), result);
-        }
-
-        [Fact]
-        public void Union_Should_Return_Correct_Value_For_NonIntersecting_Rects()
-        {
-            var result = new Rect(0, 0, 100, 100).Union(new Rect(150, 150, 100, 100));
-
-            Assert.Equal(new Rect(0, 0, 250, 250), result);
-        }
-
-        [Fact]
-        public void Union_Should_Ignore_Empty_This_rect()
-        {
-            var result = new Rect(0, 0, 0, 0).Union(new Rect(150, 150, 100, 100));
-
-            Assert.Equal(new Rect(150, 150, 100, 100), result);
-        }
-
-        [Fact]
-        public void Union_Should_Ignore_Empty_Other_rect()
-        {
-            var result = new Rect(0, 0, 100, 100).Union(new Rect(150, 150, 0, 0));
-
-            Assert.Equal(new Rect(0, 0, 100, 100), result);
-        }
-
-        [Fact]
-        public void Normalize_Should_Reverse_Negative_Size()
-        {
-            var result = new Rect(new Point(100, 100), new Point(0, 0)).Normalize();
-
-            Assert.Equal(new Rect(0, 0, 100, 100), result);
-        }
-
-        [Fact]
-        public void Normalize_Should_Make_Invalid_Rects_Empty()
-        {
-            var result = new Rect(
-                double.NegativeInfinity, double.PositiveInfinity, 
-                double.PositiveInfinity, double.PositiveInfinity)
-                .Normalize();
-
-            Assert.Equal(Rect.Empty, result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/RelativePointTests.cs b/tests/Avalonia.Visuals.UnitTests/RelativePointTests.cs
deleted file mode 100644
index c871b8ee87..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/RelativePointTests.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Globalization;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class RelativePointTests
-    {
-        [Fact]
-        public void Parse_Should_Accept_Absolute_Value()
-        {
-            var result = RelativePoint.Parse("4,5");
-
-            Assert.Equal(new RelativePoint(4, 5, RelativeUnit.Absolute), result);
-        }
-
-        [Fact]
-        public void Parse_Should_Accept_Relative_Value()
-        {
-            var result = RelativePoint.Parse("25%, 50%");
-
-            Assert.Equal(new RelativePoint(0.25, 0.5, RelativeUnit.Relative), result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs b/tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs
deleted file mode 100644
index bf3bf39367..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class RelativeRectComparer : IEqualityComparer<RelativeRect>
-    {
-        public bool Equals(RelativeRect a, RelativeRect b)
-        {
-            return a.Unit == b.Unit &&
-                   Math.Round(a.Rect.X, 3) == Math.Round(b.Rect.X, 3) &&
-                   Math.Round(a.Rect.Y, 3) == Math.Round(b.Rect.Y, 3) &&
-                   Math.Round(a.Rect.Width, 3) == Math.Round(b.Rect.Width, 3) &&
-                   Math.Round(a.Rect.Height, 3) == Math.Round(b.Rect.Height, 3);
-        }
-
-        public int GetHashCode(RelativeRect obj)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs b/tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs
deleted file mode 100644
index 9753e0779a..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Globalization;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class RelativeRectTests
-    {
-        private static readonly RelativeRectComparer Compare = new RelativeRectComparer();
-        
-        [Fact]
-        public void Parse_Should_Accept_Absolute_Value()
-        {
-            var result = RelativeRect.Parse("4,5,50,60");
-
-            Assert.Equal(new RelativeRect(4, 5, 50, 60, RelativeUnit.Absolute), result, Compare);
-        }
-
-        [Fact]
-        public void Parse_Should_Accept_Relative_Value()
-        {
-            var result = RelativeRect.Parse("10%, 20%, 40%, 70%");
-
-            Assert.Equal(new RelativeRect(0.1, 0.2, 0.4, 0.7, RelativeUnit.Relative), result, Compare);
-        }
-
-        [Fact]
-        public void Parse_Should_Throw_Mixed_Values()
-        {
-            Assert.Throws<FormatException>(() =>
-                RelativeRect.Parse("10%, 20%, 40, 70%"));
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs b/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
deleted file mode 100644
index ba632b791a..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-using Moq;
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Rendering;
-using Xunit;
-using Avalonia.Platform;
-using Avalonia.UnitTests;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class RenderTests_Culling
-    {
-        [Fact]
-        public void In_Bounds_Control_Should_Be_Rendered()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                TestControl target;
-
-                var container = new Canvas
-                {
-                    Width = 100,
-                    Height = 100,
-                    ClipToBounds = true,
-                    Children =
-                    {
-                        (target = new TestControl
-                        {
-                            Width = 10, Height = 10, [Canvas.LeftProperty] = 98, [Canvas.TopProperty] = 98,
-                        })
-                    }
-                };
-
-                Render(container);
-
-                Assert.True(target.Rendered);
-            }
-        }
-
-        [Fact]
-        public void Out_Of_Bounds_Control_Should_Not_Be_Rendered()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                TestControl target;
-
-                var container = new Canvas
-                {
-                    Width = 100,
-                    Height = 100,
-                    ClipToBounds = true,
-                    Children =
-                    {
-                        (target = new TestControl
-                        {
-                            Width = 10,
-                            Height = 10,
-                            ClipToBounds = true,
-                            [Canvas.LeftProperty] = 110,
-                            [Canvas.TopProperty] = 110,
-                        })
-                    }
-                };
-
-                Render(container);
-
-                Assert.False(target.Rendered);
-            }
-        }
-
-        [Fact]
-        public void Out_Of_Bounds_Child_Control_Should_Not_Be_Rendered()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                TestControl target;
-
-                var container = new Canvas
-                {
-                    Width = 100,
-                    Height = 100,
-                    ClipToBounds = true,
-                    Children =
-                    {
-                        new Canvas
-                        {
-                            Width = 100,
-                            Height = 100,
-                            [Canvas.LeftProperty] = 50,
-                            [Canvas.TopProperty] = 50,
-                            Children =
-                            {
-                                (target = new TestControl
-                                {
-                                    Width = 10,
-                                    Height = 10,
-                                    ClipToBounds = true,
-                                    [Canvas.LeftProperty] = 50,
-                                    [Canvas.TopProperty] = 50,
-                                })
-                            }
-                        }
-                    }
-                };
-
-                Render(container);
-
-                Assert.False(target.Rendered);
-            }
-        }
-
-        [Fact]
-        public void RenderTransform_Should_Be_Respected()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                TestControl target;
-
-                var container = new Canvas
-                {
-                    Width = 100,
-                    Height = 100,
-                    ClipToBounds = true,
-                    Children =
-                    {
-                        (target = new TestControl
-                        {
-                            Width = 10,
-                            Height = 10,
-                            [Canvas.LeftProperty] = 110,
-                            [Canvas.TopProperty] = 110,
-                            RenderTransform = new TranslateTransform(-100, -100),
-                        })
-                    }
-                };
-
-                Render(container);
-
-                Assert.True(target.Rendered);
-            }
-        }
-
-        [Fact]
-        public void Negative_Margin_Should_Be_Respected()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                TestControl target;
-
-                var container = new Canvas
-                {
-                    Width = 100,
-                    Height = 100,
-                    ClipToBounds = true,
-                    Children =
-                    {
-                        new Border
-                        {
-                            Margin = new Thickness(100, 100, 0, 0),
-                            Child = target = new TestControl
-                            {
-                                Width = 10, Height = 10, Margin = new Thickness(-100, -100, 0, 0),
-                            }
-                        }
-                    }
-                };
-
-                Render(container);
-
-                Assert.True(target.Rendered);
-            }
-        }
-
-        private void Render(IControl control)
-        {
-            var ctx = CreateDrawingContext();
-            control.Measure(Size.Infinity);
-            control.Arrange(new Rect(control.DesiredSize));
-            ImmediateRenderer.Render(control, ctx);
-        }
-
-        private DrawingContext CreateDrawingContext()
-        {
-            return new DrawingContext(Mock.Of<IDrawingContextImpl>());
-        }
-
-        private class TestControl : Control
-        {
-            public bool Rendered { get; private set; }
-
-            public override void Render(DrawingContext context)
-            {
-                Rendered = true;
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/CustomHitTestBorder.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/CustomHitTestBorder.cs
deleted file mode 100644
index 3221f097ad..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/CustomHitTestBorder.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Rendering;
-
-namespace Avalonia.Visuals.UnitTests.Rendering
-{
-    internal class CustomHitTestBorder : Border, ICustomHitTest
-    {
-        public bool HitTest(Point point)
-        {
-            // Move hit testing window halfway to the left
-            return Bounds
-                .WithX(Bounds.X - Bounds.Width / 2)  
-                .Contains(point);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
deleted file mode 100644
index e58eea42d8..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ /dev/null
@@ -1,782 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Subjects;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Data;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Threading;
-using Avalonia.UnitTests;
-using Avalonia.Visuals.Media.Imaging;
-using Avalonia.VisualTree;
-
-using Moq;
-
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering
-{
-    public class DeferredRendererTests
-    {
-        [Fact]
-        public void First_Frame_Calls_SceneBuilder_UpdateAll()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var root = new TestRoot();
-                var sceneBuilder = MockSceneBuilder(root);
-
-                CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
-
-                sceneBuilder.Verify(x => x.UpdateAll(It.IsAny<Scene>()));
-            }
-        }
-
-        [Fact]
-        public void Frame_Does_Not_Call_SceneBuilder_If_No_Dirty_Controls()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-                var root = new TestRoot();
-                var sceneBuilder = MockSceneBuilder(root);
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder.Object);
-
-                target.Start();
-                IgnoreFirstFrame(target, sceneBuilder);
-                RunFrame(target);
-
-                sceneBuilder.Verify(x => x.UpdateAll(It.IsAny<Scene>()), Times.Never);
-                sceneBuilder.Verify(x => x.Update(It.IsAny<Scene>(), It.IsAny<Visual>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_Dirty_Controls_In_Order()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                Border border;
-                Decorator decorator;
-                Canvas canvas;
-
-                var root = new TestRoot
-                {
-                    Child = decorator = new Decorator
-                    {
-                        Child = border = new Border { Child = canvas = new Canvas() }
-                    }
-                };
-
-                var sceneBuilder = MockSceneBuilder(root);
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder.Object,
-                    dispatcher: dispatcher);
-
-                target.Start();
-                IgnoreFirstFrame(target, sceneBuilder);
-                target.AddDirty(border);
-                target.AddDirty(canvas);
-                target.AddDirty(root);
-                target.AddDirty(decorator);
-
-                var result = new List<IVisual>();
-
-                sceneBuilder.Setup(x => x.Update(It.IsAny<Scene>(), It.IsAny<IVisual>()))
-                    .Callback<Scene, IVisual>((_, v) => result.Add(v));
-
-                RunFrame(target);
-
-                Assert.Equal(new List<IVisual> { root, decorator, border, canvas }, result);
-            }
-        }
-
-        [Fact]
-        public void Should_Add_Dirty_Rect_On_Child_Remove()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                Decorator decorator;
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = decorator = new Decorator
-                    {
-                        Child = border = new Border { Width = 50, Height = 50, Background = Brushes.Red, },
-                    }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                target.Start();
-                RunFrame(target);
-
-                decorator.Child = null;
-
-                RunFrame(target);
-
-                var scene = target.UnitTestScene();
-                var stackNode = scene.FindNode(decorator);
-                var dirty = scene.Layers[0].Dirty.ToList();
-
-                Assert.Equal(1, dirty.Count);
-                Assert.Equal(new Rect(25, 25, 50, 50), dirty[0]);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_VisualNode_Order_On_Child_Remove_Insert()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                StackPanel stack;
-                Canvas canvas1;
-                Canvas canvas2;
-
-                var root = new TestRoot
-                {
-                    Child = stack = new StackPanel
-                    {
-                        Children = { (canvas1 = new Canvas()), (canvas2 = new Canvas()), }
-                    }
-                };
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                target.Start();
-                RunFrame(target);
-
-                stack.Children.Remove(canvas2);
-                stack.Children.Insert(0, canvas2);
-
-                RunFrame(target);
-
-                var scene = target.UnitTestScene();
-                var stackNode = scene.FindNode(stack);
-
-                Assert.Same(stackNode.Children[0].Visual, canvas2);
-                Assert.Same(stackNode.Children[1].Visual, canvas1);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_VisualNode_Order_On_Child_Move()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                StackPanel stack;
-                Canvas canvas1;
-                Canvas canvas2;
-
-                var root = new TestRoot
-                {
-                    Child = stack = new StackPanel
-                    {
-                        Children = { (canvas1 = new Canvas()), (canvas2 = new Canvas()), }
-                    }
-                };
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                target.Start();
-                RunFrame(target);
-
-                stack.Children.Move(1, 0);
-
-                RunFrame(target);
-
-                var scene = target.UnitTestScene();
-                var stackNode = scene.FindNode(stack);
-
-                Assert.Same(stackNode.Children[0].Visual, canvas2);
-                Assert.Same(stackNode.Children[1].Visual, canvas1);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_VisualNode_Order_On_ZIndex_Change()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                StackPanel stack;
-                Canvas canvas1;
-                Canvas canvas2;
-
-                var root = new TestRoot
-                {
-                    Child = stack = new StackPanel
-                    {
-                        Children =
-                        {
-                            (canvas1 = new Canvas { ZIndex = 1 }), (canvas2 = new Canvas { ZIndex = 2 }),
-                        }
-                    }
-                };
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                target.Start();
-                RunFrame(target);
-
-                canvas1.ZIndex = 3;
-
-                RunFrame(target);
-
-                var scene = target.UnitTestScene();
-                var stackNode = scene.FindNode(stack);
-
-                Assert.Same(stackNode.Children[0].Visual, canvas2);
-                Assert.Same(stackNode.Children[1].Visual, canvas1);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_VisualNode_Order_On_ZIndex_Change_With_Dirty_Ancestor()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                StackPanel stack;
-                Canvas canvas1;
-                Canvas canvas2;
-
-                var root = new TestRoot
-                {
-                    Child = stack = new StackPanel
-                    {
-                        Children =
-                        {
-                            (canvas1 = new Canvas { ZIndex = 1 }), (canvas2 = new Canvas { ZIndex = 2 }),
-                        }
-                    }
-                };
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                target.Start();
-                RunFrame(target);
-
-                root.InvalidateVisual();
-                canvas1.ZIndex = 3;
-
-                RunFrame(target);
-
-                var scene = target.UnitTestScene();
-                var stackNode = scene.FindNode(stack);
-
-                Assert.Same(stackNode.Children[0].Visual, canvas2);
-                Assert.Same(stackNode.Children[1].Visual, canvas1);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_VisualNodes_When_Child_Moved_To_New_Parent()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                Decorator moveFrom;
-                Decorator moveTo;
-                Canvas moveMe;
-
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            (moveFrom = new Decorator { Child = moveMe = new Canvas(), }),
-                            (moveTo = new Decorator()),
-                        }
-                    }
-                };
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                target.Start();
-                RunFrame(target);
-
-                moveFrom.Child = null;
-                moveTo.Child = moveMe;
-
-                RunFrame(target);
-
-                var scene = target.UnitTestScene();
-                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
-                var moveToNode = (VisualNode)scene.FindNode(moveTo);
-
-                Assert.Empty(moveFromNode.Children);
-                Assert.Equal(1, moveToNode.Children.Count);
-                Assert.Same(moveMe, moveToNode.Children[0].Visual);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_VisualNodes_When_Child_Moved_To_New_Parent_And_New_Root()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var dispatcher = new ImmediateDispatcher();
-                var loop = new Mock<IRenderLoop>();
-
-                Decorator moveFrom;
-                Decorator moveTo;
-                Canvas moveMe;
-
-                var root = new TestRoot
-                {
-                    Child = new StackPanel
-                    {
-                        Children = { (moveFrom = new Decorator { Child = moveMe = new Canvas(), }) }
-                    }
-                };
-
-                var otherRoot = new TestRoot { Child = new StackPanel { Children = { (moveTo = new Decorator()) } } };
-
-                var sceneBuilder = new SceneBuilder();
-
-                var target = new DeferredRenderer(
-                    root,
-                    loop.Object,
-                    sceneBuilder: sceneBuilder,
-                    dispatcher: dispatcher);
-
-                var otherSceneBuilder = new SceneBuilder();
-
-                var otherTarget = new DeferredRenderer(
-                    otherRoot,
-                    loop.Object,
-                    sceneBuilder: otherSceneBuilder,
-                    dispatcher: dispatcher);
-
-                root.Renderer = target;
-                otherRoot.Renderer = otherTarget;
-
-                target.Start();
-                otherTarget.Start();
-
-                RunFrame(target);
-                RunFrame(otherTarget);
-
-                moveFrom.Child = null;
-                moveTo.Child = moveMe;
-
-                RunFrame(target);
-                RunFrame(otherTarget);
-
-                var scene = target.UnitTestScene();
-                var otherScene = otherTarget.UnitTestScene();
-
-                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
-                var moveToNode = (VisualNode)otherScene.FindNode(moveTo);
-
-                Assert.Empty(moveFromNode.Children);
-                Assert.Equal(1, moveToNode.Children.Count);
-                Assert.Same(moveMe, moveToNode.Children[0].Visual);
-            }
-        }
-
-        [Fact]
-        public void Should_Push_Opacity_For_Controls_With_Less_Than_1_Opacity()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var root = new TestRoot
-                {
-                    Width = 100, Height = 100, Child = new Border { Background = Brushes.Red, Opacity = 0.5, }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var target = CreateTargetAndRunFrame(root);
-                var context = GetLayerContext(target, root);
-                var animation = new BehaviorSubject<double>(0.5);
-
-                context.Verify(x => x.PushOpacity(0.5), Times.Once);
-                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Once);
-                context.Verify(x => x.PopOpacity(), Times.Once);
-            }
-        }
-
-        [Fact]
-        public void Should_Not_Draw_Controls_With_0_Opacity()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = new Border
-                    {
-                        Background = Brushes.Red,
-                        Opacity = 0,
-                        Child = new Border { Background = Brushes.Green, }
-                    }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var target = CreateTargetAndRunFrame(root);
-                var context = GetLayerContext(target, root);
-                var animation = new BehaviorSubject<double>(0.5);
-
-                context.Verify(x => x.PushOpacity(0.5), Times.Never);
-                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Never);
-                context.Verify(x => x.PopOpacity(), Times.Never);
-            }
-        }
-
-        [Fact]
-        public void Should_Push_Opacity_Mask()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = new Border { Background = Brushes.Red, OpacityMask = Brushes.Green, }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var target = CreateTargetAndRunFrame(root);
-                var context = GetLayerContext(target, root);
-                var animation = new BehaviorSubject<double>(0.5);
-
-                context.Verify(x => x.PushOpacityMask(Brushes.Green, new Rect(0, 0, 100, 100)), Times.Once);
-                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Once);
-                context.Verify(x => x.PopOpacityMask(), Times.Once);
-            }
-        }
-
-        [Fact]
-        public void Should_Create_Layer_For_Root()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var root = new TestRoot();
-                var rootLayer = new Mock<IRenderTargetBitmapImpl>();
-
-                var sceneBuilder = new Mock<ISceneBuilder>();
-
-                sceneBuilder.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
-                    .Callback<Scene>(scene =>
-                    {
-                        scene.Size = root.ClientSize;
-                        scene.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize));
-                    });
-
-                var renderInterface = new Mock<IPlatformRenderInterface>();
-                var target = CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
-
-                Assert.Single(target.Layers);
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Should_Create_And_Delete_Layers_For_Controls_With_Animated_Opacity()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = new Border
-                    {
-                        Background = Brushes.Red,
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Green, Child = new Canvas(), Opacity = 0.9,
-                        }
-                    }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var timer = new Mock<IRenderTimer>();
-                var target = CreateTargetAndRunFrame(root, timer);
-
-                Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-                RunFrame(target);
-
-                Assert.Equal(new IVisual[] { root, border }, target.Layers.Select(x => x.LayerRoot));
-
-                animation.OnCompleted();
-                RunFrame(target);
-
-                Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Should_Not_Create_Layer_For_Childless_Control_With_Animated_Opacity()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = new Border
-                    {
-                        Background = Brushes.Red, Child = border = new Border { Background = Brushes.Green, }
-                    }
-                };
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var timer = new Mock<IRenderTimer>();
-                var target = CreateTargetAndRunFrame(root, timer);
-
-                Assert.Single(target.Layers);
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Should_Not_Push_Opacity_For_Transparent_Layer_Root_Control()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = border = new Border { Background = Brushes.Red, Child = new Canvas(), }
-                };
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var target = CreateTargetAndRunFrame(root);
-                var context = GetLayerContext(target, border);
-
-                context.Verify(x => x.PushOpacity(0.5), Times.Never);
-                context.Verify(x => x.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100), default), Times.Once);
-                context.Verify(x => x.PopOpacity(), Times.Never);
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Should_Draw_Transparent_Layer_With_Correct_Opacity()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = border = new Border { Background = Brushes.Red, Child = new Canvas(), }
-                };
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var target = CreateTargetAndRunFrame(root);
-                var context = Mock.Get(target.RenderTarget.CreateDrawingContext(null));
-                var borderLayer = target.Layers[border].Bitmap;
-
-                context.Verify(x => x.DrawBitmap(borderLayer, 0.5, It.IsAny<Rect>(), It.IsAny<Rect>(),
-                    BitmapInterpolationMode.Default));
-            }
-        }
-
-        [Fact]
-        public void Can_Dirty_Control_In_SceneInvalidated()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border1;
-                Border border2;
-
-                var root = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            (border1 = new Border { Background = Brushes.Red, Child = new Canvas(), }),
-                            (border2 = new Border { Background = Brushes.Red, Child = new Canvas(), }),
-                        }
-                    }
-                };
-
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var target = CreateTargetAndRunFrame(root);
-                var invalidated = false;
-
-                target.SceneInvalidated += (s, e) =>
-                {
-                    invalidated = true;
-                    target.AddDirty(border2);
-                };
-
-                target.AddDirty(border1);
-                target.Paint(new Rect(root.DesiredSize));
-
-                Assert.True(invalidated);
-                Assert.True(((IRenderLoopTask)target).NeedsUpdate);
-            }
-        }
-
-        private DeferredRenderer CreateTargetAndRunFrame(
-            TestRoot root,
-            Mock<IRenderTimer> timer = null,
-            ISceneBuilder sceneBuilder = null,
-            IDispatcher dispatcher = null)
-        {
-            timer = timer ?? new Mock<IRenderTimer>();
-            dispatcher = dispatcher ?? new ImmediateDispatcher();
-            var target = new DeferredRenderer(
-                root,
-                new RenderLoop(timer.Object, dispatcher),
-                sceneBuilder: sceneBuilder,
-                dispatcher: dispatcher);
-            root.Renderer = target;
-            target.Start();
-            RunFrame(target);
-            return target;
-        }
-
-        private Mock<IDrawingContextImpl> GetLayerContext(DeferredRenderer renderer, IControl layerRoot)
-        {
-            return Mock.Get(renderer.Layers[layerRoot].Bitmap.Item.CreateDrawingContext(null));
-        }
-
-        private void IgnoreFirstFrame(IRenderLoopTask task, Mock<ISceneBuilder> sceneBuilder)
-        {
-            RunFrame(task);
-            sceneBuilder.Invocations.Clear();
-        }
-
-        private void RunFrame(IRenderLoopTask task)
-        {
-            task.Update(TimeSpan.Zero);
-            task.Render();
-        }
-
-        private IRenderTargetBitmapImpl CreateLayer()
-        {
-            return Mock.Of<IRenderTargetBitmapImpl>(x =>
-                x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()) == Mock.Of<IDrawingContextImpl>());
-        }
-
-        private Mock<ISceneBuilder> MockSceneBuilder(IRenderRoot root)
-        {
-            var result = new Mock<ISceneBuilder>();
-            result.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
-                .Callback<Scene>(x => x.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize)));
-            return result;
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
deleted file mode 100644
index d24d183709..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ /dev/null
@@ -1,546 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Presenters;
-using Avalonia.Controls.Shapes;
-using Avalonia.Input;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering
-{
-    public class DeferredRendererTests_HitTesting
-    {
-        [Fact]
-        public void HitTest_Should_Find_Controls_At_Point()
-        {
-            using (TestApplication())
-            {
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(new[] { root.Child }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Empty_Controls_At_Point()
-        {
-            using (TestApplication())
-            {
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Empty(result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Invisible_Controls_At_Point()
-        {
-            using (TestApplication())
-            {
-                Border visible;
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center,
-                        IsVisible = false,
-                        Child = visible = new Border
-                        {
-                            Background = Brushes.Red,
-                            HorizontalAlignment = HorizontalAlignment.Stretch,
-                            VerticalAlignment = VerticalAlignment.Stretch,
-                        }
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Empty(result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Control_Outside_Point()
-        {
-            using (TestApplication())
-            {
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(10, 10), root, null);
-
-                Assert.Empty(result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Return_Top_Controls_First()
-        {
-            using (TestApplication())
-            {
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Children =
-                        {
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            },
-                            new Border
-                            {
-                                Width = 50,
-                                Height = 50,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            }
-                        }
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(new[] { container.Children[1], container.Children[0] }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Return_Top_Controls_First_With_ZIndex()
-        {
-            using (TestApplication())
-            {
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Children =
-                        {
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 100,
-                                ZIndex = 1,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            },
-                            new Border
-                            {
-                                Width = 50,
-                                Height = 50,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            },
-                            new Border
-                            {
-                                Width = 75,
-                                Height = 75,
-                                ZIndex = 2,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            }
-                        }
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(new[] { container.Children[2], container.Children[0], container.Children[1] }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Find_Control_Translated_Outside_Parent_Bounds()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Background = Brushes.Red,
-                        ClipToBounds = false,
-                        Children =
-                        {
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 100,
-                                ZIndex = 1,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Left,
-                                VerticalAlignment = VerticalAlignment.Top,
-                                Child = target = new Border
-                                {
-                                    Width = 50,
-                                    Height = 50,
-                                    Background = Brushes.Red,
-                                    HorizontalAlignment = HorizontalAlignment.Left,
-                                    VerticalAlignment = VerticalAlignment.Top,
-                                    RenderTransform = new TranslateTransform(110, 110),
-                                }
-                            },
-                        }
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                container.Measure(Size.Infinity);
-                container.Arrange(new Rect(container.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(120, 120), root, null);
-
-                Assert.Equal(new IVisual[] { target, container }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Control_Outside_Parent_Bounds_When_Clipped()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 100,
-                        Height = 200,
-                        Background = Brushes.Red,
-                        Children =
-                        {
-                            new Panel()
-                            {
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                                Margin = new Thickness(0, 100, 0, 0),
-                                ClipToBounds = true,
-                                Children =
-                                {
-                                    (target = new Border()
-                                    {
-                                        Width = 100,
-                                        Height = 100,
-                                        Background = Brushes.Red,
-                                        Margin = new Thickness(0, -100, 0, 0)
-                                    })
-                                }
-                            }
-                        }
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(50, 50), root, null);
-
-                Assert.Equal(new[] { container }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Control_Outside_Scroll_Viewport()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                Border item1;
-                Border item2;
-                ScrollContentPresenter scroll;
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 100,
-                        Height = 200,
-                        Background = Brushes.Red,
-                        Children =
-                        {
-                            (target = new Border()
-                            {
-                                Name = "b1",
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                            }),
-                            new Border()
-                            {
-                                Name = "b2",
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                                Margin = new Thickness(0, 100, 0, 0),
-                                Child = scroll = new ScrollContentPresenter()
-                                {
-                                    CanHorizontallyScroll = true,
-                                    CanVerticallyScroll = true,
-                                    Content = new StackPanel()
-                                    {
-                                        Children =
-                                        {
-                                            (item1 = new Border()
-                                            {
-                                                Name = "b3",
-                                                Width = 100,
-                                                Height = 100,
-                                                Background = Brushes.Red,
-                                            }),
-                                            (item2 = new Border()
-                                            {
-                                                Name = "b4",
-                                                Width = 100,
-                                                Height = 100,
-                                                Background = Brushes.Red,
-                                            }),
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                };
-
-                scroll.UpdateChild();
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-                
-                root.Renderer.Paint(Rect.Empty);
-                var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
-
-                Assert.Equal(item1, result);
-
-                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
-
-                Assert.Equal(target, result);
-
-                scroll.Offset = new Vector(0, 100);
-
-                // We don't have LayoutManager set up so do the layout pass manually.
-                scroll.Parent.InvalidateArrange();
-                container.InvalidateArrange();
-                container.Arrange(new Rect(container.DesiredSize));
-
-                root.Renderer.Paint(Rect.Empty);
-                result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
-                Assert.Equal(item2, result);
-
-                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
-                Assert.Equal(target, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Path_When_Outside_Fill()
-        {
-            using (TestApplication())
-            {
-                Path path;
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = path = new Path
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Fill = Brushes.Red,
-                        Data = StreamGeometry.Parse("M100,0 L0,100 100,100")
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-                Assert.Equal(new[] { path }, result);
-
-                result = root.Renderer.HitTest(new Point(10, 10), root, null);
-                Assert.Empty(result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Respect_Geometry_Clip()
-        {
-            using (TestApplication())
-            {
-                Border border;
-                Canvas canvas;
-                var root = new TestRoot
-                {
-                    Width = 400,
-                    Height = 400,
-                    Child = border = new Border
-                    {
-                        Background = Brushes.Red,
-                        Clip = StreamGeometry.Parse("M100,0 L0,100 100,100"),
-                        Width = 200,
-                        Height = 200,
-                        Child = canvas = new Canvas
-                        {
-                            Background = Brushes.Yellow,
-                            Margin = new Thickness(10),
-                        }
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-                Assert.Equal(new Rect(100, 100, 200, 200), border.Bounds);
-
-                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
-
-                var result = root.Renderer.HitTest(new Point(200, 200), root, null);
-                Assert.Equal(new IVisual[] { canvas, border }, result);
-
-                result = root.Renderer.HitTest(new Point(110, 110), root, null);
-                Assert.Empty(result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Accommodate_ICustomHitTest()
-        {
-            using (TestApplication())
-            {
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 300,
-                    Height = 200,
-                    Child = border = new CustomHitTestBorder
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                }; 
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = root.Renderer.HitTest(new Point(75, 100), root, null);
-                Assert.Equal(new[] { border }, result);
-
-                result = root.Renderer.HitTest(new Point(125, 100), root, null);
-                Assert.Equal(new[] { border }, result);
-
-                result = root.Renderer.HitTest(new Point(175, 100), root, null);
-                Assert.Empty(result);
-            }
-        }
-
-        private IDisposable TestApplication()
-        {
-            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs
deleted file mode 100644
index 6859b2b139..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs
+++ /dev/null
@@ -1,320 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering
-{
-    public class ImmediateRendererTests
-    {
-        [Fact]
-        public void AddDirty_Call_RenderRoot_Invalidate()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var visual = new Mock<Visual>();
-                var child = new Mock<Visual>() { CallBase = true };
-                var renderRoot = visual.As<IRenderRoot>();
-
-                visual.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(0, 0, 400, 400));
-
-                child.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(10, 10, 100, 100));
-                child.As<IVisual>().Setup(v => v.VisualParent).Returns(visual.Object);
-
-                var target = new ImmediateRenderer(visual.Object);
-
-                target.AddDirty(child.Object);
-
-                renderRoot.Verify(v => v.Invalidate(new Rect(10, 10, 100, 100)));
-            }
-        }
-
-        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
-        public void AddDirty_With_RenderTransform_Call_RenderRoot_Invalidate()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var visual = new Mock<Visual>();
-                var child = new Mock<Visual>() { CallBase = true };
-                var renderRoot = visual.As<IRenderRoot>();
-
-                visual.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(0, 0, 400, 400));
-
-                child.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(100, 100, 100, 100));
-                child.As<IVisual>().Setup(v => v.VisualParent).Returns(visual.Object);
-                child.Object.RenderTransform = new ScaleTransform() { ScaleX = 2, ScaleY = 2 };
-
-                var target = new ImmediateRenderer(visual.Object);
-
-                target.AddDirty(child.Object);
-
-                renderRoot.Verify(v => v.Invalidate(new Rect(50, 50, 200, 200)));
-            }
-        }
-
-        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
-        public void AddDirty_For_Child_Moved_Should_Invalidate_Previous_Bounds()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var visual = new Mock<Visual>() { CallBase = true };
-                var child = new Mock<Visual>() { CallBase = true };
-                var renderRoot = visual.As<IRenderRoot>();
-                var renderTarget = visual.As<IRenderTarget>();
-
-                renderRoot.Setup(r => r.CreateRenderTarget()).Returns(renderTarget.Object);
-
-                renderTarget.Setup(r => r.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()))
-                    .Returns(Mock.Of<IDrawingContextImpl>());
-
-                visual.As<IVisual>().Setup(v => v.Bounds).Returns(new Rect(0, 0, 400, 400));
-
-                visual.As<IVisual>().Setup(v => v.VisualChildren)
-                    .Returns(new AvaloniaList<IVisual>() { child.As<IVisual>().Object });
-
-                Rect childBounds = new Rect(0, 0, 100, 100);
-                child.As<IVisual>().Setup(v => v.Bounds).Returns(() => childBounds);
-                child.As<IVisual>().Setup(v => v.VisualParent).Returns(visual.Object);
-                child.As<IVisual>().Setup(v => v.VisualChildren).Returns(new AvaloniaList<IVisual>());
-
-                var invalidationCalls = new List<Rect>();
-
-                renderRoot.Setup(v => v.Invalidate(It.IsAny<Rect>())).Callback<Rect>(v => invalidationCalls.Add(v));
-
-                var target = new ImmediateRenderer(visual.Object);
-
-                target.AddDirty(child.Object);
-
-                Assert.Equal(new Rect(0, 0, 100, 100), invalidationCalls[0]);
-
-                target.Paint(new Rect(0, 0, 100, 100));
-
-                //move child 100 pixels bottom/right
-                childBounds = new Rect(100, 100, 100, 100);
-
-                //renderer should invalidate old child bounds with new one
-                //as on old area there can be artifacts
-                target.AddDirty(child.Object);
-
-                //invalidate first old position
-                Assert.Equal(new Rect(0, 0, 100, 100), invalidationCalls[1]);
-
-                //then new position
-                Assert.Equal(new Rect(100, 100, 100, 100), invalidationCalls[2]);
-            }
-        }
-
-        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
-        public void Should_Render_Child_In_Parent_With_RenderTransform()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var targetMock = new Mock<Control>() { CallBase = true };
-                var target = targetMock.Object;
-                target.Width = 100;
-                target.Height = 50;
-
-                var child = new Panel()
-                {
-                    RenderTransform = new RotateTransform() { Angle = 90 },
-                    Children = { new Panel() { Children = { target } } }
-                };
-
-                var visualTarget = targetMock.As<IVisual>();
-                int rendered = 0;
-                visualTarget.Setup(v => v.Render(It.IsAny<DrawingContext>())).Callback(() => rendered++);
-
-                var root = new TestRoot(child);
-                root.Renderer = new ImmediateRenderer(root);
-
-                root.LayoutManager.ExecuteInitialLayoutPass();
-
-                root.Measure(new Size(50, 100));
-                root.Arrange(new Rect(new Size(50, 100)));
-
-                root.Renderer.Paint(root.Bounds);
-
-                Assert.Equal(1, rendered);
-            }
-        }
-
-        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
-        public void Should_Render_Child_In_Parent_With_RenderTransform2()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var targetMock = new Mock<Control>() { CallBase = true };
-                var target = targetMock.Object;
-
-                target.Width = 100;
-                target.Height = 50;
-                target.HorizontalAlignment = HorizontalAlignment.Center;
-                target.VerticalAlignment = VerticalAlignment.Center;
-
-                var child = new Panel()
-                {
-                    RenderTransform = new RotateTransform() { Angle = 90 },
-                    Children = { new Panel() { Children = { target } } }
-                };
-
-                var visualTarget = targetMock.As<IVisual>();
-                int rendered = 0;
-                visualTarget.Setup(v => v.Render(It.IsAny<DrawingContext>())).Callback(() => rendered++);
-
-                var root = new TestRoot(child);
-                root.Renderer = new ImmediateRenderer(root);
-
-                root.LayoutManager.ExecuteInitialLayoutPass();
-
-                root.Measure(new Size(300, 100));
-                root.Arrange(new Rect(new Size(300, 100)));
-                root.Renderer.Paint(root.Bounds);
-
-                Assert.Equal(1, rendered);
-            }
-        }
-
-        [Fact]
-        public void Should_Not_Clip_Children_With_RenderTransform_When_In_Bounds()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                const int RootWidth = 300;
-                const int RootHeight = 300;
-
-                var rootGrid = new Grid { Width = RootWidth, Height = RootHeight, ClipToBounds = true };
-
-                var stackPanel = new StackPanel
-                {
-                    Orientation = Orientation.Horizontal,
-                    VerticalAlignment = VerticalAlignment.Top,
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    Margin = new Thickness(0, 10, 0, 0),
-                    RenderTransformOrigin = new RelativePoint(new Point(0, 0), RelativeUnit.Relative),
-                    RenderTransform = new TransformGroup
-                    {
-                        Children = { new RotateTransform { Angle = 90 }, new TranslateTransform { X = 240 } }
-                    }
-                };
-
-                rootGrid.Children.Add(stackPanel);
-
-                TestControl CreateControl()
-                    => new TestControl
-                    {
-                        Width = 80, Height = 40, Margin = new Thickness(0, 0, 5, 0), ClipToBounds = true
-                    };
-
-                var control1 = CreateControl();
-                var control2 = CreateControl();
-                var control3 = CreateControl();
-
-                stackPanel.Children.Add(control1);
-                stackPanel.Children.Add(control2);
-                stackPanel.Children.Add(control3);
-
-                var root = new TestRoot(rootGrid);
-                root.Renderer = new ImmediateRenderer(root);
-                root.LayoutManager.ExecuteInitialLayoutPass();
-
-                var rootSize = new Size(RootWidth, RootHeight);
-                root.Measure(rootSize);
-                root.Arrange(new Rect(rootSize));
-
-                root.Renderer.Paint(root.Bounds);
-
-                Assert.True(control1.Rendered);
-                Assert.True(control2.Rendered);
-                Assert.True(control3.Rendered);
-            }
-        }
-
-        [Fact]
-        public void Should_Not_Render_Clipped_Child_With_RenderTransform_When_Not_In_Bounds()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                const int RootWidth = 300;
-                const int RootHeight = 300;
-
-                var rootGrid = new Grid { Width = RootWidth, Height = RootHeight, ClipToBounds = true };
-
-                var stackPanel = new StackPanel
-                {
-                    Orientation = Orientation.Horizontal,
-                    VerticalAlignment = VerticalAlignment.Top,
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    Margin = new Thickness(0, 10, 0, 0),
-                    RenderTransformOrigin = new RelativePoint(new Point(0, 0), RelativeUnit.Relative),
-                    RenderTransform = new TransformGroup
-                    {
-                        Children = { new RotateTransform { Angle = 90 }, new TranslateTransform { X = 280 } }
-                    }
-                };
-
-                rootGrid.Children.Add(stackPanel);
-
-                TestControl CreateControl()
-                    => new TestControl
-                    {
-                        Width = 160, Height = 40, Margin = new Thickness(0, 0, 5, 0), ClipToBounds = true
-                    };
-
-                var control1 = CreateControl();
-                var control2 = CreateControl();
-                var control3 = CreateControl();
-
-                stackPanel.Children.Add(control1);
-                stackPanel.Children.Add(control2);
-                stackPanel.Children.Add(control3);
-
-                var root = new TestRoot(rootGrid);
-                root.Renderer = new ImmediateRenderer(root);
-                root.LayoutManager.ExecuteInitialLayoutPass();
-
-                var rootSize = new Size(RootWidth, RootHeight);
-                root.Measure(rootSize);
-                root.Arrange(new Rect(rootSize));
-
-                root.Renderer.Paint(root.Bounds);
-
-                Assert.True(control1.Rendered);
-                Assert.True(control2.Rendered);
-                Assert.False(control3.Rendered);
-            }
-        }
-
-        [Fact]
-        public void Static_Render_Method_Does_Not_Update_TransformedBounds()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var target = new Border();
-                var expected = new TransformedBounds(new Rect(1, 2, 3, 4), new Rect(4, 5, 6, 7), Matrix.CreateRotation(0.8));
-
-                ((IVisual)target).TransformedBounds = expected;
-
-                var renderTarget = Mock.Of<IRenderTarget>(x => 
-                    x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()) == Mock.Of<IDrawingContextImpl>());
-                ImmediateRenderer.Render(target, renderTarget);
-
-                Assert.Equal(expected, target.TransformedBounds);
-            }
-        }
-
-        private class TestControl : Control
-        {
-            public bool Rendered { get; private set; }
-
-            public override void Render(DrawingContext context)
-                => Rendered = true;
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
deleted file mode 100644
index a3b0a0cdd5..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
+++ /dev/null
@@ -1,458 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Presenters;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.Rendering;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering
-{
-    public class ImmediateRendererTests_HitTesting
-    {
-        [Fact]
-        public void HitTest_Should_Find_Controls_At_Point()
-        {
-            using (TestApplication())
-            {
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(new[] { root.Child, root }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Invisible_Controls_At_Point()
-        {
-            using (TestApplication())
-            {
-                Border visible;
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center,
-                        IsVisible = false,
-                        Child = visible = new Border
-                        {
-                            Background = Brushes.Red,
-                            HorizontalAlignment = HorizontalAlignment.Stretch,
-                            VerticalAlignment = VerticalAlignment.Stretch,
-                        }
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(new[] { root }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Control_Outside_Point()
-        {
-            using (TestApplication())
-            {
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(10, 10), root, null);
-
-                Assert.Equal(new[] { root }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Return_Top_Controls_First()
-        {
-            using (TestApplication())
-            {
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Children =
-                        {
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            },
-                            new Border
-                            {
-                                Width = 50,
-                                Height = 50,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            }
-                        }
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(new[] { container.Children[1], container.Children[0], container, root }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Return_Top_Controls_First_With_ZIndex()
-        {
-            using (TestApplication())
-            {
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Children =
-                        {
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 100,
-                                ZIndex = 1,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            },
-                            new Border
-                            {
-                                Width = 50,
-                                Height = 50,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            },
-                            new Border
-                            {
-                                Width = 75,
-                                Height = 75,
-                                ZIndex = 2,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Center,
-                                VerticalAlignment = VerticalAlignment.Center
-                            }
-                        }
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
-
-                Assert.Equal(
-                    new[] 
-                    {
-                        container.Children[2],
-                        container.Children[0],
-                        container.Children[1],
-                        container,
-                        root
-                    }, 
-                    result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Find_Control_Translated_Outside_Parent_Bounds()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 200,
-                        Height = 200,
-                        Background = Brushes.Red,
-                        ClipToBounds = false,
-                        Children =
-                        {
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 100,
-                                ZIndex = 1,
-                                Background = Brushes.Red,
-                                HorizontalAlignment = HorizontalAlignment.Left,
-                                VerticalAlignment = VerticalAlignment.Top,
-                                Child = target = new Border
-                                {
-                                    Width = 50,
-                                    Height = 50,
-                                    Background = Brushes.Red,
-                                    HorizontalAlignment = HorizontalAlignment.Left,
-                                    VerticalAlignment = VerticalAlignment.Top,
-                                    RenderTransform = new TranslateTransform(110, 110),
-                                }
-                            },
-                        }
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                container.Measure(Size.Infinity);
-                container.Arrange(new Rect(container.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(120, 120), root, null);
-
-                Assert.Equal(new IVisual[] { target, container }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Control_Outside_Parent_Bounds_When_Clipped()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 100,
-                        Height = 200,
-                        Background = Brushes.Red,
-                        Children =
-                        {
-                            new Panel()
-                            {
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                                Margin = new Thickness(0, 100, 0, 0),
-                                ClipToBounds = true,
-                                Children =
-                                {
-                                    (target = new Border()
-                                    {
-                                        Width = 100,
-                                        Height = 100,
-                                        Background = Brushes.Red,
-                                        Margin = new Thickness(0, -100, 0, 0)
-                                    })
-                                }
-                            }
-                        }
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(50, 50), root, null);
-
-                Assert.Equal(new IVisual[] { container, root }, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Not_Find_Control_Outside_Scroll_Viewport()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                Border item1;
-                Border item2;
-                ScrollContentPresenter scroll;
-                Panel container;
-                var root = new TestRoot
-                {
-                    Child = container = new Panel
-                    {
-                        Width = 100,
-                        Height = 200,
-                        Background = Brushes.Red,
-                        Children =
-                        {
-                            (target = new Border()
-                            {
-                                Name = "b1",
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                            }),
-                            new Border()
-                            {
-                                Name = "b2",
-                                Width = 100,
-                                Height = 100,
-                                Background = Brushes.Red,
-                                Margin = new Thickness(0, 100, 0, 0),
-                                Child = scroll = new ScrollContentPresenter()
-                                {
-                                    CanHorizontallyScroll = true,
-                                    CanVerticallyScroll = true,
-                                    Content = new StackPanel()
-                                    {
-                                        Children =
-                                        {
-                                            (item1 = new Border()
-                                            {
-                                                Name = "b3",
-                                                Width = 100,
-                                                Height = 100,
-                                                Background = Brushes.Red,
-                                            }),
-                                            (item2 = new Border()
-                                            {
-                                                Name = "b4",
-                                                Width = 100,
-                                                Height = 100,
-                                                Background = Brushes.Red,
-                                            }),
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                };
-
-                scroll.UpdateChild();
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(container.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
-
-                Assert.Equal(item1, result);
-
-                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
-
-                Assert.Equal(target, result);
-
-                scroll.Offset = new Vector(0, 100);
-
-                // We don't have LayoutManager set up so do the layout pass manually.
-                scroll.Parent.InvalidateArrange();
-                container.InvalidateArrange();
-                container.Arrange(new Rect(container.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
-                Assert.Equal(item2, result);
-
-                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
-                Assert.Equal(target, result);
-            }
-        }
-
-        [Fact]
-        public void HitTest_Should_Accommodate_ICustomHitTest()
-        {
-            using (TestApplication())
-            {
-                Border border;
-
-                var root = new TestRoot
-                {
-                    Width = 300,
-                    Height = 200,
-                    Child = border = new CustomHitTestBorder
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center
-                    }
-                };
-
-                root.Renderer = new ImmediateRenderer(root);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-                root.Renderer.Paint(new Rect(root.ClientSize));
-
-                var result = root.Renderer.HitTest(new Point(75, 100), root, null).First();
-                Assert.Equal(border, result);
-
-                result = root.Renderer.HitTest(new Point(125, 100), root, null).First();
-                Assert.Equal(border, result);
-
-                result = root.Renderer.HitTest(new Point(175, 100), root, null).First();
-                Assert.Equal(root, result);
-            }
-        }
-
-        private IDisposable TestApplication()
-        {
-            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/RenderLoopTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/RenderLoopTests.cs
deleted file mode 100644
index e9aefc46e6..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/RenderLoopTests.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Rendering;
-using Avalonia.Threading;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering
-{
-    public class RenderLoopTests
-    {
-        [Fact]
-        public void RenderLoop_Update_Runs_On_Dispatcher()
-        {
-            var dispatcher = new Mock<IDispatcher>();
-
-            bool inDispatcher = false;
-
-            dispatcher.Setup(
-                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
-                .Callback((Action a, DispatcherPriority _) =>
-                {
-                    inDispatcher = true;
-                    a();
-                    inDispatcher = false;
-                });
-
-            var timer = new Mock<IRenderTimer>();
-
-            var loop = new RenderLoop(timer.Object, dispatcher.Object);
-
-            var renderTask = new Mock<IRenderLoopTask>();
-
-            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
-            renderTask.Setup(t => t.Update(It.IsAny<TimeSpan>()))
-                .Callback((TimeSpan _) => Assert.True(inDispatcher));
-
-            loop.Add(renderTask.Object);
-
-            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
-
-            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Once());
-        }
-
-        [Fact]
-        public void RenderLoop_Does_Not_Update_When_No_Tasks_Need_Update()
-        {
-            var dispatcher = new Mock<IDispatcher>();
-            dispatcher.Setup(
-                d => d.InvokeAsync(It.IsAny<Action>(), DispatcherPriority.Render))
-                .Callback((Action a, DispatcherPriority _) => a())
-                .Returns(Task.CompletedTask);
-
-            var timer = new Mock<IRenderTimer>();
-            var loop = new RenderLoop(timer.Object, dispatcher.Object);
-            var renderTask = new Mock<IRenderLoopTask>();
-            renderTask.Setup(t => t.NeedsUpdate).Returns(false);
-
-            loop.Add(renderTask.Object);
-            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
-            
-            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Never());
-        }
-
-        [Fact]
-        public void RenderLoop_Render_Runs_Off_Dispatcher()
-        {
-            var dispatcher = new Mock<IDispatcher>();
-            bool inDispatcher = false;
-            dispatcher.Setup(
-                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
-                .Callback((Action a, DispatcherPriority _) =>
-                {
-                    inDispatcher = true;
-                    a();
-                    inDispatcher = false;
-                });
-
-            var timer = new Mock<IRenderTimer>();
-            var loop = new RenderLoop(timer.Object, dispatcher.Object);
-
-            var renderTask = new Mock<IRenderLoopTask>();
-
-            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
-            renderTask.Setup(t => t.Render())
-                .Callback(() => Assert.False(inDispatcher));
-
-            loop.Add(renderTask.Object);
-            timer.Raise(t => t.Tick += null, TimeSpan.Zero);
-
-            renderTask.Verify(t => t.Update(It.IsAny<TimeSpan>()), Times.Once());
-        }
-        
-        [Fact]
-        public void RenderLoop_Passes_Tick_Count_To_Update()
-        {
-            var dispatcher = new Mock<IDispatcher>();
-            dispatcher.Setup(
-                d => d.Post(It.IsAny<Action>(), DispatcherPriority.Render))
-                .Callback((Action a, DispatcherPriority _) => a());
-
-            var timer = new Mock<IRenderTimer>();
-            var loop = new RenderLoop(timer.Object, dispatcher.Object);
-            var renderTask = new Mock<IRenderLoopTask>();
-            renderTask.Setup(t => t.NeedsUpdate).Returns(true);
-
-            loop.Add(renderTask.Object);
-            var time = new TimeSpan(123456789L);
-            timer.Raise(t => t.Tick += null, time);
-
-            renderTask.Verify(t => t.Update(time), Times.Once());
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
deleted file mode 100644
index 27aa0c55b5..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.UnitTests;
-using Avalonia.Utilities;
-using Avalonia.VisualTree;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{
-    public class DeferredDrawingContextImplTests
-    {
-        [Fact]
-        public void Should_Add_VisualNode()
-        {
-            var parent = new VisualNode(new TestRoot(), null);
-            var child = new VisualNode(Mock.Of<IVisual>(), parent);
-            var layers = new SceneLayers(parent.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            target.BeginUpdate(parent);
-            target.BeginUpdate(child);
-
-            Assert.Equal(1, parent.Children.Count);
-            Assert.Same(child, parent.Children[0]);
-        }
-
-        [Fact]
-        public void Should_Not_Replace_Identical_VisualNode()
-        {
-            var parent = new VisualNode(new TestRoot(), null);
-            var child = new VisualNode(Mock.Of<IVisual>(), parent);
-            var layers = new SceneLayers(parent.Visual);
-
-            parent.AddChild(child);
-
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            target.BeginUpdate(parent);
-            target.BeginUpdate(child);
-
-            Assert.Equal(1, parent.Children.Count);
-            Assert.Same(child, parent.Children[0]);
-        }
-
-        [Fact]
-        public void Should_Replace_Different_VisualNode()
-        {
-            var parent = new VisualNode(new TestRoot(), null);
-            var child1 = new VisualNode(Mock.Of<IVisual>(), parent);
-            var child2 = new VisualNode(Mock.Of<IVisual>(), parent);
-            var layers = new SceneLayers(parent.Visual);
-
-            parent.AddChild(child1);
-
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            target.BeginUpdate(parent);
-            target.BeginUpdate(child2);
-
-            Assert.Equal(1, parent.Children.Count);
-            Assert.Same(child2, parent.Children[0]);
-        }
-
-        [Fact]
-        public void TrimChildren_Should_Trim_Children()
-        {
-            var root = new TestRoot();
-            var node = new VisualNode(root, null) { LayerRoot = root };
-
-            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
-            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
-            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
-            node.AddChild(new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root });
-
-            var layers = new SceneLayers(root);
-            var target = new DeferredDrawingContextImpl(null, layers);
-            var child1 = new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root };
-            var child2 = new VisualNode(Mock.Of<IVisual>(), node) { LayerRoot = root };
-
-            target.BeginUpdate(node);
-            using (target.BeginUpdate(child1)) { }
-            using (target.BeginUpdate(child2)) { }
-            target.TrimChildren();
-
-            Assert.Equal(2, node.Children.Count);
-        }
-
-        [Fact]
-        public void Should_Add_DrawOperations()
-        {
-            var node = new VisualNode(new TestRoot(), null);
-            var layers = new SceneLayers(node.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            node.LayerRoot = node.Visual;
-
-            using (target.BeginUpdate(node))
-            {
-                target.DrawRectangle(Brushes.Red, new Pen(Brushes.Green, 1), new Rect(0, 0, 100, 100));
-            }
-
-            Assert.Equal(1, node.DrawOperations.Count);
-            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
-        }
-
-        [Fact]
-        public void Should_Not_Replace_Identical_DrawOperation()
-        {
-            var node = new VisualNode(new TestRoot(), null);
-            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default));
-            var layers = new SceneLayers(node.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            node.LayerRoot = node.Visual;
-            node.AddDrawOperation(operation);
-
-            using (target.BeginUpdate(node))
-            {
-                target.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100));
-            }
-
-            Assert.Equal(1, node.DrawOperations.Count);
-            Assert.Same(operation.Item, node.DrawOperations.Single().Item);
-
-            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
-        }
-
-        [Fact]
-        public void Should_Replace_Different_DrawOperation()
-        {
-            var node = new VisualNode(new TestRoot(), null);
-            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default));
-            var layers = new SceneLayers(node.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            node.LayerRoot = node.Visual;
-            node.AddDrawOperation(operation);
-
-            using (target.BeginUpdate(node))
-            {
-                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
-            }
-
-            Assert.Equal(1, node.DrawOperations.Count);
-            Assert.NotSame(operation, node.DrawOperations.Single());
-
-            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
-        }
-
-        [Fact]
-        public void Should_Update_DirtyRects()
-        {
-            var node = new VisualNode(new TestRoot(), null);
-            var operation = new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default);
-            var layers = new SceneLayers(node.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            node.LayerRoot = node.Visual;
-
-            using (target.BeginUpdate(node))
-            {
-                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
-            }
-
-            Assert.Equal(new Rect(0, 0, 100, 100), layers.Single().Dirty.Single());
-        }
-
-        [Fact]
-        public void Should_Trim_DrawOperations()
-        {
-            var node = new VisualNode(new TestRoot(), null);
-            node.LayerRoot = node.Visual;
-
-            for (var i = 0; i < 4; ++i)
-            {
-                var drawOperation = new Mock<IDrawOperation>();
-                using (var r = RefCountable.Create(drawOperation.Object))
-                {
-                    node.AddDrawOperation(r);
-                }
-            }
-
-            var drawOperations = node.DrawOperations.Select(op => op.Item).ToList();
-            var layers = new SceneLayers(node.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            using (target.BeginUpdate(node))
-            {
-                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 10, 100));
-                target.DrawRectangle(Brushes.Blue, null, new Rect(0, 0, 20, 100));
-            }
-
-            Assert.Equal(2, node.DrawOperations.Count);
-
-            foreach (var i in drawOperations)
-            {
-                Mock.Get(i).Verify(x => x.Dispose());
-            }
-        }
-
-        [Fact]
-        public void Trimmed_DrawOperations_Releases_Reference()
-        {
-            var node = new VisualNode(new TestRoot(), null);
-            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), default));
-            var layers = new SceneLayers(node.Visual);
-            var target = new DeferredDrawingContextImpl(null, layers);
-
-            node.LayerRoot = node.Visual;
-            node.AddDrawOperation(operation);
-            Assert.Equal(2, operation.RefCount);
-
-            using (target.BeginUpdate(node))
-            {
-                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
-            }
-
-            Assert.Equal(1, node.DrawOperations.Count);
-            Assert.NotSame(operation, node.DrawOperations.Single());
-            Assert.Equal(1, operation.RefCount);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
deleted file mode 100644
index 0cdc8827ad..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{  
-    public class DrawOperationTests
-    {
-        [Fact]
-        public void Empty_Bounds_Remain_Empty()
-        {
-            var target = new TestDrawOperation(Rect.Empty, Matrix.Identity, null);
-
-            Assert.Equal(Rect.Empty, target.Bounds);
-        }
-
-        [Theory]
-        [InlineData(10, 10, 10, 10, 1, 1, 1, 9, 9, 12, 12)]
-        [InlineData(10, 10, 10, 10, 1, 1, 2, 9, 9, 12, 12)]
-        [InlineData(10, 10, 10, 10, 1.5, 1.5, 1, 14, 14, 17, 17)]
-        public void Rectangle_Bounds_Are_Snapped_To_Pixels(
-            double x,
-            double y,
-            double width,
-            double height,
-            double scaleX,
-            double scaleY,
-            double? penThickness,
-            double expectedX,
-            double expectedY,
-            double expectedWidth,
-            double expectedHeight)
-        {
-            var target = new TestRectangleDrawOperation(
-                new Rect(x, y, width, height),
-                Matrix.CreateScale(scaleX, scaleY),
-                penThickness.HasValue ? new Pen(Brushes.Black, penThickness.Value) : null);
-            Assert.Equal(new Rect(expectedX, expectedY, expectedWidth, expectedHeight), target.Bounds);
-        }
-
-        [Fact]
-        public void Image_Node_Releases_Reference_To_Bitmap_On_Dispose()
-        {
-            var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>());
-            var imageNode = new ImageNode(
-                Matrix.Identity,
-                bitmap,
-                1,
-                new Rect(1, 1, 1, 1),
-                new Rect(1, 1, 1, 1),
-                BitmapInterpolationMode.Default);
-
-            Assert.Equal(2, bitmap.RefCount);
-
-            imageNode.Dispose();
-
-            Assert.Equal(1, bitmap.RefCount);
-        }
-
-        [Fact]
-        public void HitTest_On_Geometry_Node_With_Zero_Transform_Does_Not_Throw()
-        {
-            var geometry = Mock.Of<IGeometryImpl>();
-            var geometryNode = new GeometryNode(
-                new Matrix(),
-                Brushes.Black,
-                null,
-                geometry, default);
-
-            geometryNode.HitTest(new Point());
-        }
-
-        private class TestRectangleDrawOperation : RectangleNode
-        {
-            public TestRectangleDrawOperation(Rect bounds, Matrix transform, Pen pen) 
-                : base(transform, pen.Brush, pen, bounds, new BoxShadows())
-            {
-
-            }
-
-            public override bool HitTest(Point p) => false;
-
-            public override void Render(IDrawingContextImpl context) { }
-        }
-
-        private class TestDrawOperation : DrawOperation
-        {
-            public TestDrawOperation(Rect bounds, Matrix transform, Pen pen)
-                :base(bounds, transform)
-            {
-            }
-
-            public override bool HitTest(Point p) => false;
-
-            public override void Render(IDrawingContextImpl context) { }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
deleted file mode 100644
index e317b43efc..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ /dev/null
@@ -1,991 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-using Avalonia.Layout;
-using Moq;
-using Avalonia.Platform;
-using System.Reactive.Subjects;
-using Avalonia.Data;
-using Avalonia.Utilities;
-using Avalonia.Media.Imaging;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{
-    public partial class SceneBuilderTests
-    {
-        [Fact]
-        public void Should_Build_Initial_Scene()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                TextBlock textBlock;
-                var tree = new TestRoot
-                {
-                    Child = border = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        Child = textBlock = new TextBlock
-                        {
-                            TextWrapping = TextWrapping.NoWrap,
-                            Text = "Hello World",
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var result = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(result);
-
-                Assert.Same(tree, ((VisualNode)result.Root).LayerRoot);
-                Assert.Equal(1, result.Root.Children.Count);
-
-                var borderNode = (VisualNode)result.Root.Children[0];
-                Assert.Same(borderNode, result.FindNode(border));
-                Assert.Same(border, borderNode.Visual);
-                Assert.Equal(1, borderNode.Children.Count);
-                Assert.Equal(1, borderNode.DrawOperations.Count);
-
-                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0].Item;
-                Assert.Equal(Brushes.Red, backgroundNode.Brush);
-
-                var textBlockNode = borderNode.Children[0];
-                Assert.Same(textBlockNode, result.FindNode(textBlock));
-                Assert.Same(textBlock, textBlockNode.Visual);
-                Assert.Equal(1, textBlockNode.DrawOperations.Count);
-
-                var textNode = (GlyphRunNode)textBlockNode.DrawOperations[0].Item;
-                Assert.NotNull(textNode.GlyphRun);
-            }
-        }
-
-        [Fact]
-        public void Should_Respect_Margin_For_ClipBounds()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Width = 200,
-                    Height = 300,
-                    Child = new Border
-                    {
-                        Margin = new Thickness(10, 20, 30, 40),
-                        Child = canvas = new Canvas
-                        {
-                            ClipToBounds = true,
-                            Background = Brushes.AliceBlue,
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var result = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(result);
-
-                var canvasNode = result.FindNode(canvas);
-                Assert.Equal(new Rect(10, 20, 160, 240), canvasNode.ClipBounds);
-
-                // Initial ClipBounds are correct, make sure they're still correct after updating canvas.
-                result = result.CloneScene();
-                Assert.True(sceneBuilder.Update(result, canvas));
-
-                canvasNode = result.FindNode(canvas);
-                Assert.Equal(new Rect(10, 20, 160, 240), canvasNode.ClipBounds);
-            }
-        }
-
-        [Fact]
-        public void ClipBounds_Should_Be_Intersection_With_Parent_ClipBounds()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                var tree = new TestRoot
-                {
-                    Width = 200,
-                    Height = 300,
-                    Child = new Canvas
-                    {
-                        ClipToBounds = true,
-                        Width = 100,
-                        Height = 100,
-                        HorizontalAlignment = HorizontalAlignment.Left,
-                        VerticalAlignment = VerticalAlignment.Top,
-                        Children =
-                        {
-                            (border = new Border
-                            {
-                                Background = Brushes.AliceBlue,
-                                ClipToBounds = true,
-                                Width = 100,
-                                Height = 100,
-                                [Canvas.LeftProperty] = 50,
-                                [Canvas.TopProperty] = 50,
-                            })
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var borderNode = scene.FindNode(border);
-                Assert.Equal(new Rect(50, 50, 50, 50), borderNode.ClipBounds);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_Descendent_ClipBounds_When_Margin_Changed()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Width = 200,
-                    Height = 300,
-                    Child = canvas = new Canvas
-                    {
-                        ClipToBounds = true,
-                        Width = 100,
-                        Height = 100,
-                        HorizontalAlignment = HorizontalAlignment.Left,
-                        VerticalAlignment = VerticalAlignment.Top,
-                        Children =
-                        {
-                            (border = new Border
-                            {
-                                Background = Brushes.AliceBlue,
-                                ClipToBounds = true,
-                                Width = 100,
-                                Height = 100,
-                                [Canvas.LeftProperty] = 50,
-                                [Canvas.TopProperty] = 50,
-                            })
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var borderNode = scene.FindNode(border);
-                Assert.Equal(new Rect(50, 50, 50, 50), borderNode.ClipBounds);
-
-                canvas.Width = canvas.Height = 125;
-                canvas.Measure(Size.Infinity);
-                canvas.Arrange(new Rect(tree.DesiredSize));
-
-                // Initial ClipBounds are correct, make sure they're still correct after updating canvas.
-                scene = scene.CloneScene();
-                Assert.True(sceneBuilder.Update(scene, canvas));
-
-                borderNode = scene.FindNode(border);
-                Assert.Equal(new Rect(50, 50, 75, 75), borderNode.ClipBounds);
-            }
-        }
-
-        [Fact]
-        public void Should_Respect_ZIndex()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border front;
-                Border back;
-                var tree = new TestRoot
-                {
-                    Child = new Panel
-                    {
-                        Children =
-                        {
-                            (front = new Border
-                            {
-                                ZIndex = 1,
-                            }),
-                            (back = new Border
-                            {
-                                ZIndex = 0,
-                            }),
-                        }
-                    }
-                };
-
-                var result = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(result);
-
-                var panelNode = result.FindNode(tree.Child);
-                var expected = new IVisual[] { back, front };
-                var actual = panelNode.Children.OfType<IVisualNode>().Select(x => x.Visual).ToArray();
-                Assert.Equal(expected, actual);
-            }
-        }
-
-        [Fact]
-        public void Should_Respect_Uniform_ZIndex()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Panel panel;
-
-                var tree = new TestRoot
-                {
-                    Child = panel = new Panel()
-                };
-
-                for (var i = 0; i < 128; i++)
-                {
-                    panel.Children.Add(new Border());
-                }
-
-                var result = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(result);
-
-                var panelNode = result.FindNode(tree.Child);
-                var expected = panel.Children.ToArray();
-                var actual = panelNode.Children.OfType<IVisualNode>().Select(x => x.Visual).ToArray();
-                Assert.Equal(expected, actual);
-            }
-        }
-
-        [Fact]
-        public void ClipBounds_Should_Be_In_Global_Coordinates()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border target;
-                var tree = new TestRoot
-                {
-                    Child = new Decorator
-                    {
-                        Margin = new Thickness(24, 26),
-                        Child = target = new Border
-                        {
-                            ClipToBounds = true,
-                            Margin = new Thickness(26, 24),
-                            Width = 100,
-                            Height = 100,
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var result = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(result);
-
-                var targetNode = result.FindNode(target);
-
-                Assert.Equal(new Rect(50, 50, 100, 100), targetNode.ClipBounds);
-            }
-        }
-
-        [Fact]
-        public void Transform_For_Control_With_RenderTransform_Should_Be_Correct_After_Update()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                var tree = new TestRoot
-                {
-                    Width = 400,
-                    Height = 200,
-                    Child = new Decorator
-                    {
-                        Width = 200,
-                        Height = 100,
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            HorizontalAlignment = HorizontalAlignment.Right,
-                            Width = 100,
-                            RenderTransform = new ScaleTransform(0.5, 1),
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var expectedTransform = Matrix.CreateScale(0.5, 1) * Matrix.CreateTranslation(225, 50);
-                var borderNode = scene.FindNode(border);
-                Assert.Equal(expectedTransform, borderNode.Transform);
-
-                scene = scene.CloneScene();
-                Assert.True(sceneBuilder.Update(scene, border));
-
-                borderNode = scene.FindNode(border);
-                Assert.Equal(expectedTransform, borderNode.Transform);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_Border_Background_Node()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                TextBlock textBlock;
-                var tree = new TestRoot
-                {
-                    Child = border = new Border
-                    {
-                        Width = 100,
-                        Height = 100,
-                        Background = Brushes.Red,
-                        Child = textBlock = new TextBlock
-                        {
-                            Foreground = Brushes.Green,
-                            Text = "Hello World",
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var initial = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(initial);
-
-                var initialBackgroundNode = initial.FindNode(border).Children[0];
-                var initialTextNode = initial.FindNode(textBlock).DrawOperations[0];
-
-                Assert.NotNull(initialBackgroundNode);
-                Assert.NotNull(initialTextNode);
-
-                border.Background = Brushes.Green;
-
-                var result = initial.CloneScene();
-                sceneBuilder.Update(result, border);
-
-                var borderNode = (VisualNode)result.Root.Children[0];
-                Assert.Same(border, borderNode.Visual);
-
-                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0].Item;
-                Assert.NotSame(initialBackgroundNode, backgroundNode);
-                Assert.Equal(Brushes.Green, backgroundNode.Brush);
-
-                var textBlockNode = (VisualNode)borderNode.Children[0];
-                Assert.Same(textBlock, textBlockNode.Visual);
-
-                var textNode = (GlyphRunNode)textBlockNode.DrawOperations[0].Item;
-                Assert.Same(initialTextNode.Item, textNode);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_When_Control_Added()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = border = new Border
-                    {
-                        Background = Brushes.Red,
-                    }
-                };
-
-                Canvas canvas;
-                var decorator = new Decorator
-                {
-                    Child = canvas = new Canvas(),
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var initial = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(initial);
-
-                border.Child = decorator;
-                var result = initial.CloneScene();
-
-                Assert.True(sceneBuilder.Update(result, decorator));
-
-                // Updating canvas should result in no-op as it should have been updated along 
-                // with decorator as part of the add opeation.
-                Assert.False(sceneBuilder.Update(result, canvas));
-
-                var borderNode = (VisualNode)result.Root.Children[0];
-                Assert.Equal(1, borderNode.Children.Count);
-                Assert.Equal(1, borderNode.DrawOperations.Count);
-
-                var decoratorNode = (VisualNode)borderNode.Children[0];
-                Assert.Same(decorator, decoratorNode.Visual);
-                Assert.Same(decoratorNode, result.FindNode(decorator));
-
-                var canvasNode = (VisualNode)decoratorNode.Children[0];
-                Assert.Same(canvas, canvasNode.Visual);
-                Assert.Same(canvasNode, result.FindNode(canvas));
-            }
-        }
-
-        [Fact]
-        public void Should_Update_When_Control_Removed()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Border border;
-                Decorator decorator;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = border = new Border
-                    {
-                        Background = Brushes.Red,
-                        Child = decorator = new Decorator
-                        {
-                            Child = canvas = new Canvas
-                            {
-                                Background = Brushes.AliceBlue,
-                            }
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var initial = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(initial);
-
-                border.Child = null;
-                var result = initial.CloneScene();
-
-                Assert.True(sceneBuilder.Update(result, decorator));
-                Assert.False(sceneBuilder.Update(result, canvas));
-
-                var borderNode = (VisualNode)result.Root.Children[0];
-                Assert.Equal(0, borderNode.Children.Count);
-                Assert.Equal(1, borderNode.DrawOperations.Count);
-
-                Assert.Null(result.FindNode(decorator));
-                Assert.Equal(new Rect(0, 0, 100, 100), result.Layers.Single().Dirty.Single());
-            }
-        }
-
-        [Fact]
-        public void Should_Update_When_Control_Moved()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator moveFrom;
-                Decorator moveTo;
-                Canvas moveMe;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = new StackPanel
-                    {
-                        Children =
-                        {
-                            (moveFrom = new Decorator
-                            {
-                                Child = moveMe = new Canvas(),
-                            }),
-                            (moveTo = new Decorator()),
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
-                var moveToNode = (VisualNode)scene.FindNode(moveTo);
-
-                Assert.Equal(1, moveFromNode.Children.Count);
-                Assert.Same(moveMe, moveFromNode.Children[0].Visual);
-                Assert.Empty(moveToNode.Children);
-
-                moveFrom.Child = null;
-                moveTo.Child = moveMe;
-
-                scene = scene.CloneScene();
-                moveFromNode = (VisualNode)scene.FindNode(moveFrom);
-                moveToNode = (VisualNode)scene.FindNode(moveTo);
-
-                moveFromNode.SortChildren(scene);
-                moveToNode.SortChildren(scene);
-                sceneBuilder.Update(scene, moveFrom);
-                sceneBuilder.Update(scene, moveTo);
-                sceneBuilder.Update(scene, moveMe);
-
-                Assert.Empty(moveFromNode.Children);
-                Assert.Equal(1, moveToNode.Children.Count);
-                Assert.Same(moveMe, moveToNode.Children[0].Visual);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_When_Control_Made_Invisible()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = decorator = new Decorator
-                    {
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Child = canvas = new Canvas(),
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var initial = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(initial);
-
-                border.IsVisible = false;
-                var result = initial.CloneScene();
-
-                Assert.True(sceneBuilder.Update(result, border));
-                Assert.False(sceneBuilder.Update(result, canvas));
-
-                var decoratorNode = (VisualNode)result.Root.Children[0];
-                Assert.Equal(0, decoratorNode.Children.Count);
-
-                Assert.Null(result.FindNode(border));
-                Assert.Null(result.FindNode(canvas));
-                Assert.Equal(new Rect(0, 0, 100, 100), result.Layers.Single().Dirty.Single());
-            }
-        }
-
-        [Fact]
-        public void Should_Not_Dispose_Active_VisualNode_When_Control_Reparented_And_Child_Made_Invisible()
-        {
-            // Issue #3115
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                StackPanel panel;
-                Border border1;
-                Border border2;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = panel = new StackPanel
-                    {
-                        Children =
-                        {
-                            (border1 = new Border
-                            {
-                                Background = Brushes.Red,
-                            }),
-                            (border2 = new Border
-                            {
-                                Background = Brushes.Green,
-                            }),
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var decorator = new Decorator();
-                tree.Child = null;
-                decorator.Child = panel;
-                tree.Child = decorator;
-                border1.IsVisible = false;
-
-                scene = scene.CloneScene();
-                sceneBuilder.Update(scene, decorator);
-
-                var panelNode = (VisualNode)scene.FindNode(panel);
-                Assert.Equal(2, panelNode.Children.Count);
-                Assert.False(panelNode.Children[0].Disposed);
-                Assert.False(panelNode.Children[1].Disposed);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_ClipBounds_For_Negative_Margin()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = decorator = new Decorator
-                    {
-                        Margin = new Thickness(0, 10, 0, 0),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            ClipToBounds = true,
-                            Margin = new Thickness(0, -5, 0, 0),
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var borderNode = scene.FindNode(border);
-                Assert.Equal(new Rect(0, 5, 100, 95), borderNode.ClipBounds);
-
-                border.Margin = new Thickness(0, -8, 0, 0);
-                layout.ExecuteLayoutPass();
-
-                scene = scene.CloneScene();
-                sceneBuilder.Update(scene, border);
-
-                borderNode = scene.FindNode(border);
-                Assert.Equal(new Rect(0, 2, 100, 98), borderNode.ClipBounds);
-            }
-        }
-
-        [Fact]
-        public void Should_Update_Descendent_Tranform_When_Margin_Changed()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = decorator = new Decorator
-                    {
-                        Margin = new Thickness(0, 10, 0, 0),
-                        Child = border = new Border
-                        {
-                            Child = canvas = new Canvas(),
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var borderNode = scene.FindNode(border);
-                var canvasNode = scene.FindNode(canvas);
-                Assert.Equal(Matrix.CreateTranslation(0, 10), borderNode.Transform);
-                Assert.Equal(Matrix.CreateTranslation(0, 10), canvasNode.Transform);
-
-                decorator.Margin = new Thickness(0, 20, 0, 0);
-                layout.ExecuteLayoutPass();
-
-                scene = scene.CloneScene();
-                sceneBuilder.Update(scene, decorator);
-
-                borderNode = scene.FindNode(border);
-                canvasNode = scene.FindNode(canvas);
-                Assert.Equal(Matrix.CreateTranslation(0, 20), borderNode.Transform);
-                Assert.Equal(Matrix.CreateTranslation(0, 20), canvasNode.Transform);
-            }
-        }
-
-        [Fact]
-        public void DirtyRects_Should_Contain_Old_And_New_Bounds_When_Margin_Changed()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Width = 100,
-                    Height = 100,
-                    Child = decorator = new Decorator
-                    {
-                        Margin = new Thickness(0, 10, 0, 0),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Child = canvas = new Canvas(),
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var borderNode = scene.FindNode(border);
-                var canvasNode = scene.FindNode(canvas);
-                Assert.Equal(Matrix.CreateTranslation(0, 10), borderNode.Transform);
-                Assert.Equal(Matrix.CreateTranslation(0, 10), canvasNode.Transform);
-
-                decorator.Margin = new Thickness(0, 20, 0, 0);
-                layout.ExecuteLayoutPass();
-
-                scene = scene.CloneScene();
-
-                sceneBuilder.Update(scene, decorator);
-
-                var rects = scene.Layers.Single().Dirty.ToArray();
-                Assert.Equal(new[] { new Rect(0, 10, 100, 90) }, rects);
-            }
-        }
-
-        [Fact]
-        public void Resizing_Scene_Should_Add_DirtyRects()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Child = decorator = new Decorator
-                    {
-                        Margin = new Thickness(0, 10, 0, 0),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Child = canvas = new Canvas(),
-                        }
-                    }
-                };
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                Assert.Equal(new Size(100, 100), scene.Size);
-
-                tree.ClientSize = new Size(110, 120);
-                scene = scene.CloneScene();
-                sceneBuilder.Update(scene, tree);
-
-                Assert.Equal(new Size(110, 120), scene.Size);
-
-                var expected = new[]
-                {
-                    new Rect(100, 0, 10, 100),
-                    new Rect(0, 100, 110, 20),
-                };
-
-                Assert.Equal(expected, scene.Layers[tree].Dirty.ToArray());
-                
-                // Layers are disabled. See #2244
-                // Assert.Equal(expected, scene.Layers[border].Dirty.ToArray());
-            }
-        }
-
-        [Fact]
-        public void Setting_Opacity_Should_Add_Descendent_Bounds_To_DirtyRects()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                var tree = new TestRoot
-                {
-                    Child = decorator = new Decorator
-                    {
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Width = 100,
-                            Height = 100,
-                        }
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(tree.DesiredSize));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                decorator.Opacity = 0.5;
-                scene = scene.CloneScene();
-                sceneBuilder.Update(scene, decorator);
-
-                Assert.NotEmpty(scene.Layers.Single().Dirty);
-                var dirty = scene.Layers.Single().Dirty.Single();
-                Assert.Equal(new Rect(0, 0, 100, 100), dirty);
-            }
-        }
-
-        [Fact]
-        public void Should_Set_GeometryClip()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var clip = StreamGeometry.Parse("M100,0 L0,100 100,100");
-                Decorator decorator;
-                var tree = new TestRoot
-                {
-                    Child = decorator = new Decorator
-                    {
-                        Clip = clip,
-                    }
-                };
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var decoratorNode = scene.FindNode(decorator);
-                Assert.Same(clip.PlatformImpl, decoratorNode.GeometryClip);
-            }
-        }
-
-        [Fact]
-        public void Disposing_Scene_Releases_DrawOperation_References()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>(
-                    x => x.PixelSize == new PixelSize(100, 100) &&
-                    x.Dpi == new Vector(96, 96)));
-
-                Image img;
-                var tree = new TestRoot
-                {
-                    Child = img = new Image
-                    {
-                        Source = new Bitmap(bitmap),
-                        Height = 100,
-                        Width = 100
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(new Size(100, 100)));
-
-                Assert.Equal(2, bitmap.RefCount);
-                IRef<IDrawOperation> operation;
-
-                using (var scene = new Scene(tree))
-                {
-                    var sceneBuilder = new SceneBuilder();
-                    sceneBuilder.UpdateAll(scene);
-                    operation = scene.FindNode(img).DrawOperations[0];
-                    Assert.Equal(1, operation.RefCount);
-
-                    Assert.Equal(3, bitmap.RefCount);
-                }
-                Assert.Equal(0, operation.RefCount);
-                Assert.Equal(2, bitmap.RefCount);
-            }
-        }
-
-        [Fact]
-        public void Replacing_Control_Releases_DrawOperation_Reference()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>(
-                    x => x.PixelSize == new PixelSize(100, 100) &&
-                    x.Dpi == new Vector(96, 96)));
-
-                Image img;
-                var tree = new TestRoot
-                {
-                    Child = img = new Image
-                    {
-                        Source = new Bitmap(bitmap),
-                        Width = 100,
-                        Height = 100
-                    }
-                };
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(new Size(100, 100)));
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var operation = scene.FindNode(img).DrawOperations[0];
-
-                tree.Child = new Decorator();
-
-                using (var result = scene.CloneScene())
-                {
-                    sceneBuilder.Update(result, img);
-                    scene.Dispose();
-
-                    Assert.Equal(0, operation.RefCount);
-                    Assert.Equal(2, bitmap.RefCount);
-                }
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
deleted file mode 100644
index 19b4c7e606..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-using Avalonia.Layout;
-using System.Reactive.Subjects;
-using Avalonia.Data;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{
-    public partial class SceneBuilderTests
-    {
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Control_With_Animated_Opacity_And_Children_Should_Start_New_Layer()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Padding = new Thickness(10),
-                    Width = 100,
-                    Height = 120,
-                    Child = decorator = new Decorator
-                    {
-                        Padding = new Thickness(11),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Padding = new Thickness(12),
-                            Child = canvas = new Canvas()
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var rootNode = (VisualNode)scene.Root;
-                var borderNode = (VisualNode)scene.FindNode(border);
-                var canvasNode = (VisualNode)scene.FindNode(canvas);
-
-                Assert.Same(tree, rootNode.LayerRoot);
-                Assert.Same(border, borderNode.LayerRoot);
-                Assert.Same(border, canvasNode.LayerRoot);
-                Assert.Equal(0.5, scene.Layers[border].Opacity);
-
-                Assert.Equal(2, scene.Layers.Count());
-                Assert.Empty(scene.Layers.Select(x => x.LayerRoot).Except(new IVisual[] { tree, border }));
-
-                animation.OnCompleted();
-                scene = scene.CloneScene();
-
-                sceneBuilder.Update(scene, border);
-
-                rootNode = (VisualNode)scene.Root;
-                borderNode = (VisualNode)scene.FindNode(border);
-                canvasNode = (VisualNode)scene.FindNode(canvas);
-
-                Assert.Same(tree, rootNode.LayerRoot);
-                Assert.Same(tree, borderNode.LayerRoot);
-                Assert.Same(tree, canvasNode.LayerRoot);
-                Assert.Single(scene.Layers);
-
-                var rootDirty = scene.Layers[tree].Dirty;
-
-                Assert.Single(rootDirty);
-                Assert.Equal(new Rect(21, 21, 58, 78), rootDirty.Single());
-            }
-        }
-
-        [Fact]
-        public void Control_With_Animated_Opacity_And_No_Children_Should_Not_Start_New_Layer()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                var tree = new TestRoot
-                {
-                    Padding = new Thickness(10),
-                    Width = 100,
-                    Height = 120,
-                    Child = decorator = new Decorator
-                    {
-                        Padding = new Thickness(11),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                Assert.Single(scene.Layers);
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Removing_Control_With_Animated_Opacity_Should_Remove_Layers()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Padding = new Thickness(10),
-                    Width = 100,
-                    Height = 120,
-                    Child = decorator = new Decorator
-                    {
-                        Padding = new Thickness(11),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Padding = new Thickness(12),
-                            Child = canvas = new Canvas
-                            {
-                                Children = { new TextBlock() },
-                            }
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-                canvas.Bind(Canvas.OpacityProperty, animation, BindingPriority.Animation);
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                Assert.Equal(3, scene.Layers.Count);
-
-                decorator.Child = null;
-                scene = scene.CloneScene();
-
-                sceneBuilder.Update(scene, border);
-
-                Assert.Equal(1, scene.Layers.Count);
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void Hiding_Transparent_Control_Should_Remove_Layers()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Padding = new Thickness(10),
-                    Width = 100,
-                    Height = 120,
-                    Child = decorator = new Decorator
-                    {
-                        Padding = new Thickness(11),
-                        Child = border = new Border
-                        {
-                            Background = Brushes.Red,
-                            Padding = new Thickness(12),
-                            Child = canvas = new Canvas
-                            {
-                                Children = { new TextBlock() },
-                            }
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-                canvas.Bind(Canvas.OpacityProperty, animation, BindingPriority.Animation);
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                Assert.Equal(3, scene.Layers.Count);
-
-                border.IsVisible = false;
-                scene = scene.CloneScene();
-
-                sceneBuilder.Update(scene, border);
-
-                Assert.Equal(1, scene.Layers.Count);
-            }
-        }
-
-        [Fact(Skip = "Layers are disabled. See #2244")]
-        public void GeometryClip_Should_Affect_Child_Layers()
-        {
-            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
-            {
-                var clip = StreamGeometry.Parse("M100,0 L0,100 100,100");
-                Decorator decorator;
-                Border border;
-                var tree = new TestRoot
-                {
-                    Child = decorator = new Decorator
-                    {
-                        Clip = clip,
-                        Margin = new Thickness(12, 16),
-                        Child = border = new Border
-                        {
-                            Opacity = 0.5,
-                            Child = new Canvas(),
-                        }
-                    }
-                };
-
-                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass();
-
-                var animation = new BehaviorSubject<double>(0.5);
-                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
-
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var borderLayer = scene.Layers[border];
-                Assert.Equal(
-                    Matrix.CreateTranslation(12, 16),
-                    ((MockStreamGeometryImpl)borderLayer.GeometryClip).Transform);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneLayersTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneLayersTests.cs
deleted file mode 100644
index fac6e1ceb6..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneLayersTests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{
-    public class SceneLayersTests
-    {
-        [Fact]
-        public void Layers_Should_Be_Ordered()
-        {
-            Border border;
-            Decorator decorator;
-            var root = new TestRoot
-            {
-                Child = border = new Border
-                {
-                    Child = decorator = new Decorator(),
-                }
-            };
-
-            var target = new SceneLayers(root);
-            target.Add(root);
-            target.Add(decorator);
-            target.Add(border);
-
-            var result = target.Select(x => x.LayerRoot).ToArray();
-
-            Assert.Equal(new IVisual[] { root, border, decorator }, result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneTests.cs
deleted file mode 100644
index bba0c8b8f3..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{
-    public class SceneTests
-    {
-        [Fact]
-        public void Cloning_Scene_Should_Retain_Layers_But_Not_DirtyRects()
-        {
-            Decorator decorator;
-            var tree = new TestRoot
-            {
-                Child = decorator = new Decorator(),
-            };
-
-            var scene = new Scene(tree);
-            scene.Layers.Add(tree);
-            scene.Layers.Add(decorator);
-
-            scene.Layers[tree].Dirty.Add(new Rect(0, 0, 100, 100));
-            scene.Layers[decorator].Dirty.Add(new Rect(0, 0, 50, 100));
-
-            scene = scene.CloneScene();
-            Assert.Equal(2, scene.Layers.Count());
-            Assert.Empty(scene.Layers[0].Dirty);
-            Assert.Empty(scene.Layers[1].Dirty);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs
deleted file mode 100644
index 4ec3630053..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Utilities;
-using Avalonia.VisualTree;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
-{
-    public class VisualNodeTests
-    {
-        [Fact]
-        public void Empty_Children_Collections_Should_Be_Shared()
-        {
-            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
-            var node2 = new VisualNode(Mock.Of<IVisual>(), null);
-
-            Assert.Same(node1.Children, node2.Children);
-        }
-
-        [Fact]
-        public void Adding_Child_Should_Create_Collection()
-        {
-            var node = new VisualNode(Mock.Of<IVisual>(), null);
-            var collection = node.Children;
-
-            node.AddChild(Mock.Of<IVisualNode>(x => x.Parent == node));
-
-            Assert.NotSame(collection, node.Children);
-        }
-
-        [Fact]
-        public void Empty_DrawOperations_Collections_Should_Be_Shared()
-        {
-            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
-            var node2 = new VisualNode(Mock.Of<IVisual>(), null);
-
-            Assert.Same(node1.DrawOperations, node2.DrawOperations);
-        }
-
-        [Fact]
-        public void Adding_DrawOperation_Should_Create_Collection()
-        {
-            var node = new VisualNode(Mock.Of<IVisual>(), null);
-            var collection = node.DrawOperations;
-
-            node.AddDrawOperation(RefCountable.Create(Mock.Of<IDrawOperation>()));
-
-            Assert.NotSame(collection, node.DrawOperations);
-        }
-
-        [Fact]
-        public void Cloned_Nodes_Should_Share_DrawOperations_Collection()
-        {
-            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
-            node1.AddDrawOperation(RefCountable.Create(Mock.Of<IDrawOperation>()));
-
-            var node2 = node1.Clone(null);
-
-            Assert.Same(node1.DrawOperations, node2.DrawOperations);
-        }
-
-        [Fact]
-        public void Adding_DrawOperation_To_Cloned_Node_Should_Create_New_Collection()
-        {
-            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
-            var operation1 = RefCountable.Create(Mock.Of<IDrawOperation>());
-            node1.AddDrawOperation(operation1);
-
-            var node2 = node1.Clone(null);
-            var operation2 = RefCountable.Create(Mock.Of<IDrawOperation>());
-            node2.ReplaceDrawOperation(0, operation2);
-
-            Assert.NotSame(node1.DrawOperations, node2.DrawOperations);
-            Assert.Equal(1, node1.DrawOperations.Count);
-            Assert.Equal(1, node2.DrawOperations.Count);
-            Assert.Same(operation1.Item, node1.DrawOperations[0].Item);
-            Assert.Same(operation2.Item, node2.DrawOperations[0].Item);
-        }
-
-        [Fact]
-        public void DrawOperations_In_Cloned_Node_Are_Cloned()
-        {
-            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
-            var operation1 = RefCountable.Create(Mock.Of<IDrawOperation>());
-            node1.AddDrawOperation(operation1);
-
-            var node2 = node1.Clone(null);
-            var operation2 = RefCountable.Create(Mock.Of<IDrawOperation>());
-            node2.AddDrawOperation(operation2);
-            
-            Assert.Same(node1.DrawOperations[0].Item, node2.DrawOperations[0].Item);
-            Assert.NotSame(node1.DrawOperations[0], node2.DrawOperations[0]);
-        }
-
-        [Fact]
-        public void SortChildren_Does_Not_Throw_On_Null_Children()
-        {
-            var node = new VisualNode(Mock.Of<IVisual>(), null);
-            var scene = new Scene(Mock.Of<IVisual>());
-
-            node.SortChildren(scene);
-        }
-
-        [Fact]
-        public void TrimChildren_Should_Work_Correctly()
-        {
-            var parent = new VisualNode(Mock.Of<IVisual>(), null);
-            var child1 = new VisualNode(Mock.Of<IVisual>(), parent);
-            var child2 = new VisualNode(Mock.Of<IVisual>(), parent);
-            var child3 = new VisualNode(Mock.Of<IVisual>(), parent);
-
-            parent.AddChild(child1);
-            parent.AddChild(child2);
-            parent.AddChild(child3);
-            parent.TrimChildren(2);
-
-            Assert.Equal(2, parent.Children.Count);
-            Assert.False(child1.Disposed);
-            Assert.False(child2.Disposed);
-            Assert.True(child3.Disposed);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/Utilities/TileBrushCalculatorTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/Utilities/TileBrushCalculatorTests.cs
deleted file mode 100644
index 8d70b45842..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/Utilities/TileBrushCalculatorTests.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Rendering.Utilities;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Rendering.Utilities
-{
-    public class TileBrushCalculatorTests
-    {
-        [Fact]
-        public void NoTile_Fill_1x()
-        {
-            var result = new TileBrushCalculator(
-                TileMode.None,
-                Stretch.Fill,
-                AlignmentX.Center,
-                AlignmentY.Center,
-                RelativeRect.Fill,
-                RelativeRect.Fill,
-                new Size(100, 100),
-                new Size(100, 100));
-
-            Assert.False(result.NeedsIntermediate);
-            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
-            Assert.Equal(new Rect(0, 0, 100, 100), result.DestinationRect);
-        }
-
-        [Fact]
-        public void NoTile_Fill_2x()
-        {
-            var result = new TileBrushCalculator(
-                TileMode.None,
-                Stretch.Fill,
-                AlignmentX.Center,
-                AlignmentY.Center,
-                RelativeRect.Fill,
-                RelativeRect.Fill,
-                new Size(100, 100),
-                new Size(200, 200));
-
-            // TODO: This doesn't need an intermediate render target.
-            Assert.True(result.NeedsIntermediate);
-            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
-            Assert.Equal(new Rect(0, 0, 200, 200), result.DestinationRect);
-        }
-
-        [Fact]
-        public void NoTile_Uniform_CenterHoriz()
-        {
-            var result = new TileBrushCalculator(
-                TileMode.None,
-                Stretch.Uniform,
-                AlignmentX.Center,
-                AlignmentY.Center,
-                RelativeRect.Fill,
-                RelativeRect.Fill,
-                new Size(100, 100),
-                new Size(200, 100));
-
-            Assert.True(result.NeedsIntermediate);
-            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
-            Assert.Equal(new Rect(0, 0, 200, 100), result.DestinationRect);
-            Assert.Equal(new Size(200, 100), result.IntermediateSize);
-            Assert.Equal(Matrix.CreateTranslation(50, 0), result.IntermediateTransform);
-        }
-
-        [Fact]
-        public void NoTile_Uniform_CenterVert()
-        {
-            var result = new TileBrushCalculator(
-                TileMode.None,
-                Stretch.Uniform,
-                AlignmentX.Center,
-                AlignmentY.Center,
-                RelativeRect.Fill,
-                RelativeRect.Fill,
-                new Size(100, 100),
-                new Size(100, 200));
-
-            Assert.True(result.NeedsIntermediate);
-            Assert.Equal(new Rect(0, 0, 100, 100), result.SourceRect);
-            Assert.Equal(new Rect(0, 0, 100, 200), result.DestinationRect);
-            Assert.Equal(new Size(100, 200), result.IntermediateSize);
-            Assert.Equal(Matrix.CreateTranslation(0, 50), result.IntermediateTransform);
-        }
-
-        [Fact]
-        public void NoTile_NoStretch_BottomRightQuarterDest()
-        {
-            var result = new TileBrushCalculator(
-                TileMode.None,
-                Stretch.None,
-                AlignmentX.Center,
-                AlignmentY.Center,
-                RelativeRect.Fill,
-                new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
-                new Size(800, 800),
-                new Size(400, 400));
-
-            Assert.True(result.NeedsIntermediate);
-            Assert.Equal(new Rect(0, 0, 800, 800), result.SourceRect);
-            Assert.Equal(new Rect(200, 200, 200, 200), result.DestinationRect);
-            Assert.Equal(new Size(400, 400), result.IntermediateSize);
-            Assert.Equal(new Rect(200, 200, 200, 200), result.IntermediateClip);
-            Assert.Equal(Matrix.CreateTranslation(-100, -100), result.IntermediateTransform);
-        }
-
-        [Fact]
-        public void Tile_NoStretch_BottomRightQuarterSource_CenterQuarterDest()
-        {
-            var result = new TileBrushCalculator(
-                TileMode.Tile,
-                Stretch.None,
-                AlignmentX.Center,
-                AlignmentY.Center,
-                new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
-                new RelativeRect(0.25, 0.25, 0.5, 0.5, RelativeUnit.Relative),
-                new Size(800, 800),
-                new Size(400, 400));
-
-            var b = new VisualBrush
-            {
-                TileMode = TileMode.Tile,
-                Stretch = Stretch.None,
-                SourceRect = new RelativeRect(0.5, 0.5, 0.5, 0.5, RelativeUnit.Relative),
-                DestinationRect = new RelativeRect(0.25, 0.25, 0.5, 0.5, RelativeUnit.Relative),
-                Visual = new Border { Width = 400, Height = 400 },
-            };
-
-            Assert.True(result.NeedsIntermediate);
-            Assert.Equal(new Rect(400, 400, 400, 400), result.SourceRect);
-            Assert.Equal(new Rect(100, 100, 200, 200), result.DestinationRect);
-            Assert.Equal(new Size(200, 200), result.IntermediateSize);
-            Assert.Equal(new Rect(0, 0, 200, 200), result.IntermediateClip);
-            Assert.Equal(Matrix.CreateTranslation(-500, -500), result.IntermediateTransform);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/SizeTests.cs b/tests/Avalonia.Visuals.UnitTests/SizeTests.cs
deleted file mode 100644
index 96197785b9..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/SizeTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class SizeTests
-    {
-        [Fact]
-        public void Should_Produce_Correct_Aspect_Ratio()
-        {
-            var result = new Size(3, 2).AspectRatio;
-
-            Assert.Equal(1.5, result);
-        }
-
-        [Fact]
-        public void Dividing_Should_Produce_Scaling_Factor()
-        {
-            var result = new Size(15, 10) / new Size(5, 5);
-
-            Assert.Equal(new Vector(3, 2), result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/TestVisual.cs b/tests/Avalonia.Visuals.UnitTests/TestVisual.cs
deleted file mode 100644
index 29d61ddefc..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/TestVisual.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Rendering;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class ParamEventArgs<T> : EventArgs
-    {
-        public ParamEventArgs(T param)
-        {
-            Param = param;
-        }
-
-        public T Param { get; set; }
-    }
-
-    public class TestVisual : Visual
-    {
-        public IVisual Child
-        {
-            get
-            {
-                return ((IVisual)this).VisualChildren.FirstOrDefault();
-            }
-
-            set
-            {
-                if (Child != null)
-                {
-                    VisualChildren.Remove(Child);
-                }
-
-                if (value != null)
-                {
-                    VisualChildren.Add(value);
-                }
-            }
-        }
-
-        public void AddChild(Visual v)
-        {
-            VisualChildren.Add(v);
-        }
-
-        public void AddChildren(IEnumerable<Visual> v)
-        {
-            VisualChildren.AddRange(v);
-        }
-
-        public void RemoveChild(Visual v)
-        {
-            VisualChildren.Remove(v);
-        }
-
-        public void ClearChildren()
-        {
-            VisualChildren.Clear();
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs b/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
deleted file mode 100644
index e85a9d5b85..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Globalization;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class ThicknessTests
-    {
-        [Fact]
-        public void Parse_Parses_Single_Uniform_Size()
-        {
-            var result = Thickness.Parse("1.2");
-
-            Assert.Equal(new Thickness(1.2), result);
-        }
-
-        [Fact]
-        public void Parse_Parses_Horizontal_Vertical()
-        {
-            var result = Thickness.Parse("1.2,3.4");
-
-            Assert.Equal(new Thickness(1.2, 3.4), result);
-        }
-
-        [Fact]
-        public void Parse_Parses_Left_Top_Right_Bottom()
-        {
-            var result = Thickness.Parse("1.2, 3.4, 5, 6");
-
-            Assert.Equal(new Thickness(1.2, 3.4, 5, 6), result);
-        }
-
-        [Fact]
-        public void Parse_Accepts_Spaces()
-        {
-            var result = Thickness.Parse("1.2 3.4 5 6");
-
-            Assert.Equal(new Thickness(1.2, 3.4, 5, 6), result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/Avalonia.Visuals.UnitTests/Utilities/ReadOnlySpanTests.cs b/tests/Avalonia.Visuals.UnitTests/Utilities/ReadOnlySpanTests.cs
deleted file mode 100644
index 1afd84e546..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/Utilities/ReadOnlySpanTests.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Linq;
-using Avalonia.Utilities;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.Utilities
-{
-    public class ReadOnlySpanTests
-    {
-        [Fact]
-        public void Should_Skip()
-        {
-            var buffer = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            var slice = new ReadOnlySlice<int>(buffer);
-
-            var skipped = slice.Skip(2);
-
-            var expected = buffer.Skip(2);
-
-            Assert.Equal(expected, skipped);
-        }
-
-        [Fact]
-        public void Should_Take()
-        {
-            var buffer = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            var slice = new ReadOnlySlice<int>(buffer);
-
-            var taken = slice.Take(8);
-
-            var expected = buffer.Take(8);
-
-            Assert.Equal(expected, taken);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/VectorTests.cs b/tests/Avalonia.Visuals.UnitTests/VectorTests.cs
deleted file mode 100644
index f9a9e59436..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/VectorTests.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using Xunit;
-using Avalonia;
-using System;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class VectorTests
-    {
-        [Fact]
-        public void Length_Should_Return_Correct_Length_Of_Vector()
-        {
-            var vector = new Vector(2, 4);
-            var length = Math.Sqrt(2 * 2 + 4 * 4);
-
-            Assert.Equal(length, vector.Length);
-        }
-
-        [Fact]
-        public void Length_Squared_Should_Return_Correct_Length_Of_Vector()
-        {
-            var vectorA = new Vector(2, 4);
-            var squaredLengthA = 2 * 2 + 4 * 4;
-
-            Assert.Equal(squaredLengthA, vectorA.SquaredLength);
-        }
-
-        [Fact]
-        public void Normalize_Should_Return_Normalized_Vector()
-        {
-            // the length of a normalized vector must be 1
-
-            var vectorA = new Vector(13, 84);
-            var vectorB = new Vector(-34, 345);
-            var vectorC = new Vector(-34, -84);
-
-            Assert.Equal(1.0, vectorA.Normalize().Length);
-            Assert.Equal(1.0, vectorB.Normalize().Length);
-            Assert.Equal(1.0, vectorC.Normalize().Length);
-        }
-
-        [Fact]
-        public void Negate_Should_Return_Negated_Vector()
-        {
-            var vector = new Vector(2, 4);
-            var negated = new Vector(-2, -4);
-
-            Assert.Equal(negated, vector.Negate());
-        }
-
-        [Fact]
-        public void Dot_Should_Return_Correct_Value()
-        {
-            var a = new Vector(-6, 8.0);
-            var b = new Vector(5, 12.0);
-
-            Assert.Equal(66.0, Vector.Dot(a, b));
-        }
-
-        [Fact]
-        public void Cross_Should_Return_Correct_Value()
-        {
-            var a = new Vector(-6, 8.0);
-            var b = new Vector(5, 12.0);
-
-            Assert.Equal(-112.0, Vector.Cross(a, b));
-        }
-
-        [Fact]
-        public void Divied_By_Vector_Should_Return_Correct_Value()
-        {
-            var a = new Vector(10, 2);
-            var b = new Vector(5, 2);
-
-            var expected = new Vector(2, 1);
-
-            Assert.Equal(expected, Vector.Divide(a, b));
-        }
-
-        [Fact]
-        public void Divied_Should_Return_Correct_Value()
-        {
-            var vector = new Vector(10, 2);
-            var expected = new Vector(5, 1);
-
-            Assert.Equal(expected, Vector.Divide(vector, 2));
-        }
-
-        [Fact]
-        public void Multiply_By_Vector_Should_Return_Correct_Value()
-        {
-            var a = new Vector(10, 2);
-            var b = new Vector(2, 2);
-
-            var expected = new Vector(20, 4);
-
-            Assert.Equal(expected, Vector.Multiply(a, b));
-        }
-
-        [Fact]
-        public void Multiply_Should_Return_Correct_Value()
-        {
-            var vector = new Vector(10, 2);
-
-            var expected = new Vector(20, 4);
-
-            Assert.Equal(expected, Vector.Multiply(vector, 2));
-        }
-
-        [Fact]
-        public void Scale_Vector_Should_Be_Commutative()
-        {
-            var vector = new Vector(10, 2);
-
-            var expected = vector * 2;
-
-            Assert.Equal(expected, 2 * vector);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualExtensionsTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualExtensionsTests.cs
deleted file mode 100644
index 781169cfa6..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/VisualExtensionsTests.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class VisualExtensionsTests
-    {
-        [Fact]
-        public void FindAncestorOfType_Finds_Direct_Parent()
-        {
-            StackPanel target;
-
-            var root = new TestRoot
-            {
-                Child = target = new StackPanel()
-            };
-
-            Assert.Equal(root, target.FindAncestorOfType<TestRoot>());
-        }
-
-        [Fact]
-        public void FindAncestorOfType_Finds_Ancestor_Of_Nested_Child()
-        {
-            Button target;
-
-            var root = new TestRoot
-            {
-                Child = new StackPanel
-                {
-                    Children =
-                    {
-                        new StackPanel
-                        {
-                            Children =
-                            {
-                                (target = new Button())
-                            }
-                        }
-                    }
-                }
-            };
-
-            Assert.Equal(root, target.FindAncestorOfType<TestRoot>());
-        }
-
-        [Fact]
-        public void FindDescendantOfType_Finds_Direct_Child()
-        {
-            StackPanel target;
-
-            var root = new TestRoot
-            {
-                Child = target = new StackPanel()
-            };
-
-            Assert.Equal(target, root.FindDescendantOfType<StackPanel>());
-        }
-
-        [Fact]
-        public void FindDescendantOfType_Finds_Nested_Child()
-        {
-            Button target;
-
-            var root = new TestRoot
-            {
-                Child = new StackPanel
-                {
-                    Children =
-                    {
-                        new StackPanel
-                        {
-                            Children =
-                            {
-                                (target = new Button())
-                            }
-                        }
-                    }
-                }
-            };
-
-            Assert.Equal(target, root.FindDescendantOfType<Button>());
-        }
-
-        [Fact]
-        public void FindCommonVisualAncestor_First_Is_Parent_Of_Second()
-        {
-            Control left, right;
-
-            var root = new TestRoot
-            {
-                Child = left = new Decorator
-                {
-                    Child = right = new Decorator()
-                }
-            };
-
-            var ancestor = left.FindCommonVisualAncestor(right);
-            Assert.Equal(left, ancestor);
-
-            ancestor = right.FindCommonVisualAncestor(left);
-            Assert.Equal(left, ancestor);
-        }
-
-        [Fact]
-        public void FindCommonVisualAncestor_Two_Subtrees_Uniform_Height()
-        {
-            Control left, right;
-
-            var root = new TestRoot
-            {
-                Child = new StackPanel
-                {
-                    Children =
-                    {
-                        new Decorator
-                        {
-                            Child = new Decorator
-                            {
-                                Child = left = new Decorator()
-                            }
-                        },
-                        new Decorator
-                        {
-                            Child = new Decorator
-                            {
-                                Child = right = new Decorator()
-                            }
-                        }
-                    }
-                }
-            };
-
-            var ancestor = left.FindCommonVisualAncestor(right);
-            Assert.Equal(root.Child, ancestor);
-
-            ancestor = right.FindCommonVisualAncestor(left);
-            Assert.Equal(root.Child, ancestor);
-        }
-
-        [Fact]
-        public void FindCommonVisualAncestor_Two_Subtrees_NonUniform_Height()
-        {
-            Control left, right;
-
-            var root = new TestRoot
-            {
-                Child = new StackPanel
-                {
-                    Children =
-                    {
-                        new Decorator
-                        {
-                            Child = new Decorator
-                            {
-                                Child = left = new Decorator()
-                            }
-                        },
-                        new Decorator
-                        {
-                            Child = new Decorator
-                            {
-                                Child = new Decorator
-                                {
-                                    Child = right = new Decorator()
-                                }
-                            }
-                        }
-                    }
-                }
-            };
-
-            var ancestor = left.FindCommonVisualAncestor(right);
-            Assert.Equal(root.Child, ancestor);
-
-            ancestor = right.FindCommonVisualAncestor(left);
-            Assert.Equal(root.Child, ancestor);
-        }
-
-        [Fact]
-        public void TranslatePoint_Should_Respect_RenderTransforms()
-        {
-            Border target;
-            var root = new TestRoot
-            {
-                Width = 100,
-                Height = 100,
-                Child = new Decorator
-                {
-                    Width = 50,
-                    Height = 50,
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    VerticalAlignment = VerticalAlignment.Center,
-                    RenderTransform = new TranslateTransform(25, 25),
-                    Child = target = new Border(),
-                }
-            };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
-
-            var result = target.TranslatePoint(new Point(0, 0), root);
-
-            Assert.Equal(new Point(50, 50), result);
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
deleted file mode 100644
index 38131fbfca..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Data;
-using Avalonia.Media;
-using Avalonia.Rendering;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Moq;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests
-{
-    public class VisualTests
-    {
-        [Fact]
-        public void Added_Child_Should_Have_VisualParent_Set()
-        {
-            var target = new TestVisual();
-            var child = new Visual();
-
-            target.AddChild(child);
-
-            Assert.Equal(target, child.GetVisualParent());
-        }
-
-        [Fact]
-        public void Added_Child_Should_Notify_VisualParent_Changed()
-        {
-            var target = new TestVisual();
-            var child = new TestVisual();
-            var parents = new List<IVisual>();
-
-            child.GetObservable(Visual.VisualParentProperty).Subscribe(x => parents.Add(x));
-            target.AddChild(child);
-            target.RemoveChild(child);
-
-            Assert.Equal(new IVisual[] { null, target, null }, parents);
-        }
-
-        [Fact]
-        public void Removed_Child_Should_Have_VisualParent_Cleared()
-        {
-            var target = new TestVisual();
-            var child = new Visual();
-
-            target.AddChild(child);
-            target.RemoveChild(child);
-
-            Assert.Null(child.GetVisualParent());
-        }
-
-        [Fact]
-        public void Clearing_Children_Should_Clear_VisualParent()
-        {
-            var children = new[] { new Visual(), new Visual() };
-            var target = new TestVisual();
-
-            target.AddChildren(children);
-            target.ClearChildren();
-
-            var result = children.Select(x => x.GetVisualParent()).ToList();
-
-            Assert.Equal(new Visual[] { null, null }, result);
-        }
-
-        [Fact]
-        public void Adding_Children_Should_Fire_OnAttachedToVisualTree()
-        {
-            var child2 = new Decorator();
-            var child1 = new Decorator { Child = child2 };
-            var root = new TestRoot();
-            var called1 = false;
-            var called2 = false;
-
-            child1.AttachedToVisualTree += (s, e) =>
-            {
-                Assert.Equal(e.Parent, root);
-                Assert.Equal(e.Root, root);
-                called1 = true;
-            };
-
-            child2.AttachedToVisualTree += (s, e) =>
-            {
-                Assert.Equal(e.Parent, root);
-                Assert.Equal(e.Root, root);
-                called2 = true;
-            };
-
-            root.Child = child1;
-
-            Assert.True(called1);
-            Assert.True(called2);
-        }
-
-        [Fact]
-        public void Removing_Children_Should_Fire_OnDetachedFromVisualTree()
-        {
-            var child2 = new Decorator();
-            var child1 = new Decorator { Child = child2 };
-            var root = new TestRoot();
-            var called1 = false;
-            var called2 = false;
-
-            root.Child = child1;
-
-            child1.DetachedFromVisualTree += (s, e) =>
-            {
-                Assert.Equal(e.Parent, root);
-                Assert.Equal(e.Root, root);
-                called1 = true;
-            };
-
-            child2.DetachedFromVisualTree += (s, e) =>
-            {
-                Assert.Equal(e.Parent, root);
-                Assert.Equal(e.Root, root);
-                called2 = true;
-            };
-
-            root.Child = null;
-
-            Assert.True(called1);
-            Assert.True(called2);
-        }
-
-        [Fact]
-        public void Root_Should_Retun_Self_As_VisualRoot()
-        {
-            var root = new TestRoot();
-
-            Assert.Same(root, ((IVisual)root).VisualRoot);
-        }
-
-        [Fact]
-        public void Descendants_Should_RetunVisualRoot()
-        {
-            var root = new TestRoot();
-            var child1 = new Decorator();
-            var child2 = new Decorator();
-
-            root.Child = child1;
-            child1.Child = child2;
-
-            Assert.Same(root, ((IVisual)child1).VisualRoot);
-            Assert.Same(root, ((IVisual)child2).VisualRoot);
-        }
-
-        [Fact]
-        public void Attaching_To_Visual_Tree_Should_Invalidate_Visual()
-        {
-            var renderer = new Mock<IRenderer>();
-            var child = new Decorator();
-            var root = new TestRoot
-            {
-                Renderer = renderer.Object,
-            };
-
-            root.Child = child;
-
-            renderer.Verify(x => x.AddDirty(child));
-        }
-
-        [Fact]
-        public void Detaching_From_Visual_Tree_Should_Invalidate_Visual()
-        {
-            var renderer = new Mock<IRenderer>();
-            var child = new Decorator();
-            var root = new TestRoot
-            {
-                Renderer = renderer.Object,
-            };
-
-            root.Child = child;
-            renderer.Invocations.Clear();
-            root.Child = null;
-
-            renderer.Verify(x => x.AddDirty(child));
-        }
-
-        [Fact]
-        public void Adding_Already_Parented_Control_Should_Throw()
-        {
-            var root1 = new TestRoot();
-            var root2 = new TestRoot();
-            var child = new Canvas();
-
-            root1.Child = child;
-
-            Assert.Throws<InvalidOperationException>(() => root2.Child = child);
-            Assert.Empty(root2.GetVisualChildren());
-        }
-
-        [Fact]
-        public void TransformToVisual_Should_Work()
-        {
-            var child = new Decorator { Width = 100, Height = 100 };
-            var root = new TestRoot() { Child = child, Width = 400, Height = 400 };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(new Point(), root.DesiredSize));
-
-            var tr = child.TransformToVisual(root);
-
-            Assert.NotNull(tr);
-
-            var point = root.Bounds.TopLeft * tr;
-
-            //child is centered (400 - 100)/2
-            Assert.Equal(new Point(150, 150), point);
-        }
-
-        [Fact]
-        public void TransformToVisual_With_RenderTransform_Should_Work()
-        {
-            var child = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                RenderTransform = new ScaleTransform() { ScaleX = 2, ScaleY = 2 }
-            };
-            var root = new TestRoot() { Child = child, Width = 400, Height = 400 };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(new Point(), root.DesiredSize));
-
-            var tr = child.TransformToVisual(root);
-
-            Assert.NotNull(tr);
-
-            var point = root.Bounds.TopLeft * tr;
-
-            //child is centered (400 - 100*2 scale)/2
-            Assert.Equal(new Point(100, 100), point);
-        }
-
-        [Fact]
-        public void TransformToVisual_With_NonInvertible_RenderTransform_Should_Work()
-        {
-            var child = new Decorator
-            {
-                Width = 100,
-                Height = 100,
-                RenderTransform = new ScaleTransform() { ScaleX = 0, ScaleY = 0 }
-            };
-            var root = new TestRoot() { Child = child, Width = 400, Height = 400 };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(new Point(), root.DesiredSize));
-
-            var tr = root.TransformToVisual(child);
-
-            Assert.Null(tr);
-        }
-
-        [Fact]
-        public void Should_Not_Log_Binding_Error_When_Not_Attached_To_Logical_Tree()
-        {
-            var target = new Decorator { DataContext = "foo" };
-            var called = false;
-
-            LogCallback checkLogMessage = (level, area, src, mt, pv) =>
-            {
-                if (level >= Logging.LogEventLevel.Warning)
-                {
-                    called = true;
-                }
-            };
-
-            using (TestLogSink.Start(checkLogMessage))
-            {
-                target.Bind(Decorator.TagProperty, new Binding("Foo"));
-            }
-
-            Assert.False(called);
-        }
-
-        [Fact]
-        public void Should_Log_Binding_Error_When_Attached_To_Logical_Tree()
-        {
-            var target = new Decorator();
-            var root = new TestRoot { Child = target, DataContext = "foo" };
-            var called = false;
-
-            LogCallback checkLogMessage = (level, area, src, mt, pv) =>
-            {
-                if (level >= Logging.LogEventLevel.Warning)
-                {
-                    called = true;
-                }
-            };
-
-            using (TestLogSink.Start(checkLogMessage))
-            {
-                target.Bind(Decorator.TagProperty, new Binding("Foo"));
-            }
-
-            Assert.True(called);
-        }
-
-        [Fact]
-        public void Changing_ZIndex_Should_InvalidateVisual()
-        {
-            Canvas canvas1;
-            var renderer = new Mock<IRenderer>();
-            var root = new TestRoot
-            {
-                Child = new StackPanel
-                {
-                    Children =
-                    {
-                        (canvas1 = new Canvas()),
-                        new Canvas(),
-                    },
-                },
-            };
-
-            root.Renderer = renderer.Object;
-            canvas1.ZIndex = 10;
-
-            renderer.Verify(x => x.AddDirty(canvas1));
-        }
-
-        [Fact]
-        public void Changing_ZIndex_Should_Recalculate_Parent_Children()
-        {
-            Canvas canvas1;
-            StackPanel stackPanel;
-            var renderer = new Mock<IRenderer>();
-            var root = new TestRoot
-            {
-                Child = stackPanel = new StackPanel
-                {
-                    Children =
-                    {
-                        (canvas1 = new Canvas()),
-                        new Canvas(),
-                    },
-                },
-            };
-
-            root.Renderer = renderer.Object;
-            canvas1.ZIndex = 10;
-
-            renderer.Verify(x => x.RecalculateChildren(stackPanel));
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
deleted file mode 100644
index 6100f2cb74..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
+++ /dev/null
@@ -1,263 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.UnitTests;
-using Avalonia.Visuals.Media.Imaging;
-
-namespace Avalonia.Visuals.UnitTests.VisualTree
-{
-    class MockRenderInterface : IPlatformRenderInterface
-    {
-        public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IStreamGeometryImpl CreateStreamGeometry()
-        {
-            return new MockStreamGeometry();
-        }
-
-        public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IBitmapImpl LoadBitmap(Stream stream)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
-            BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height,
-            BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IWriteableBitmapImpl LoadWriteableBitmap(string fileName)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IWriteableBitmapImpl LoadWriteableBitmap(Stream stream)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IBitmapImpl LoadBitmap(string fileName)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool SupportsIndividualRoundRects { get; set; }
-        public AlphaFormat DefaultAlphaFormat { get; }
-        public PixelFormat DefaultPixelFormat { get; }
-
-        public IFontManagerImpl CreateFontManager()
-        {
-            return new MockFontManagerImpl();
-        }
-
-        public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat fmt, AlphaFormat alphaFormat)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IGeometryImpl CreateEllipseGeometry(Rect rect)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IGeometryImpl CreateLineGeometry(Point p1, Point p2)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IGeometryImpl CreateRectangleGeometry(Rect rect)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IBitmapImpl LoadBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IBitmapImpl ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
-        {
-            throw new NotImplementedException();
-        }
-
-        class MockStreamGeometry : IStreamGeometryImpl
-        {
-            private MockStreamGeometryContext _impl = new MockStreamGeometryContext();
-            public Rect Bounds
-            {
-                get
-                {
-                    throw new NotImplementedException();
-                }
-            }
-
-            public double ContourLength { get; }
-
-            public IStreamGeometryImpl Clone()
-            {
-                return this;
-            }
-
-            public void Dispose()
-            {
-            }
-
-            public bool FillContains(Point point)
-            {
-                return _impl.FillContains(point);
-            }
-
-            public Rect GetRenderBounds(IPen pen)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IGeometryImpl Intersect(IGeometryImpl geometry)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IStreamGeometryContextImpl Open()
-            {
-                return _impl;
-            }
-
-            public bool StrokeContains(IPen pen, Point point)
-            {
-                throw new NotImplementedException();
-            }
-
-            public ITransformedGeometryImpl WithTransform(Matrix transform)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool TryGetPointAtDistance(double distance, out Point point)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool TryGetPointAndTangentAtDistance(double distance, out Point point, out Point tangent)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool TryGetSegment(double startDistance, double stopDistance, bool startOnBeginFigure, out IGeometryImpl segmentGeometry)
-            {
-                throw new NotImplementedException();
-            }
-
-            class MockStreamGeometryContext : IStreamGeometryContextImpl
-            {
-                private List<Point> points = new List<Point>();
-                public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public void BeginFigure(Point startPoint, bool isFilled)
-                {
-                    points.Add(startPoint);
-                }
-
-                public void CubicBezierTo(Point point1, Point point2, Point point3)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public void Dispose()
-                {
-                }
-
-                public void EndFigure(bool isClosed)
-                {
-                }
-
-                public void LineTo(Point point)
-                {
-                    points.Add(point);
-                }
-
-                public void QuadraticBezierTo(Point control, Point endPoint)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public void SetFillRule(FillRule fillRule)
-                {
-                }
-
-                public bool FillContains(Point point)
-                {
-                    // Use the algorithm from http://www.blackpawn.com/texts/pointinpoly/default.html
-                    // to determine if the point is in the geometry (since it will always be convex in this situation)
-                    for (int i = 0; i < points.Count; i++)
-                    {
-                        var a = points[i];
-                        var b = points[(i + 1) % points.Count];
-                        var c = points[(i + 2) % points.Count];
-
-                        Vector v0 = c - a;
-                        Vector v1 = b - a;
-                        Vector v2 = point - a;
-
-                        var dot00 = v0 * v0;
-                        var dot01 = v0 * v1;
-                        var dot02 = v0 * v2;
-                        var dot11 = v1 * v1;
-                        var dot12 = v1 * v2;
-
-
-                        var invDenom = 1 / (dot00 * dot11 - dot01 * dot01);
-                        var u = (dot11 * dot02 - dot01 * dot12) * invDenom;
-                        var v = (dot00 * dot12 - dot01 * dot02) * invDenom;
-                        if ((u >= 0) && (v >= 0) && (u + v < 1)) return true;
-                    }
-                    return false;
-                }
-            }
-        }
-    }
-
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
deleted file mode 100644
index 54d9ce40f0..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
-using Avalonia.VisualTree;
-using Avalonia.Rendering;
-using Xunit;
-using Avalonia.Media;
-using Moq;
-using Avalonia.UnitTests;
-using Avalonia.Platform;
-
-namespace Avalonia.Visuals.UnitTests.VisualTree
-{
-    public class TransformedBoundsTests
-    {
-        [Fact]
-        public void Should_Track_Bounds()
-        {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
-            {
-                var control = default(Rectangle);
-                var tree = new Decorator
-                {
-                    Padding = new Thickness(10),
-                    Child = new Decorator
-                    {
-                        Padding = new Thickness(5),
-                        Child = control = new Rectangle
-                        {
-                            Width = 15,
-                            Height = 15,
-                        },
-                    }
-                };
-
-                var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
-
-                tree.Measure(Size.Infinity);
-                tree.Arrange(new Rect(0, 0, 100, 100));
-                ImmediateRenderer.Render(tree, context, true);
-
-                var track = control.GetObservable(Visual.TransformedBoundsProperty);
-                var results = new List<TransformedBounds?>();
-                track.Subscribe(results.Add);
-
-                Assert.Equal(new Rect(0, 0, 15, 15), results[0].Value.Bounds);
-                Assert.Equal(Matrix.CreateTranslation(42, 42), results[0].Value.Transform);
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
deleted file mode 100644
index 139a7925b1..0000000000
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Layout;
-using Avalonia.Media;
-using Avalonia.Rendering;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-namespace Avalonia.Visuals.UnitTests.VisualTree
-{
-    public class VisualExtensions_GetVisualsAt
-    {
-        [Fact]
-        public void Should_Find_Control()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new StackPanel
-                    {
-                        Background = Brushes.White,
-                        Children =
-                        {
-                            (target = new Border
-                            {
-                                Width = 100,
-                                Height = 200,
-                                Background = Brushes.Red,
-                            }),
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 200,
-                                Background = Brushes.Green,
-                            }
-                        },
-                        Orientation = Orientation.Horizontal,
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = target.GetVisualsAt(new Point(50, 50));
-
-                Assert.Same(target, result.Single());
-            }
-        }
-
-        [Fact]
-        public void Should_Not_Find_Sibling_Control()
-        {
-            using (TestApplication())
-            {
-                Border target;
-                var root = new TestRoot
-                {
-                    Width = 200,
-                    Height = 200,
-                    Child = new StackPanel
-                    {
-                        Background = Brushes.White,
-                        Children =
-                        {
-                            (target = new Border
-                            {
-                                Width = 100,
-                                Height = 200,
-                                Background = Brushes.Red,
-                            }),
-                            new Border
-                            {
-                                Width = 100,
-                                Height = 200,
-                                Background = Brushes.Green,
-                            }
-                        },
-                        Orientation = Orientation.Horizontal,
-                    }
-                };
-
-                root.Renderer = new DeferredRenderer(root, null);
-                root.Measure(Size.Infinity);
-                root.Arrange(new Rect(root.DesiredSize));
-
-                var result = target.GetVisualsAt(new Point(150, 50));
-
-                Assert.Empty(result);
-            }
-        }
-
-        private IDisposable TestApplication()
-        {
-            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
-        }
-    }
-}
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
index edd4dfd263..e8624fa457 100644
Binary files a/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png and b/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png b/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png
new file mode 100644
index 0000000000..7f1e0d29a1
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png b/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
index a76c6a5b2a..7bd622050e 100644
Binary files a/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png and b/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png b/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png
new file mode 100644
index 0000000000..a8f3aa9277
Binary files /dev/null and b/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png differ